Cleaning up.

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

1 files changed, 34 insertions, 27 deletions

diff --git a/src/AHFinder.F b/src/AHFinder.F
index 0e60f67..fc98641 100644
--- a/src/AHFinder.F
+++ b/src/AHFinder.F
@@ -1702,9 +1702,16 @@
 
          call AHFinder_mask(CCTK_FARGUMENTS,rhor)
 
-!        Here I alter the parameters for excision.  Notice that at
-!        the moment, I only allow the excised cube to grow, never
-!        to shrink.
+!        Here I alter the parameters for SimpleExcision.  Notice that at
+!        the moment, I only allow the excised cube to grow, and never
+!        to shrink.  Also, notice that the sides of the cube have been
+!        set to 0.57*rhor.  This is because if we want the corners of
+!        the cube to touch a sphere of radius rhor, we need to make the
+!        sides equal to 1/sqrt(3), which is roughly 0.57.  If you worry
+!        that this is too close to the horizon, remember that rhor in fact
+!        has already been shrunk by a safety margin.
+
+         aux = 0.57D0*rhor
 
          if (find3) then
 
@@ -1712,49 +1719,49 @@
 
 !              First hole.
 
-               if (dhole1_xmin.gt.(xc-0.5D0*rhor)) dhole1_xmin = xc-0.5D0*rhor
-               if (dhole1_ymin.gt.(yc-0.5D0*rhor)) dhole1_ymin = yc-0.5D0*rhor
-               if (dhole1_zmin.gt.(zc-0.5D0*rhor)) dhole1_zmin = zc-0.5D0*rhor
+               if (dhole1_xmin.gt.(xc-aux)) dhole1_xmin = xc-aux
+               if (dhole1_ymin.gt.(yc-aux)) dhole1_ymin = yc-aux
+               if (dhole1_zmin.gt.(zc-aux)) dhole1_zmin = zc-aux
 
-               if (dhole1_xmax.lt.(xc+0.5D0*rhor)) dhole1_xmax = xc+0.5D0*rhor
-               if (dhole1_ymax.lt.(yc+0.5D0*rhor)) dhole1_ymax = yc+0.5D0*rhor
-               if (dhole1_zmax.lt.(zc+0.5D0*rhor)) dhole1_zmax = zc+0.5D0*rhor
+               if (dhole1_xmax.lt.(xc+aux)) dhole1_xmax = xc+aux
+               if (dhole1_ymax.lt.(yc+aux)) dhole1_ymax = yc+aux
+               if (dhole1_zmax.lt.(zc+aux)) dhole1_zmax = zc+aux
 
             else if (mfind.eq.2) then
 
 !              Second hole.
 
-               if (dhole2_xmin.gt.(xc-0.5D0*rhor)) dhole2_xmin = xc-0.5D0*rhor
-               if (dhole2_ymin.gt.(yc-0.5D0*rhor)) dhole2_ymin = yc-0.5D0*rhor
-               if (dhole2_zmin.gt.(zc-0.5D0*rhor)) dhole2_zmin = zc-0.5D0*rhor
+               if (dhole2_xmin.gt.(xc-aux)) dhole2_xmin = xc-aux
+               if (dhole2_ymin.gt.(yc-aux)) dhole2_ymin = yc-aux
+               if (dhole2_zmin.gt.(zc-aux)) dhole2_zmin = zc-aux
 
-               if (dhole2_xmax.lt.(xc+0.5D0*rhor)) dhole2_xmax = xc+0.5D0*rhor
-               if (dhole2_ymax.lt.(yc+0.5D0*rhor)) dhole2_ymax = yc+0.5D0*rhor
-               if (dhole2_zmax.lt.(zc+0.5D0*rhor)) dhole2_zmax = zc+0.5D0*rhor
+               if (dhole2_xmax.lt.(xc+aux)) dhole2_xmax = xc+aux
+               if (dhole2_ymax.lt.(yc+aux)) dhole2_ymax = yc+aux
+               if (dhole2_zmax.lt.(zc+aux)) dhole2_zmax = zc+aux
 
             else
 
 !              Third hole.
 
-               if (dhole3_xmin.gt.(xc-0.5D0*rhor)) dhole3_xmin = xc-0.5D0*rhor
-               if (dhole3_ymin.gt.(yc-0.5D0*rhor)) dhole3_ymin = yc-0.5D0*rhor
-               if (dhole3_zmin.gt.(zc-0.5D0*rhor)) dhole3_zmin = zc-0.5D0*rhor
+               if (dhole3_xmin.gt.(xc-aux)) dhole3_xmin = xc-aux
+               if (dhole3_ymin.gt.(yc-aux)) dhole3_ymin = yc-aux
+               if (dhole3_zmin.gt.(zc-aux)) dhole3_zmin = zc-aux
 
-               if (dhole3_xmax.lt.(xc+0.5D0*rhor)) dhole3_xmax = xc+0.5D0*rhor
-               if (dhole3_ymax.lt.(yc+0.5D0*rhor)) dhole3_ymax = yc+0.5D0*rhor
-               if (dhole3_zmax.lt.(zc+0.5D0*rhor)) dhole3_zmax = zc+0.5D0*rhor
+               if (dhole3_xmax.lt.(xc+aux)) dhole3_xmax = xc+aux
+               if (dhole3_ymax.lt.(yc+aux)) dhole3_ymax = yc+aux
+               if (dhole3_zmax.lt.(zc+aux)) dhole3_zmax = zc+aux
 
             end if
 
          else
 
-            if (dhole1_xmin.gt.(xc-0.5D0*rhor)) dhole1_xmin = xc-0.5D0*rhor
-            if (dhole1_ymin.gt.(yc-0.5D0*rhor)) dhole1_ymin = yc-0.5D0*rhor
-            if (dhole1_zmin.gt.(zc-0.5D0*rhor)) dhole1_zmin = zc-0.5D0*rhor
+            if (dhole1_xmin.gt.(xc-aux)) dhole1_xmin = xc-aux
+            if (dhole1_ymin.gt.(yc-aux)) dhole1_ymin = yc-aux
+            if (dhole1_zmin.gt.(zc-aux)) dhole1_zmin = zc-aux
 
-            if (dhole1_xmax.lt.(xc+0.5D0*rhor)) dhole1_xmax = xc+0.5D0*rhor
-            if (dhole1_ymax.lt.(yc+0.5D0*rhor)) dhole1_ymax = yc+0.5D0*rhor
-            if (dhole1_zmax.lt.(zc+0.5D0*rhor)) dhole1_zmax = zc+0.5D0*rhor
+            if (dhole1_xmax.lt.(xc+aux)) dhole1_xmax = xc+aux
+            if (dhole1_ymax.lt.(yc+aux)) dhole1_ymax = yc+aux
+            if (dhole1_zmax.lt.(zc+aux)) dhole1_zmax = zc+aux
 
          end if