Changed to using vector groups of the level set function and related

grid functions. More changes are needed to make everything work as before
but all of the standard features seem to be working.


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

1 files changed, 83 insertions, 87 deletions

diff --git a/interface.ccl b/interface.ccl
index 09ad541..fd1f3b7 100644
--- a/interface.ccl
+++ b/interface.ccl
@@ -17,41 +17,47 @@ USES FUNCTION MoLRegisterEvolvedGroup
 
 public:
 
-CCTK_REAL level_set TYPE=GF TIMELEVELS=2
-{
-  f
-} "The scalar level set function that defines the null surface"
+# The scalar level set functions that defines the null surfaces.
+CCTK_REAL f[eh_number_level_sets] TYPE=GF TIMELEVELS=2
 
-CCTK_REAL slevel_set TYPE=GF TIMELEVELS=1
-{
-  sf
-} "Source for the level set function"
+# Sources for the level set functions.
+CCTK_REAL sf[eh_number_level_sets] TYPE=GF TIMELEVELS=1
 
-CCTK_REAL dlevel_set TYPE=GF TIMELEVELS=1
-{
-  dfx, dfy, dfz, dfsq
-} "Derivatives of the level set function"
+# X-derivatives of the level set functions.
+CCTK_REAL dfx[eh_number_level_sets] TYPE=GF TIMELEVELS=1
 
-CCTK_REAL ftmp_set TYPE=GF TIMELEVELS=1
-{
-  ftmp, sftmp
-} "temporary variables used in pde re-parametrization"
+# Y-derivatives of the level set functions.
+CCTK_REAL dfy[eh_number_level_sets] TYPE=GF TIMELEVELS=1
 
-CCTK_REAL level_bak TYPE=GF TIMELEVELS=1
-{
-  fbak
-} "Temporary placeholder for the level set during re-parametrization"
+# Z-derivatives of the level set functions.
+CCTK_REAL dfz[eh_number_level_sets] TYPE=GF TIMELEVELS=1
 
-CCTK_INT eh_mask_all TYPE=GF TIMELEVELS=1
-{
-  eh_mask, tm_mask
-} "Masks to define active cells"
+# Squares of the derivatives of the level set functions.
+CCTK_REAL dfsq[eh_number_level_sets] TYPE=GF TIMELEVELS=1
 
-CCTK_INT mask_bak TYPE=GF TIMELEVELS=1
-{
-  eh_mask_bak
-} "Temporary placeholder for the mask during re-parametrization"
+# Temporary variables used in pde re-parametrization.
+CCTK_REAL ftmp[eh_number_level_sets] TYPE=GF TIMELEVELS=1
 
+# Temporary variables for the right hand side used in pde re-parametrization.
+CCTK_REAL sftmp[eh_number_level_sets] TYPE=GF TIMELEVELS=1
+
+# Temporary placeholder for the level set during re-parametrization.
+CCTK_REAL fbak[eh_number_level_sets] TYPE=GF TIMELEVELS=1
+
+# Masks to define active cells.
+CCTK_INT eh_mask[eh_number_level_sets] TYPE=GF TIMELEVELS=1
+
+# Temporary masks to define active cells.
+CCTK_INT tm_mask[eh_number_level_sets] TYPE=GF TIMELEVELS=1
+
+# Temporary placeholders for the masks during re-parametrization.
+CCTK_INT eh_mask_bak[eh_number_level_sets] TYPE=GF TIMELEVELS=1
+
+#CCTK_INT rep_mask[eh_number_level_sets] TYPE=GF TIMELEVELS=1
+
+CCTK_INT re_param_control_pde TYPE=SCALAR
+CCTK_INT re_param_control_approx TYPE=SCALAR
+ 
 CCTK_INT surface_index TYPE=GF TIMELEVELS=1
 {
   sc
@@ -59,6 +65,12 @@ CCTK_INT surface_index TYPE=GF TIMELEVELS=1
 
 CCTK_INT find_surface_status TYPE=SCALAR
 
+CCTK_INT levelset_integers TYPE=SCALAR
+{
+  levelset_counter
+  more_levelsets
+} "Integer variables used to loop over the level sets"
+
 CCTK_INT surface_integers TYPE=SCALAR
 {
   surface_counter
@@ -106,89 +118,73 @@ CCTK_REAL integrate_tmp_array TYPE=ARRAY DIM=2 TIMELEVELS=1 SIZE=ntheta,nphi GHO
   int_tmp
 }
 
-CCTK_INT rep_mask TYPE=GF TIMELEVELS=1
+#CCTK_INT rep_mask TYPE=GF TIMELEVELS=1
 
-CCTK_INT re_param_control_pde TYPE=SCALAR
-CCTK_INT re_param_control_approx TYPE=SCALAR
+# Storage for the event horizon areas. This is used to trigger output.
+CCTK_REAL eh_area[eh_number_level_sets] TYPE=ARRAY DIM=1 TIMELEVELS=1 SIZE=maximum_surface_number GHOSTSIZE=0 DISTRIB=DEFAULT
 
-CCTK_REAL eh_area TYPE=ARRAY DIM=1 TIMELEVELS=1 SIZE=maximum_surface_number GHOSTSIZE=0 DISTRIB=DEFAULT
+# Temporary storage for the event horizon areas.
+CCTK_REAL eh_area2[eh_number_level_sets] TYPE=ARRAY DIM=1 TIMELEVELS=1 SIZE=maximum_surface_number GHOSTSIZE=0 DISTRIB=DEFAULT 
 
-#CCTK_REAL eh_area TYPE=ARRAY DIM=1 TIMELEVELS=1 SIZE=maximum_surface_number DISTRIB=CONSTANT
+# Storage for the event horizon x-centroids. This is used to trigger output.
+CCTK_REAL eh_centroid_x[eh_number_level_sets] TYPE=ARRAY DIM=1 TIMELEVELS=1 SIZE=maximum_surface_number GHOSTSIZE=0 DISTRIB=DEFAULT
 
-#CCTK_REAL eh_area[maximum_surface_number] TYPE=SCALAR
+# Storage for the event horizon y-centroids. This is used to trigger output.
+CCTK_REAL eh_centroid_y[eh_number_level_sets] TYPE=ARRAY DIM=1 TIMELEVELS=1 SIZE=maximum_surface_number GHOSTSIZE=0 DISTRIB=DEFAULT
 
-CCTK_REAL eh_area2 TYPE=ARRAY DIM=1 TIMELEVELS=1 SIZE=maximum_surface_number GHOSTSIZE=0 DISTRIB=DEFAULT #"The area of the event horizon(s)"
+# Storage for the event horizon z-centroids. This is used to trigger output.
+CCTK_REAL eh_centroid_z[eh_number_level_sets] TYPE=ARRAY DIM=1 TIMELEVELS=1 SIZE=maximum_surface_number GHOSTSIZE=0 DISTRIB=DEFAULT
 
-#CCTK_REAL eh_area2 TYPE=ARRAY DIM=1 TIMELEVELS=1 SIZE=maximum_surface_number DISTRIB=CONSTANT #"The area of the event horizon(s)"
+# Temporary storage for the event horizon x-centroids.
+CCTK_REAL eh_centroid2_x[eh_number_level_sets] TYPE=ARRAY DIM=1 TIMELEVELS=1 SIZE=maximum_surface_number GHOSTSIZE=0 DISTRIB=DEFAULT
 
-#CCTK_REAL eh_area2[maximum_surface_number] TYPE=SCALAR
-#CCTK_REAL eh_area3 TYPE=ARRAY DIM=1 TIMELEVELS=1 SIZE=maximum_surface_number DISTRIB=CONSTANT
+# Temporary storage for the event horizon y-centroids.
+CCTK_REAL eh_centroid2_y[eh_number_level_sets] TYPE=ARRAY DIM=1 TIMELEVELS=1 SIZE=maximum_surface_number GHOSTSIZE=0 DISTRIB=DEFAULT
 
-#CCTK_REAL eh_centroid TYPE=ARRAY DIM=1 TIMELEVELS=1 SIZE=maximum_surface_number DISTRIB=CONSTANT
-#{
-#  eh_centroid_x, eh_centroid_y, eh_centroid_z
-#} "The centroid of the event horizon(s)"
+# Temporary storage for the event horizon z-centroids.
+CCTK_REAL eh_centroid2_z[eh_number_level_sets] TYPE=ARRAY DIM=1 TIMELEVELS=1 SIZE=maximum_surface_number GHOSTSIZE=0 DISTRIB=DEFAULT
 
-CCTK_REAL eh_centroid TYPE=ARRAY DIM=1 TIMELEVELS=1 SIZE=maximum_surface_number GHOSTSIZE=0 DISTRIB=DEFAULT
-{
-  eh_centroid_x, eh_centroid_y, eh_centroid_z
-} "The centroid of the event horizon(s)"
+# Storage for the event horizon equatorial circumferences.
+# This is used to trigger output.
+CCTK_REAL eh_circ_eq[eh_number_level_sets] TYPE=ARRAY DIM=1 TIMELEVELS=1 SIZE=maximum_surface_number GHOSTSIZE=0 DISTRIB=DEFAULT
 
-#CCTK_REAL eh_centroid2 TYPE=ARRAY DIM=1 TIMELEVELS=1 SIZE=maximum_surface_number DISTRIB=CONSTANT
-#{
-#  eh_centroid2_x, eh_centroid2_y, eh_centroid2_z
-#} "The centroid of the event horizon(s)"
+# Storage for the event horizon polar circumferences.
+#This is used to trigger output.
+CCTK_REAL eh_circ_pol[eh_number_level_sets] TYPE=ARRAY DIM=1 TIMELEVELS=1 SIZE=maximum_surface_number GHOSTSIZE=0 DISTRIB=DEFAULT
 
-CCTK_REAL eh_centroid2 TYPE=ARRAY DIM=1 TIMELEVELS=1 SIZE=maximum_surface_number GHOSTSIZE=0 DISTRIB=DEFAULT
-{
-  eh_centroid2_x, eh_centroid2_y, eh_centroid2_z
-} "The centroid of the event horizon(s)"
+# Temporary storage for the event horizon equatorial circumferences.
+# This is used to trigger output.
+CCTK_REAL eh_circ_eq2[eh_number_level_sets] TYPE=ARRAY DIM=1 TIMELEVELS=1 SIZE=maximum_surface_number GHOSTSIZE=0 DISTRIB=DEFAULT
 
-#CCTK_REAL eh_circumference TYPE=ARRAY DIM=1 TIMELEVELS=1 SIZE=maximum_surface_number DISTRIB=CONSTANT
-#{
-#  eh_circ_eq, eh_circ_pol
-#} "The circumferences of the event horizon(s)"
+# Temporary storage for the event horizon polar circumferences.
+# This is used to trigger output.
+CCTK_REAL eh_circ_pol2[eh_number_level_sets] TYPE=ARRAY DIM=1 TIMELEVELS=1 SIZE=maximum_surface_number GHOSTSIZE=0 DISTRIB=DEFAULT
 
-CCTK_REAL eh_circumference TYPE=ARRAY DIM=1 TIMELEVELS=1 SIZE=maximum_surface_number GHOSTSIZE=0 DISTRIB=DEFAULT
-{
-  eh_circ_eq, eh_circ_pol
-} "The circumferences of the event horizon(s)"
+# 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 eh_circumference2 TYPE=ARRAY DIM=1 TIMELEVELS=1 SIZE=maximum_surface_number DISTRIB=CONSTANT
-#{
-#  eh_circ_eq2, eh_circ_pol2
-#} "The circumferences of the event horizon(s)"
+# 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 eh_circumference2 TYPE=ARRAY DIM=1 TIMELEVELS=1 SIZE=maximum_surface_number GHOSTSIZE=0 DISTRIB=DEFAULT
-{
-  eh_circ_eq2, eh_circ_pol2
-} "The circumferences of the event horizon(s)"
+# 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 eh_centroid3 TYPE=ARRAY DIM=1 TIMELEVELS=1 SIZE=maximum_surface_number DISTRIB=CONSTANT
-#{
-#  eh_centroid3_x, eh_centroid3_y, eh_centroid3_z
-#} "The centroid of the event horizon(s)"
+# 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
 
-CCTK_REAL eh_group_test[maximum_surface_number] TYPE=SCALAR
-CCTK_REAL eh_group_array_test[maximum_surface_number] TYPE=ARRAY DIM=1 SIZE=100 GHOSTSIZE=0 DISTRIB=DEFAULT
+# The right hand side of the Y-position of the generators.
+CCTK_REAL dyg[eh_number_level_sets] TYPE=ARRAY DIM=1 TIMELEVELS=1 SIZE=number_of_generators GHOSTSIZE=0 DISTRIB=DEFAULT
 
-CCTK_REAL generators TYPE=ARRAY DIM=1 TIMELEVELS=2 SIZE=number_of_generators GHOSTSIZE=0 DISTRIB=DEFAULT
-{
-  xg, yg, zg
-} "The position of the generators of the event horizon"
+# The right hand side of the Z-position of the generators.
+CCTK_REAL dzg[eh_number_level_sets] TYPE=ARRAY DIM=1 TIMELEVELS=1 SIZE=number_of_generators GHOSTSIZE=0 DISTRIB=DEFAULT
 
-CCTK_REAL generators_rhs TYPE=ARRAY DIM=1 TIMELEVELS=1 SIZE=number_of_generators GHOSTSIZE=0 DISTRIB=DEFAULT
-{
-  dxg, dyg, dzg
-}
 
-CCTK_REAL generators_arrays TYPE=ARRAY DIM=1 TIMELEVELS=1 SIZE=number_of_generators GHOSTSIZE=0 DISTRIB=DEFAULT
+CCTK_REAL generator_arrays TYPE=ARRAY DIM=1 TIMELEVELS=1 SIZE=number_of_generators GHOSTSIZE=0 DISTRIB=DEFAULT
 {
   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
 {
   xgf, ygf, zgf
 } "Temporary grid function used in calculating the right hand side of the generator evolution equation"
-