This commit was generated by cvs2svn to compensate for changes in r5, which

included commits to RCS files with non-trunk default branches.

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

6 files changed, 50 insertions, 10 deletions

diff --git a/par/ahftest1.par b/par/ahftest1.par
new file mode 100644
index 0000000..12a7a23
--- /dev/null
+++ b/par/ahftest1.par
@@ -0,0 +1,41 @@
+
+activethorns = "CartGrid3D Einstein boundary adm IDAnalyticBH IOFlexIO IOUtil IOASCII PUGH ahfinder interp"
+
+grid::type = "byspacing"
+grid::dxyz = 0.1
+
+grid::domain = "octant"
+
+driver::global_nx = 64
+driver::global_ny = 64
+driver::global_nz = 64
+
+
+ahfinder::ah_persists = "no"
+ahfinder::ahf_active = "yes"
+ahfinder::ahf_flow = "yes"
+ahfinder::ahf_veryverbose ="yes"
+ahfinder::ahf_2Doutput = "yes"
+ahfinder::ahf_gaussout = "no"
+ahfinder::ahf_xc = 0.0
+ahfinder::ahf_yc = 0.0
+ahfinder::ahf_zc = 0.0
+ahfinder::ahf_findevery = 15
+
+
+einstein::initial_lapse = "one"
+einstein::slicing = "geodesic"
+adm::bound = "flat"
+adm::verbose = "yes"
+einstein::evolution_system = "ADM"
+
+
+
+IOASCII::out1D_vars = "einstein::psi grid::x einstein::gxy einstein::gxz einstein::gyy einstein::alp grid::r einstein::gxx "
+IO::outdir = "./test"
+IO::out_every = 1       
+cctk_itlast = 2
+
+#Einstein::use_conformal = "no"
+einstein::initial_data = "schwarzschild"
+IDAnalyticBH::mass =2.0
diff --git a/src/AHFinder_dat.F b/src/AHFinder_dat.F
index efcc6ae..c765baf 100644
--- a/src/AHFinder_dat.F
+++ b/src/AHFinder_dat.F
@@ -33,7 +33,7 @@ c@@*/
       CCTK_INT mfind,ahf_ncall
       CCTK_INT nx,ny,nz
       integer nprocs,myproc
-
+      integer ierr
       
       CCTK_REAL dx,dy,dz
       CCTK_REAL xc,yc,zc
diff --git a/src/AHFinder_exp.F b/src/AHFinder_exp.F
index 9ccea39..e321616 100644
--- a/src/AHFinder_exp.F
+++ b/src/AHFinder_exp.F
@@ -347,8 +347,8 @@ c Note that including cactus.h will also include AHFinder.h
 
 !            if ((contains("grid","octant").ne.0).or.
 !     .          (contains("grid","quadrant").ne.0)) then
-            if ((CCTK_Equals(symmetry,"octant").eq.1).or.
-     .           (CCTK_Equals(symmetry,"quadrant").eq.1)) then
+            if ((CCTK_Equals(domain,"octant").eq.1).or.
+     .           (CCTK_Equals(domain,"quadrant").eq.1)) then
 
                ahfgradx(1,j,k) = -ahfgradx(2,j,k)
             else
@@ -375,8 +375,8 @@ c Note that including cactus.h will also include AHFinder.h
 
 !            if ((contains("grid","octant").ne.0).or.
 !          .          (contains("grid","quadrant").ne.0)) then
-            if ((CCTK_Equals(symmetry,"octant").eq.1).or.
-     .           (CCTK_Equals(symmetry,"quadrant").eq.1)) then
+            if ((CCTK_Equals(domain,"octant").eq.1).or.
+     .           (CCTK_Equals(domain,"quadrant").eq.1)) then
                ahfgrady(i,1,k) = -ahfgrady(i,2,k)
             else
                ahfgrady(i,1,k) = +ahfgrady(i,2,k)
@@ -401,7 +401,7 @@ c Note that including cactus.h will also include AHFinder.h
             ahfgradn(i,j,1 ) = ahfgradn(i,j,2)
 
 !            if (contains("grid","octant").ne.0) then
-            if (CCTK_Equals(symmetry,"octant").eq.1) then
+            if (CCTK_Equals(domain,"octant").eq.1) then
                ahfgradz(i,j,1) = -ahfgradz(i,j,2)
             else
                ahfgradz(i,j,1) = +ahfgradz(i,j,2)
diff --git a/src/AHFinder_flow.F b/src/AHFinder_flow.F
index a44600d..c11f30d 100644
--- a/src/AHFinder_flow.F
+++ b/src/AHFinder_flow.F
@@ -166,7 +166,6 @@ c Note that including cactus.h will also include AHFinder.h
             call AHFinder_exp(CCTK_FARGUMENTS)
             call AHFinder_int(CCTK_FARGUMENTS)
 
-
 !           *****************************
 !           ***   CHECK ERROR FLAGS   ***
 !           *****************************
diff --git a/src/AHFinder_pow.F b/src/AHFinder_pow.F
index f605039..00e1e17 100644
--- a/src/AHFinder_pow.F
+++ b/src/AHFinder_pow.F
@@ -521,8 +521,8 @@ c Note that including cactus.h will also include AHFinder.h
 
 
 
-      REAL function PARABOLA(CCTK_FARGUMENTS,XA,XB,XC,FXA,FXB,FXC,FUNC,TOL,XMIN,
-     .                       error)
+      REAL function PARABOLA(CCTK_FARGUMENTS,XA,XB,XC,FXA,FXB,FXC,FUNC,
+     .  TOL,XMIN,error)
 
 !     Given a function F, and given a bracketing triplet of abscissas
 !     XA, XB, XC (such that XB is between XA and XC, and F(XB) is less
diff --git a/src/make.code.defn b/src/make.code.defn
index 0af2cc5..9b84fb9 100644
--- a/src/make.code.defn
+++ b/src/make.code.defn
@@ -6,4 +6,4 @@ SRCS +=  AHFinder_dat.F AHFinder.F \
               AHFinder_min.F AHFinder_pow.F AHFinder_leg.F \
               AHFinder_flow.F AHFinder_mask.F \
 	      AHFinder_find3.F AHFinder_calcsigma.F \
-              AHFinder_initguess.F    
+              AHFinder_initguess.F AHFinder_gau.F