*** empty log message ***

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

3 files changed, 14 insertions, 22 deletions

diff --git a/README b/README
index da4ec63..1352fb6 100644
--- a/README
+++ b/README
@@ -24,19 +24,18 @@ BRIEF DESCRIPTION
 This thorn looks for apparent horizons (AH) in 3D using two
 different algorithms.  In the default mode, it uses a minimization
 algorithm.  It can also use a flow algorithm if one sets the
-parameter "mahf_flow" equal to "yes":
+parameter "ahf_flow" equal to "yes":
 
-mahf_flow = "yes"
+ahf_flow = "yes"
 
 The minimization algorithm is VERY slow if one has a lot of terms
 in the spherical harmonics expansion (see below), but it is quite
 fast for a small number of terms.
 
-The thorn is activated by adding the following lines to the
-parameter file:
+The thorn is activated by adding the following line to the parameter
+file:
 
-ah_persists       = "yes"
-minimumAHF_active = "yes"
+ahfinder::ahf_active      = "yes"
 
 Also, one needs to tell the routine how often we want to
 look for AH by using the parameter `mahf_findevery' (its
@@ -44,7 +43,7 @@ default value is 1).
 
 The routine defines the grid function `mahfgrid' as:
 
-mahfgrid  =  r  -  f(theta,phi)
+ahfgrid  =  r  -  f(theta,phi)
 
 So that the surface being considered corresponds to the zero level of
 `mahfgrid'.  The function f(theta,phi) is expanded in spherical
diff --git a/src/AHFinder.F b/src/AHFinder.F
index a42f55a..b1cf8de 100644
--- a/src/AHFinder.F
+++ b/src/AHFinder.F
@@ -1452,15 +1452,6 @@
 !     ***   MASK   ***
 !     ****************
 
-!     Check if we are using dynamical excision with the mask off.
-
-#ifdef DEVELOPMENT_SIMPLEEXCISION
-      if (CCTK_EQUALS(excisiontype,'dynamic').and.
-     .   (CCTK_EQUALS(ahf_mask,'off'))) then
-         call CCTK_WARN(1,'AHFinder: For dynamic excision mask must be on!')
-      end if
-#endif
-
 !     The mask should only be different from 1 inside a horizon.
 !     I therefore need to check first if I do have a horizon, and
 !     also if the mask is desired.
@@ -1470,10 +1461,8 @@
 
          call AHFinder_mask(CCTK_FARGUMENTS,rhor)
 
-#ifdef DEVELOPMENT_SIMPLEEXCISION
-
-!        Here I alter the parameters for SimpleExcision.  Notice that
-!        at the moment, I only allow the excised cube to grow, never
+!        Here I alter the parameters for excision.  Notice that at
+!        the moment, I only allow the excised cube to grow, never
 !        to shrink.
 
          if (find3) then
@@ -1522,8 +1511,6 @@
 
          end if
 
-#endif
-
       end if
 
 
diff --git a/src/AHFinder_mask.F b/src/AHFinder_mask.F
index ed05799..95b5885 100644
--- a/src/AHFinder_mask.F
+++ b/src/AHFinder_mask.F
@@ -131,6 +131,12 @@
       call CCTK_SyncGroup(cctkGH,"ahfinder::ahfmask")
       call CartSymGN(ierr,cctkGH,"ahfinder::ahfmask")
 
+!     If desired, copy ahf_mask to einstein mask (emask).
+
+      if (use_mask.eq.1) then
+         emask = ahmask
+      end if
+
 
 !     ***************
 !     ***   END   ***