Adding calls to the routine that calculates the horizon locking shift,

plus a few other minor changes.


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

1 files changed, 33 insertions, 19 deletions

diff --git a/src/AHFinder.F b/src/AHFinder.F
index 2cb71aa..6f431f1 100644
--- a/src/AHFinder.F
+++ b/src/AHFinder.F
@@ -27,13 +27,13 @@
 
       logical status,horizon,gauss
 
-      integer handle,x_index,y_index,z_index,ierror
-      integer ahfso,ahfafter
-      integer i,j,l,m
-      integer NN
-      integer mtype
-      integer getoutpfx
-      integer istat
+      CCTK_INT handle,x_index,y_index,z_index,ierror
+      CCTK_INT ahfso,ahfafter
+      CCTK_INT i,j,l,m
+      CCTK_INT NN
+      CCTK_INT mtype
+      CCTK_INT getoutpfx
+      CCTK_INT istat
 
       CCTK_REAL atime
       CCTK_REAL zero,half,one
@@ -85,16 +85,6 @@
 !                  3.  Integral of H^2 is negative out and in.
 !                  4.  Integral of H^2 is positive out and in.
 
-
-!     **************************
-!     ***   DEFINE NUMBERS   ***
-!     **************************
-
-      zero = 0.0D0
-      half = 0.5D0
-      one  = 1.0D0
-
-
 !     ***********************************************************
 !     ***   CHECK IF WE WANT TO FIND A HORIZON AT THIS TIME   ***
 !     ***********************************************************
@@ -117,6 +107,15 @@
       if (mod(cctk_iteration-ahfafter,ahfso).ne.0) return
 
 
+!     **************************
+!     ***   DEFINE NUMBERS   ***
+!     **************************
+
+      zero = 0.0D0
+      half = 0.5D0
+      one  = 1.0D0
+
+
 !     ***************************
 !     ***   GRID PARAMETERS   ***
 !     ***************************
@@ -130,6 +129,13 @@
       dz = cctk_delta_space(3)
 
 
+!     *********************************************
+!     ***   SET SYMMETRIES FOR GRID FUNCTIONS   ***
+!     *********************************************
+
+      call AHFinder_SetSym(CCTK_FARGUMENTS)
+
+
 !     ********************************
 !     ***   INITIALIZE  {status}   ***
 !     ********************************
@@ -1423,8 +1429,6 @@
      .   ((mtype.eq.1).and.(CCTK_EQUALS(ahf_mask,'weak')))) then
 
          call AHFinder_mask(CCTK_FARGUMENTS,rhor)
-         call CCTK_SyncGroup(cctkGH,"ahfinder::ahfmask")
-         call CartSymBCGroup(ierr,cctkGH,"ahfinder::ahfmask")
 
 #ifdef DEVELOPMENT_SIMPLEEXCISION
 
@@ -1483,6 +1487,16 @@
       end if
 
 
+!     *****************
+!     ***   SHIFT   ***
+!     *****************
+
+      if (CCTK_EQUALS(shift,'locking1').or.
+     .    CCTK_EQUALS(shift,'locking2')) then
+         call AHFinder_shift(CCTK_FARGUMENTS)
+      end if
+
+
 !     **************************************************
 !     ***   TRANSFORM PHYSICAL TO CONFORMAL METRIC   ***
 !     **************************************************