Made grid functions and variables private instead of public (I don't know why

they were public in the first place). Added a USES INCLUDE carpet.h. Added
tags='Prolongation="None"' to grid functions with only 1 timelevel. Added
a grid scalar to count iterations in the re-initialization so that I can use
the same variable in Fortran and C++.


git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinAnalysis/EHFinder/trunk@179 2a26948c-0e4f-0410-aee8-f1d3e353619c

1 files changed, 38 insertions, 24 deletions

diff --git a/interface.ccl b/interface.ccl
index 0f2a066..ae4d0e7 100644
--- a/interface.ccl
+++ b/interface.ccl
@@ -4,7 +4,7 @@
 implements: ehfinder
 inherits: grid admbase coordgauge staticconformal spacemask boundary
 
-USES INCLUDE: Boundary.h
+USES INCLUDE: Boundary.h carpet.h
 
 CCTK_INT FUNCTION MoLRegisterEvolvedGroup(CCTK_INT IN EvolvedIndex, \
                                           CCTK_INT IN RHSIndex)
@@ -19,54 +19,63 @@ CCTK_INT FUNCTION Boundary_SelectGroupForBC(CCTK_POINTER_TO_CONST IN GH, \
 
 USES FUNCTION Boundary_SelectGroupForBC
 
-public:
+private:
 
 # The scalar level set functions that defines the null surfaces.
-CCTK_REAL f[eh_number_level_sets] TYPE=GF TIMELEVELS=2
+CCTK_REAL f[eh_number_level_sets] TYPE=GF TIMELEVELS=3
 
 # Sources for the level set functions.
-CCTK_REAL sf[eh_number_level_sets] TYPE=GF TIMELEVELS=1
+CCTK_REAL sf[eh_number_level_sets] TYPE=GF TIMELEVELS=1 tags='tensortypealias="Scalar" Prolongation="None"'
 
 # X-derivatives of the level set functions.
-CCTK_REAL dfx[eh_number_level_sets] TYPE=GF TIMELEVELS=1
+CCTK_REAL dfx[eh_number_level_sets] TYPE=GF TIMELEVELS=1 tags='Prolongation="None"'
 
 # Y-derivatives of the level set functions.
-CCTK_REAL dfy[eh_number_level_sets] TYPE=GF TIMELEVELS=1
+CCTK_REAL dfy[eh_number_level_sets] TYPE=GF TIMELEVELS=1 tags='Prolongation="None"'
 
 # Z-derivatives of the level set functions.
-CCTK_REAL dfz[eh_number_level_sets] TYPE=GF TIMELEVELS=1
+CCTK_REAL dfz[eh_number_level_sets] TYPE=GF TIMELEVELS=1 tags='Prolongation="None"'
 
 # Squares of the derivatives of the level set functions.
-CCTK_REAL dfsq[eh_number_level_sets] TYPE=GF TIMELEVELS=1
+CCTK_REAL dfsq[eh_number_level_sets] TYPE=GF TIMELEVELS=1 tags='tensortypealias="Scalar" Prolongation="None"'
 
 # Temporary variables used in pde re-initialization.
-CCTK_REAL ftmp[eh_number_level_sets] TYPE=GF TIMELEVELS=1
+CCTK_REAL ftmp[eh_number_level_sets] TYPE=GF TIMELEVELS=1 tags='tensortypealias="Scalar" Prolongation="None"'
 
 # Temporary variables for the right hand side used in pde re-initialization.
-CCTK_REAL sftmp[eh_number_level_sets] TYPE=GF TIMELEVELS=1
+CCTK_REAL sftmp[eh_number_level_sets] TYPE=GF TIMELEVELS=1 tags='tensortypealias="Scalar" Prolongation="None"'
 
 # Temporary placeholder for the level set during re-initialization.
-CCTK_REAL fbak[eh_number_level_sets] TYPE=GF TIMELEVELS=1
+CCTK_REAL fbak[eh_number_level_sets] TYPE=GF TIMELEVELS=1 tags='tensortypealias="Scalar" Prolongation="None"'
 
-CCTK_REAL g3inv TYPE=GF TIMELEVELS=1
+CCTK_REAL g3inv TYPE=GF TIMELEVELS=1 tags='tensortypealias="Scalar" Prolongation="None"'
 {
   g3xx, g3xy, g3xz, g3yy, g3yz, g3zz
 } "The inverse of the 3-metric"
 
 # Masks to define active cells.
-CCTK_INT eh_mask[eh_number_level_sets] TYPE=GF TIMELEVELS=1
+CCTK_INT eh_mask[eh_number_level_sets] TYPE=GF TIMELEVELS=1 tags='tensortypealias="Scalar" Prolongation="None"'
 
 # Temporary masks to define active cells.
-CCTK_INT tm_mask[eh_number_level_sets] TYPE=GF TIMELEVELS=1
+CCTK_INT tm_mask[eh_number_level_sets] TYPE=GF TIMELEVELS=1 tags='tensortypealias="Scalar" Prolongation="None"'
 
 # Temporary placeholders for the masks during re-initialization.
-CCTK_INT eh_mask_bak[eh_number_level_sets] TYPE=GF TIMELEVELS=1
+CCTK_INT eh_mask_bak[eh_number_level_sets] TYPE=GF TIMELEVELS=1 tags='tensortypealias="Scalar" Prolongation="None"'
 
 # Control variable for while loops in re-initialization.
 CCTK_INT re_init_control TYPE=SCALAR
  
+# Counter for iterations in re-initialization.
+CCTK_INT niter_reinit TYPE=SCALAR
+ 
+## Control variable for while loops in re-initialization (used with PUGH).
+#CCTK_INT pugh_re_init_control TYPE=SCALAR
+# 
+## Control variable for while loops in re-initialization (used with Carpet).
+#CCTK_INT carpet_re_init_control TYPE=SCALAR
+
 # Grid function used in counting surfaces.
-CCTK_INT surface_index TYPE=GF TIMELEVELS=1
+CCTK_INT surface_index TYPE=GF TIMELEVELS=1 tags='tensortypealias="Scalar" Prolongation="None"'
 {
   sc
 }
@@ -168,13 +177,13 @@ CCTK_REAL eh_circ_eq2[eh_number_level_sets] TYPE=ARRAY DIM=1 TIMELEVELS=1 SIZE=m
 CCTK_REAL eh_circ_pol2[eh_number_level_sets] TYPE=ARRAY DIM=1 TIMELEVELS=1 SIZE=maximum_surface_number GHOSTSIZE=0 DISTRIB=DEFAULT
 
 # The X-position of the generators of the event horizons.
-CCTK_REAL xg[eh_number_level_sets] TYPE=ARRAY DIM=1 TIMELEVELS=2 SIZE=number_of_generators GHOSTSIZE=0 DISTRIB=DEFAULT
+CCTK_REAL xg[eh_number_level_sets] TYPE=ARRAY DIM=1 TIMELEVELS=3 SIZE=number_of_generators GHOSTSIZE=0 DISTRIB=DEFAULT
 
 # The Y-position of the generators of the event horizons.
-CCTK_REAL yg[eh_number_level_sets] TYPE=ARRAY DIM=1 TIMELEVELS=2 SIZE=number_of_generators GHOSTSIZE=0 DISTRIB=DEFAULT
+CCTK_REAL yg[eh_number_level_sets] TYPE=ARRAY DIM=1 TIMELEVELS=3 SIZE=number_of_generators GHOSTSIZE=0 DISTRIB=DEFAULT
 
 # The Z-position of the generators of the event horizons.
-CCTK_REAL zg[eh_number_level_sets] TYPE=ARRAY DIM=1 TIMELEVELS=2 SIZE=number_of_generators GHOSTSIZE=0 DISTRIB=DEFAULT
+CCTK_REAL zg[eh_number_level_sets] TYPE=ARRAY DIM=1 TIMELEVELS=3 SIZE=number_of_generators GHOSTSIZE=0 DISTRIB=DEFAULT
 
 # The right hand side of the X-position of the generators.
 CCTK_REAL dxg[eh_number_level_sets] TYPE=ARRAY DIM=1 TIMELEVELS=1 SIZE=number_of_generators GHOSTSIZE=0 DISTRIB=DEFAULT
@@ -191,7 +200,7 @@ CCTK_REAL generator_arrays TYPE=ARRAY DIM=1 TIMELEVELS=1 SIZE=number_of_generato
   alpg, betaxg, betayg, betazg, gxxg, gxyg, gxzg, gyyg, gyzg, gzzg, dfxg, dfyg, dfzg, psig
 } "Arrays to hold the interpolated metric, gauge and level set data"
 
-CCTK_REAL generator_gf TYPE=GF TIMELEVELS=1
+CCTK_REAL generator_gf TYPE=GF TIMELEVELS=1 tags='Prolongation="None"'
 {
   xgf, ygf, zgf
 } "Temporary grid function used in calculating the right hand side of the generator evolution equation"
@@ -199,13 +208,13 @@ CCTK_REAL generator_gf TYPE=GF TIMELEVELS=1
 # The following is for a 2-d distribution of generators on the surface.
 
 # The X-position of the generators of the event horizons.
-CCTK_REAL xg2[eh_number_level_sets] TYPE=ARRAY DIM=2 TIMELEVELS=2 SIZE=number_of_generators_theta,number_of_generators_phi GHOSTSIZE=0,0 DISTRIB=DEFAULT
+CCTK_REAL xg2[eh_number_level_sets] TYPE=ARRAY DIM=2 TIMELEVELS=3 SIZE=number_of_generators_theta,number_of_generators_phi GHOSTSIZE=0,0 DISTRIB=DEFAULT
 
 # The Y-position of the generators of the event horizons.
-CCTK_REAL yg2[eh_number_level_sets] TYPE=ARRAY DIM=2 TIMELEVELS=2 SIZE=number_of_generators_theta,number_of_generators_phi GHOSTSIZE=0,0 DISTRIB=DEFAULT
+CCTK_REAL yg2[eh_number_level_sets] TYPE=ARRAY DIM=2 TIMELEVELS=3 SIZE=number_of_generators_theta,number_of_generators_phi GHOSTSIZE=0,0 DISTRIB=DEFAULT
 
 # The Z-position of the generators of the event horizons.
-CCTK_REAL zg2[eh_number_level_sets] TYPE=ARRAY DIM=2 TIMELEVELS=2 SIZE=number_of_generators_theta,number_of_generators_phi GHOSTSIZE=0,0 DISTRIB=DEFAULT
+CCTK_REAL zg2[eh_number_level_sets] TYPE=ARRAY DIM=2 TIMELEVELS=3 SIZE=number_of_generators_theta,number_of_generators_phi GHOSTSIZE=0,0 DISTRIB=DEFAULT
 
 # The right hand side of the X-position of the generators.
 CCTK_REAL dxg2[eh_number_level_sets] TYPE=ARRAY DIM=2 TIMELEVELS=1 SIZE=number_of_generators_theta,number_of_generators_phi GHOSTSIZE=0,0 DISTRIB=DEFAULT
@@ -222,8 +231,13 @@ CCTK_REAL generator_arrays2 TYPE=ARRAY DIM=2 TIMELEVELS=1 SIZE=number_of_generat
   alpg2, betaxg2, betayg2, betazg2, gxxg2, gxyg2, gxzg2, gyyg2, gyzg2, gzzg2, dfxg2, dfyg2, dfzg2, psig2
 } "Arrays to hold the interpolated metric, gauge and level set data"
 
-CCTK_REAL generator_gf2 TYPE=GF TIMELEVELS=1
+CCTK_REAL generator_gf2 TYPE=GF TIMELEVELS=1 tags='Prolongation="None"'
 {
   xgf2, ygf2, zgf2
 } "Temporary grid function used in calculating the right hand side of the generator evolution equation"
 
+## Counter for re-initialization iterations.
+#CCTK_INT niter TYPE=SCALAR
+#
+## Counter for re-initialization iterations.
+#CCTK_INT niter2 TYPE=SCALAR