aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordiener <diener@89daf98e-ef62-4674-b946-b8ff9de2216c>2002-07-25 16:19:14 +0000
committerdiener <diener@89daf98e-ef62-4674-b946-b8ff9de2216c>2002-07-25 16:19:14 +0000
commitca51933e7c9468e7830cdb67c204895a5c1bd001 (patch)
tree2d26ed499b037f47b34b99f5072dc76f64243d02
parent70840b9b6f6fcf7ce3fd23b6f48edfbe809013ce (diff)
Fixed the logic in calling AHFinder_find3. Before ahfgrid3 was not
properly initialized in AHFinder_find3, causing floating point exceptions on Lemieux. Now AHFinder3 is called for all three horizons and is initialized properly regardless of whether the first horizon was found or not. git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinAnalysis/AHFinder/trunk@315 89daf98e-ef62-4674-b946-b8ff9de2216c
-rw-r--r--src/AHFinder.F5
-rw-r--r--src/AHFinder_find3.F17
2 files changed, 7 insertions, 15 deletions
diff --git a/src/AHFinder.F b/src/AHFinder.F
index 8bd32ff..0d646a6 100644
--- a/src/AHFinder.F
+++ b/src/AHFinder.F
@@ -264,7 +264,6 @@
end if
-
! ***************************************************
! *** START LOOP TO LOOK FOR SEVERAL HORIZONS ***
! ***************************************************
@@ -1404,9 +1403,7 @@
! ******************************************************
if (find3) then
- if (status_old_1.and.status_old_2) then
- call AHFinder_find3(CCTK_ARGUMENTS,mtype)
- end if
+ call AHFinder_find3(CCTK_ARGUMENTS,mtype)
end if
diff --git a/src/AHFinder_find3.F b/src/AHFinder_find3.F
index 6a8e52a..0cfbf73 100644
--- a/src/AHFinder_find3.F
+++ b/src/AHFinder_find3.F
@@ -40,28 +40,23 @@
one = 1.0D0
-
! *************************
! *** START ROUTINE ***
! *************************
-! For first horizon initialize {ahfgrid3,ahf_exp3}.
-
- if (mfind.eq.1) then
-
-! If we found an outer horizon, make {ahfgrid3,ahf_exp3}
-! equal to {ahfgrid,ahf_exp}.
+! For first outer horizon initialize {ahfgrid3,ahf_exp3}.
- if (mtype.eq.1) then
+ if ( mfind .eq. 1) then
+ if ( mtype .eq. 1 ) then
ahfgrid3 = ahfgrid
ahf_exp3 = ahf_exp
-! If we did not find an outer horizon, make {ahfgrid3,ahf_exp3}
-! equal to one.
-
else
+! If we did not find an outer horizon, make {ahfgrid3,ahf_exp3}
+! equal to one.
+
ahfgrid3 = one
ahf_exp3 = one