Added explicit array bounds to avoid triggering fp exception on Alphas

(Peter and Frank's fix).


git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinAnalysis/AHFinder/trunk@314 89daf98e-ef62-4674-b946-b8ff9de2216c

2 files changed, 34 insertions, 34 deletions

diff --git a/src/AHFinder_exp.F b/src/AHFinder_exp.F
index 254986b..e990501 100644
--- a/src/AHFinder_exp.F
+++ b/src/AHFinder_exp.F
@@ -378,45 +378,45 @@
 
 !     Boundaries on x direction.
 
-      ahf_exp(1,:,:)  = 2.0D0*ahf_exp(2,:,:) - ahf_exp(3,:,:)
-      ahfgradx(1,:,:) = 2.0D0*ahfgradx(2,:,:) - ahfgradx(3,:,:)
-      ahfgrady(1,:,:) = 2.0D0*ahfgrady(2,:,:) - ahfgrady(3,:,:)
-      ahfgradz(1,:,:) = 2.0D0*ahfgradz(2,:,:) - ahfgradz(3,:,:)
-      ahfgradn(1,:,:) = 2.0D0*ahfgradn(2,:,:) - ahfgradn(3,:,:)
-
-      ahf_exp(nx,:,:)  = 2.0D0*ahf_exp(nx-1,:,:) - ahf_exp(nx-2,:,:)
-      ahfgradx(nx,:,:) = 2.0D0*ahfgradx(nx-1,:,:) - ahfgradx(nx-2,:,:)
-      ahfgrady(nx,:,:) = 2.0D0*ahfgrady(nx-1,:,:) - ahfgrady(nx-2,:,:)
-      ahfgradz(nx,:,:) = 2.0D0*ahfgradz(nx-1,:,:) - ahfgradz(nx-2,:,:)
-      ahfgradn(nx,:,:) = 2.0D0*ahfgradn(nx-1,:,:) - ahfgradn(nx-2,:,:)
+      ahf_exp(1,2:ny-1,2:nz-1)  = 2.0D0*ahf_exp(2,2:ny-1,2:nz-1) - ahf_exp(3,2:ny-1,2:nz-1)
+      ahfgradx(1,2:ny-1,2:nz-1) = 2.0D0*ahfgradx(2,2:ny-1,2:nz-1) - ahfgradx(3,2:ny-1,2:nz-1)
+      ahfgrady(1,2:ny-1,2:nz-1) = 2.0D0*ahfgrady(2,2:ny-1,2:nz-1) - ahfgrady(3,2:ny-1,2:nz-1)
+      ahfgradz(1,2:ny-1,2:nz-1) = 2.0D0*ahfgradz(2,2:ny-1,2:nz-1) - ahfgradz(3,2:ny-1,2:nz-1)
+      ahfgradn(1,2:ny-1,2:nz-1) = 2.0D0*ahfgradn(2,2:ny-1,2:nz-1) - ahfgradn(3,2:ny-1,2:nz-1)
+
+      ahf_exp(nx,2:ny-1,2:nz-1)  = 2.0D0*ahf_exp(nx-1,2:ny-1,2:nz-1) - ahf_exp(nx-2,2:ny-1,2:nz-1)
+      ahfgradx(nx,2:ny-1,2:nz-1) = 2.0D0*ahfgradx(nx-1,2:ny-1,2:nz-1) - ahfgradx(nx-2,2:ny-1,2:nz-1)
+      ahfgrady(nx,2:ny-1,2:nz-1) = 2.0D0*ahfgrady(nx-1,2:ny-1,2:nz-1) - ahfgrady(nx-2,2:ny-1,2:nz-1)
+      ahfgradz(nx,2:ny-1,2:nz-1) = 2.0D0*ahfgradz(nx-1,2:ny-1,2:nz-1) - ahfgradz(nx-2,2:ny-1,2:nz-1)
+      ahfgradn(nx,2:ny-1,2:nz-1) = 2.0D0*ahfgradn(nx-1,2:ny-1,2:nz-1) - ahfgradn(nx-2,2:ny-1,2:nz-1)
 
 !     Boundaries on y direction.
 
-      ahf_exp(:,1,:)  = 2.0D0*ahf_exp(:,2,:) - ahf_exp(:,3,:)
-      ahfgradx(:,1,:) = 2.0D0*ahfgradx(:,2,:) - ahfgradx(:,3,:)
-      ahfgrady(:,1,:) = 2.0D0*ahfgrady(:,2,:) - ahfgrady(:,3,:)
-      ahfgradz(:,1,:) = 2.0D0*ahfgradz(:,2,:) - ahfgradz(:,3,:)
-      ahfgradn(:,1,:) = 2.0D0*ahfgradn(:,2,:) - ahfgradn(:,3,:)
+      ahf_exp(2:nx-1,1,2:nz-1)  = 2.0D0*ahf_exp(2:nx-1,2,2:nz-1) - ahf_exp(2:nx-1,3,2:nz-1)
+      ahfgradx(2:nx-1,1,2:nz-1) = 2.0D0*ahfgradx(2:nx-1,2,2:nz-1) - ahfgradx(2:nx-1,3,2:nz-1)
+      ahfgrady(2:nx-1,1,2:nz-1) = 2.0D0*ahfgrady(2:nx-1,2,2:nz-1) - ahfgrady(2:nx-1,3,2:nz-1)
+      ahfgradz(2:nx-1,1,2:nz-1) = 2.0D0*ahfgradz(2:nx-1,2,2:nz-1) - ahfgradz(2:nx-1,3,2:nz-1)
+      ahfgradn(2:nx-1,1,2:nz-1) = 2.0D0*ahfgradn(2:nx-1,2,2:nz-1) - ahfgradn(2:nx-1,3,2:nz-1)
 
-      ahf_exp(:,ny,:)  = 2.0D0*ahf_exp(:,ny-1,:) - ahf_exp(:,ny-2,:)
-      ahfgradx(:,ny,:) = 2.0D0*ahfgradx(:,ny-1,:) - ahfgradx(:,ny-2,:)
-      ahfgrady(:,ny,:) = 2.0D0*ahfgrady(:,ny-1,:) - ahfgrady(:,ny-2,:)
-      ahfgradz(:,ny,:) = 2.0D0*ahfgradz(:,ny-1,:) - ahfgradz(:,ny-2,:)
-      ahfgradn(:,ny,:) = 2.0D0*ahfgradn(:,ny-1,:) - ahfgradn(:,ny-2,:)
+      ahf_exp(2:nx-1,ny,2:nz-1)  = 2.0D0*ahf_exp(2:nx-1,ny-1,2:nz-1) - ahf_exp(2:nx-1,ny-2,2:nz-1)
+      ahfgradx(2:nx-1,ny,2:nz-1) = 2.0D0*ahfgradx(2:nx-1,ny-1,2:nz-1) - ahfgradx(2:nx-1,ny-2,2:nz-1)
+      ahfgrady(2:nx-1,ny,2:nz-1) = 2.0D0*ahfgrady(2:nx-1,ny-1,2:nz-1) - ahfgrady(2:nx-1,ny-2,2:nz-1)
+      ahfgradz(2:nx-1,ny,2:nz-1) = 2.0D0*ahfgradz(2:nx-1,ny-1,2:nz-1) - ahfgradz(2:nx-1,ny-2,2:nz-1)
+      ahfgradn(2:nx-1,ny,2:nz-1) = 2.0D0*ahfgradn(2:nx-1,ny-1,2:nz-1) - ahfgradn(2:nx-1,ny-2,2:nz-1)
 
 !     Boundaries on z direction.
 
-      ahf_exp(:,:,1)  = 2.0D0*ahf_exp(:,:,2) - ahf_exp(:,:,3)
-      ahfgradx(:,:,1) = 2.0D0*ahfgradx(:,:,2) - ahfgradx(:,:,3)
-      ahfgrady(:,:,1) = 2.0D0*ahfgrady(:,:,2) - ahfgrady(:,:,3)
-      ahfgradz(:,:,1) = 2.0D0*ahfgradz(:,:,2) - ahfgradz(:,:,3)
-      ahfgradn(:,:,1) = 2.0D0*ahfgradn(:,:,2) - ahfgradn(:,:,3)
-
-      ahf_exp(:,:,nz)  = 2.0D0*ahf_exp(:,:,nz-1) - ahf_exp(:,:,nz-2)
-      ahfgradx(:,:,nz) = 2.0D0*ahfgradx(:,:,nz-1) - ahfgradx(:,:,nz-2)
-      ahfgrady(:,:,nz) = 2.0D0*ahfgrady(:,:,nz-1) - ahfgrady(:,:,nz-2)
-      ahfgradz(:,:,nz) = 2.0D0*ahfgradz(:,:,nz-1) - ahfgradz(:,:,nz-2)
-      ahfgradn(:,:,nz) = 2.0D0*ahfgradn(:,:,nz-1) - ahfgradn(:,:,nz-2)
+      ahf_exp(2:nx-1,2:ny-1,1)  = 2.0D0*ahf_exp(2:nx-1,2:ny-1,2) - ahf_exp(2:nx-1,2:ny-1,3)
+      ahfgradx(2:nx-1,2:ny-1,1) = 2.0D0*ahfgradx(2:nx-1,2:ny-1,2) - ahfgradx(2:nx-1,2:ny-1,3)
+      ahfgrady(2:nx-1,2:ny-1,1) = 2.0D0*ahfgrady(2:nx-1,2:ny-1,2) - ahfgrady(2:nx-1,2:ny-1,3)
+      ahfgradz(2:nx-1,2:ny-1,1) = 2.0D0*ahfgradz(2:nx-1,2:ny-1,2) - ahfgradz(2:nx-1,2:ny-1,3)
+      ahfgradn(2:nx-1,2:ny-1,1) = 2.0D0*ahfgradn(2:nx-1,2:ny-1,2) - ahfgradn(2:nx-1,2:ny-1,3)
+
+      ahf_exp(2:nx-1,2:ny-1,nz)  = 2.0D0*ahf_exp(2:nx-1,2:ny-1,nz-1) - ahf_exp(2:nx-1,2:ny-1,nz-2)
+      ahfgradx(2:nx-1,2:ny-1,nz) = 2.0D0*ahfgradx(2:nx-1,2:ny-1,nz-1) - ahfgradx(2:nx-1,2:ny-1,nz-2)
+      ahfgrady(2:nx-1,2:ny-1,nz) = 2.0D0*ahfgrady(2:nx-1,2:ny-1,nz-1) - ahfgrady(2:nx-1,2:ny-1,nz-2)
+      ahfgradz(2:nx-1,2:ny-1,nz) = 2.0D0*ahfgradz(2:nx-1,2:ny-1,nz-1) - ahfgradz(2:nx-1,2:ny-1,nz-2)
+      ahfgradn(2:nx-1,2:ny-1,nz) = 2.0D0*ahfgradn(2:nx-1,2:ny-1,nz-1) - ahfgradn(2:nx-1,2:ny-1,nz-2)
 
 !     Synchronize.
 
diff --git a/src/AHFinder_gau.F b/src/AHFinder_gau.F
index 9e8ca67..05160c3 100644
--- a/src/AHFinder_gau.F
+++ b/src/AHFinder_gau.F
@@ -595,8 +595,8 @@
             ahf_centroid_y = avgy
 
             if (verbose) then
-              write(1,*) 'AHFinder_gau: ahf_centroid_x = ', ahf_centroid_x
-              write(1,*) 'AHFinder_gau: ahf_centroid_y = ', ahf_centroid_y
+              write(6,*) 'AHFinder_gau: ahf_centroid_x = ', ahf_centroid_x
+              write(6,*) 'AHFinder_gau: ahf_centroid_y = ', ahf_centroid_y
             end if
          endif