minor changes. Eliminating obsolete format statements and changing the

last remaining goto's to if statements.  Though is probably was more
human readable before.


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

1 files changed, 16 insertions, 10 deletions

diff --git a/src/AHFinder.F b/src/AHFinder.F
index 5d34719..9abcc1f 100644
--- a/src/AHFinder.F
+++ b/src/AHFinder.F
@@ -28,7 +28,7 @@
       DECLARE_CCTK_FUNCTIONS
 
       logical status,horizon,gauss,ahfconformal
-      logical report
+      logical giveup,report
 
       integer handle,x_index,y_index,z_index,ierror
       integer ahfso,ahfafter
@@ -54,7 +54,7 @@
       CCTK_REAL, dimension (1:3) :: ahfmass
       CCTK_INT :: save_conformal_state
 
-      character*200 logf
+      character(200) logf
 
       save ahfafter,ahfso,atime
 
@@ -389,24 +389,32 @@
 !     Check if the center of the expansion is
 !     out of the grid.  If it is, give up.
 
+      giveup = .false.
+
       if ((xc.gt.xmx).or.(xc.lt.xmn)) then
          write(*,*)
          write(*,*) 'xc is out of the grid, giving up.'
-         goto 100
+         giveup = .true.
       end if
 
       if ((yc.gt.ymx).or.(yc.lt.ymn)) then
          write(*,*)
          write(*,*) 'yc is out of the grid, giving up.'
-         goto 100
+         giveup = .true.
       end if
 
       if ((zc.gt.zmx).or.(zc.lt.zmn)) then
          write(*,*)
          write(*,*) 'zc is out of the grid, giving up.'
-         goto 100
+         giveup = .true.
       end if
 
+!     The end of this if statement is very far down,
+!     it basically jumps all of the code.  To find
+!     it look for the word "giveup" on a comment.
+
+      if (.not.giveup) then
+
 
 !     **************************
 !     ***  FIND SYMMETRIES   ***
@@ -1268,8 +1276,6 @@
 
                   end if
 
- 10               format(I4,I4,A2,ES14.6,A1,ES14.6)
-
                else
 
                   if (verbose) then
@@ -1300,8 +1306,6 @@
 
                   end if
 
- 20               format(I4,I4,A2,ES14.6)
-
                end if
             end if
 
@@ -1561,7 +1565,9 @@
 !     ***   END OF LOOP FOR LOOKING FOR SEVERAL HORIZONS   ***
 !     ********************************************************
 
- 100  continue
+!     End of "giveup" if statement.
+
+      end if
 
 !     If we are looking for 3 horizons, save values of coefficients.