Fixing minor bugs in 2D output of 3-horizon functions ahfgrid3 and ahf_exp3

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

1 files changed, 32 insertions, 11 deletions

diff --git a/src/AHFinder_find3.F b/src/AHFinder_find3.F
index dfcc8a8..8a2d0f4 100644
--- a/src/AHFinder_find3.F
+++ b/src/AHFinder_find3.F
@@ -12,7 +12,9 @@
 #include "cctk_Arguments.h"
 
 !     To output single gridfunctions when searching for 3 horizons
-!     the gridfunctions are here multiplicated.
+!     the gridfunctions are here multiplied.  The result of this is
+!     that the functions ahfgrid3 and ahf_exp3 will have zeroes at
+!     the location of all 3 horizons.
 
       subroutine AHFinder_find3(CCTK_FARGUMENTS,mtype)
 
@@ -43,18 +45,37 @@
 !     ***   START ROUTINE   ***
 !     *************************
 
-      if ((mfind.eq.0).and.(mtype.eq.1)) then
-         ahfgrid3 = ahfgrid
-         ahf_exp3 = ahf_exp
-      else if ((mfind.eq.0).and.(mtype.ne.1)) then
-         ahfgrid3 = one
-         ahf_exp3 = one
-      else if ((mfind.eq.1).and.(mtype.eq.1)) then
-         ahfgrid3 = ahfgrid*ahfgrid3
-         ahf_exp3 = ahf_exp*ahf_exp3
-      else if ((mfind.eq.2).and.(mtype.eq.1)) then
+!     For first horizon initialize {ahfgrid3,ahf_exp3}.
+
+      if (mfind.eq.0) then
+
+!        If we found an outer horizon, make {ahfgrid3,ahf_exp3}
+!        equal to {ahfgrid,ahf_exp}.
+
+         if (mtype.eq.1) then
+
+            ahfgrid3 = ahfgrid
+            ahf_exp3 = ahf_exp
+
+!        If we didn't find an outer horizon, make {ahfgrid3,ahf_exp3}
+!        equal to one.
+
+         else
+
+            ahfgrid3 = one
+            ahf_exp3 = one
+
+         end if
+
+!     For second and third horizons, if we found an outer
+!     horizon multiply the old values of {ahfgrid3,ahf_exp3}
+!     with the new {ahfgrid3,ahf_exp3}.
+
+      else if (mtype.eq.1) then
+
          ahfgrid3 = ahfgrid*ahfgrid3
          ahf_exp3 = ahf_exp*ahf_exp3
+
       end if