Removed goto and continue statements, so that it will compile on titan.

Added $Header$.


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

1 files changed, 81 insertions, 84 deletions

diff --git a/src/AHFinder_exp.F b/src/AHFinder_exp.F
index 8a74a32..59d4e62 100644
--- a/src/AHFinder_exp.F
+++ b/src/AHFinder_exp.F
@@ -17,7 +17,8 @@
             u  =  | g   d f d f |
                   \      m   n  /
 
-  @enddesc 
+  @enddesc
+  @version   $Header$
 @@*/
 
 #include "cctk.h"
@@ -162,44 +163,41 @@
                det = gdxx*gdyy*gdzz + two*gdxy*gdxz*gdyz
      .             - gdxx*gdyz**2 - gdyy*gdxz**2 - gdzz*gdxy**2
 
-               if (det.le.zero) then
-                  ahf_exp(i,j,k) = zero
-                  goto 10
-               end if
+               if (det.gt.zero) then
 
-               idet = one/det
+                  idet = one/det
 
 !              Find inverse spatial metric.
 
-               guxx = idet*(gdyy*gdzz - gdyz**2)
-               guyy = idet*(gdxx*gdzz - gdxz**2)
-               guzz = idet*(gdxx*gdyy - gdxy**2)
+                  guxx = idet*(gdyy*gdzz - gdyz**2)
+                  guyy = idet*(gdxx*gdzz - gdxz**2)
+                  guzz = idet*(gdxx*gdyy - gdxy**2)
 
-               guxy = idet*(gdxz*gdyz - gdzz*gdxy)
-               guxz = idet*(gdxy*gdyz - gdyy*gdxz)
-               guyz = idet*(gdxy*gdxz - gdxx*gdyz)
+                  guxy = idet*(gdxz*gdyz - gdzz*gdxy)
+                  guxz = idet*(gdxy*gdyz - gdyy*gdxz)
+                  guyz = idet*(gdxy*gdxz - gdxx*gdyz)
 
 !              Find spatial derivatives of f.
-
-               T0 = two*ahfgrid(i,j,k)
+                  
+                  T0 = two*ahfgrid(i,j,k)
               
-               T1 = ahfgrid(i+1,j,k)
-               T2 = ahfgrid(i-1,j,k)
+                  T1 = ahfgrid(i+1,j,k)
+                  T2 = ahfgrid(i-1,j,k)
            
-               dfx   = (T1 - T2)*idx
-               d2fxx = (T1 - T0 + T2)*idx2
+                  dfx   = (T1 - T2)*idx
+                  d2fxx = (T1 - T0 + T2)*idx2
 
-               T1 = ahfgrid(i,j+1,k)
-               T2 = ahfgrid(i,j-1,k)
+                  T1 = ahfgrid(i,j+1,k)
+                  T2 = ahfgrid(i,j-1,k)
 
-               dfy   = (T1 - T2)*idy
-               d2fyy = (T1 - T0 + T2)*idy2
+                  dfy   = (T1 - T2)*idy
+                  d2fyy = (T1 - T0 + T2)*idy2
 
-               T1 = ahfgrid(i,j,k+1)
-               T2 = ahfgrid(i,j,k-1)
+                  T1 = ahfgrid(i,j,k+1)
+                  T2 = ahfgrid(i,j,k-1)
 
-               dfz   = (T1 - T2)*idz
-               d2fzz = (T1 - T0 + T2)*idz2
+                  dfz   = (T1 - T2)*idz
+                  d2fzz = (T1 - T0 + T2)*idz2
 
 !              Save gradient of horizon function and its norm
 !              (they will be needed later in the flow algorithm
@@ -209,105 +207,105 @@
 !              ever happen far from the horizon, so resetting this
 !              to 1 should have no important effects.
 
-               ahfgradx(i,j,k) = dfx
-               ahfgrady(i,j,k) = dfy
-               ahfgradz(i,j,k) = dfz
+                  ahfgradx(i,j,k) = dfx
+                  ahfgrady(i,j,k) = dfy
+                  ahfgradz(i,j,k) = dfz
 
-               aux = guxx*dfx**2 + guyy*dfy**2 + guzz*dfz**2
-     .             + two*(guxy*dfx*dfy + guxz*dfx*dfz + guyz*dfy*dfz)
+                  aux = guxx*dfx**2 + guyy*dfy**2 + guzz*dfz**2
+     .                 + two*(guxy*dfx*dfy + guxz*dfx*dfz + guyz*dfy*dfz)
 
-               ahfgradn(i,j,k) = dsqrt(aux)
-               if (ahfgradn(i,j,k).eq.zero) ahfgradn(i,j,k) = one
+                  ahfgradn(i,j,k) = dsqrt(aux)
+                  if (ahfgradn(i,j,k).eq.zero) ahfgradn(i,j,k) = one
 
 !              Find crossed derivatives.
 
-               d2fxy = (ahfgrid(i+1,j+1,k) + ahfgrid(i-1,j-1,k)
-     .               -  ahfgrid(i+1,j-1,k) - ahfgrid(i-1,j+1,k))*idxy
-               d2fxz = (ahfgrid(i+1,j,k+1) + ahfgrid(i-1,j,k-1)
-     .               -  ahfgrid(i+1,j,k-1) - ahfgrid(i-1,j,k+1))*idxz
-               d2fyz = (ahfgrid(i,j+1,k+1) + ahfgrid(i,j-1,k-1)
-     .               -  ahfgrid(i,j+1,k-1) - ahfgrid(i,j-1,k+1))*idyz
-
+                  d2fxy = (ahfgrid(i+1,j+1,k) + ahfgrid(i-1,j-1,k)
+     .                 -  ahfgrid(i+1,j-1,k) - ahfgrid(i-1,j+1,k))*idxy
+                  d2fxz = (ahfgrid(i+1,j,k+1) + ahfgrid(i-1,j,k-1)
+     .                 -  ahfgrid(i+1,j,k-1) - ahfgrid(i-1,j,k+1))*idxz
+                  d2fyz = (ahfgrid(i,j+1,k+1) + ahfgrid(i,j-1,k-1)
+     .                 -  ahfgrid(i,j+1,k-1) - ahfgrid(i,j-1,k+1))*idyz
+                  
 !              Raise indices in first derivatives.
 
-               dfux = guxx*dfx + guxy*dfy + guxz*dfz
-               dfuy = guxy*dfx + guyy*dfy + guyz*dfz
-               dfuz = guxz*dfx + guyz*dfy + guzz*dfz
-
+                  dfux = guxx*dfx + guxy*dfy + guxz*dfz
+                  dfuy = guxy*dfx + guyy*dfy + guyz*dfz
+                  dfuz = guxz*dfx + guyz*dfy + guzz*dfz
+                  
 !              Find second covariant derivatives of f.
 
-               c2fxx = d2fxx - half*(dfux*ddxxx
-     .               + dfuy*(two*ddxxy - ddyxx)
-     .               + dfuz*(two*ddxxz - ddzxx))
-
-               c2fyy = d2fyy - half*(dfuy*ddyyy
-     .               + dfux*(two*ddyxy - ddxyy)
-     .               + dfuz*(two*ddyyz - ddzyy))
+                  c2fxx = d2fxx - half*(dfux*ddxxx
+     .                 + dfuy*(two*ddxxy - ddyxx)
+     .                 + dfuz*(two*ddxxz - ddzxx))
+                  
+                  c2fyy = d2fyy - half*(dfuy*ddyyy
+     .                 + dfux*(two*ddyxy - ddxyy)
+     .                 + dfuz*(two*ddyyz - ddzyy))
 
-               c2fzz = d2fzz - half*(dfuz*ddzzz
-     .               + dfux*(two*ddzxz - ddxzz)
-     .               + dfuy*(two*ddzyz - ddyzz))
+                  c2fzz = d2fzz - half*(dfuz*ddzzz
+     .                 + dfux*(two*ddzxz - ddxzz)
+     .                 + dfuy*(two*ddzyz - ddyzz))
 
-               c2fxy = d2fxy - half*(dfux*ddyxx + dfuy*ddxyy
-     .               + dfuz*(ddxyz + ddyxz - ddzxy))
+                  c2fxy = d2fxy - half*(dfux*ddyxx + dfuy*ddxyy
+     .                 + dfuz*(ddxyz + ddyxz - ddzxy))
 
-               c2fxz = d2fxz - half*(dfux*ddzxx + dfuz*ddxzz
-     .               + dfuy*(ddxyz + ddzxy - ddyxz))
+                  c2fxz = d2fxz - half*(dfux*ddzxx + dfuz*ddxzz
+     .                 + dfuy*(ddxyz + ddzxy - ddyxz))
 
-               c2fyz = d2fyz - half*(dfuy*ddzyy + dfuz*ddyzz
-     .               + dfux*(ddyxz + ddzxy - ddxyz))
+                  c2fyz = d2fyz - half*(dfuy*ddzyy + dfuz*ddyzz
+     .                 + dfux*(ddyxz + ddzxy - ddxyz))
 
 !                           /  m      \ 1/2
 !              Find:  u  =  | d f d f |
 !                           \      m  /
 
-               T0 = dfx*dfux + dfy*dfuy + dfz*dfuz
+                  T0 = dfx*dfux + dfy*dfuy + dfz*dfuz
 
-               if (T0.gt.zero) then
-                  T0 = one/dsqrt(T0)
-               else
-                  ahf_exp(i,j,k) = zero
-                  goto 10
-               end if
+                  if (T0.gt.zero) then
+                     T0 = one/dsqrt(T0)
 
 !                     __2
 !              Find:  \/ f / u
 
-               T1 = guxx*c2fxx + guyy*c2fyy + guzz*c2fzz
-     .            + two*(guxy*c2fxy + guxz*c2fxz + guyz*c2fyz)
+                     T1 = guxx*c2fxx + guyy*c2fyy + guzz*c2fzz
+     .                    + two*(guxy*c2fxy + guxz*c2fxz + guyz*c2fyz)
 
-               T1 = T1*T0
+                     T1 = T1*T0
 
 !                          a   b       2
 !              Find:  K   d f d f  /  u
 !                      ab
+                     
+                     T2 = kdxx*dfux**2 + kdyy*dfuy**2 + kdzz*dfuz**2
+     .                    + two*(dfux*(kdxy*dfuy + kdxz*dfuz) + kdyz*dfuy*dfuz)
 
-               T2 = kdxx*dfux**2 + kdyy*dfuy**2 + kdzz*dfuz**2
-     .            + two*(dfux*(kdxy*dfuy + kdxz*dfuz) + kdyz*dfuy*dfuz)
-
-               T2 = T2*T0**2
+                     T2 = T2*T0**2
 
 !                      __a__b                3
 !              Find:   \/ \/ f  d f d f  /  u
 !                                a   b
 
-               T3 = c2fxx*dfux**2 + c2fyy*dfuy**2 + c2fzz*dfuz**2
-     .            + two*(dfux*(c2fxy*dfuy + c2fxz*dfuz)
-     .            + c2fyz*dfuy*dfuz)
+                     T3 = c2fxx*dfux**2 + c2fyy*dfuy**2 + c2fzz*dfuz**2
+     .                    + two*(dfux*(c2fxy*dfuy + c2fxz*dfuz)
+     .                    + c2fyz*dfuy*dfuz)
 
-               T3 = T3*T0**3
+                     T3 = T3*T0**3
 
 !              Find:  trK
 
-               T4 = guxx*kdxx + guyy*kdyy + guzz*kdzz
-     .            + two*(guxy*kdxy + guxz*kdxz + guyz*kdyz)
+                     T4 = guxx*kdxx + guyy*kdyy + guzz*kdzz
+     .                    + two*(guxy*kdxy + guxz*kdxz + guyz*kdyz)
 
 !              Find the expansion.
 
-               ahf_exp(i,j,k) = T1 + T2 - T3 - T4
-
- 10            continue
+                     ahf_exp(i,j,k) = T1 + T2 - T3 - T4
 
+                  else
+                     ahf_exp(i,j,k) = zero
+                  endif
+               else
+                  ahf_exp(i,j,k) = zero
+               endif
             end do
          end do
       end do
@@ -435,4 +433,3 @@
 
       return
       end
-