Added routines to find out how many surfaces are present. At present

this information is not used. Added beginning support for the spacemask.
Only routine to read in the emask. Nothing is done with it.


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

1 files changed, 56 insertions, 0 deletions

diff --git a/schedule.ccl b/schedule.ccl
index 47bafca..572ea93 100644
--- a/schedule.ccl
+++ b/schedule.ccl
@@ -18,6 +18,7 @@ else
   STORAGE: surface_arrays
   STORAGE: center_arrays
   STORAGE: eh_area2
+#  STORAGE: surface_index
 }
 
 # Check for metric_state
@@ -63,6 +64,14 @@ if (CCTK_Equals(metric_type,"static conformal") && CCTK_Equals(eh_metric_type,"n
   } "Read in conformal factor from file"
 }
 
+if (use_mask)
+{
+  schedule EHFinder_Read_Mask at CCTK_INITIAL
+  {
+    LANG: Fortran
+  } "Read in excision mask from file"
+}
+
 # Set up the initial level set function
 
 schedule EHFinder_Init at CCTK_POSTINITIAL
@@ -76,6 +85,45 @@ schedule EHFinder_InitWeights at CCTK_POSTINITIAL
   LANG: FORTRAN
 } "Setup weights for Simpson integration"
 
+schedule GROUP EHFinder_Surfaces at CCTK_ANALYSIS
+{
+  STORAGE: more_surfaces, surface_counter, more_points, points_counter
+  STORAGE: surface_index
+  TRIGGER: eh_area2, eh_centroid
+} "Schedule group for counting the number of surfaces and integrating over them"
+
+
+schedule EHFinder_CountSurfacesInit in EHFinder_Surfaces
+{
+  LANG: Fortran
+  TRIGGER: eh_area2, eh_centroid
+} "Initialising while loop control for the group EHFinder_CountMarkSurfaces"
+
+schedule GROUP EHFinder_CountMarkSurfaces in EHFinder_Surfaces after EHFinder_CountSurfacesInit WHILE ehfinder::more_surfaces
+{
+  TRIGGER: eh_area2, eh_centroid
+} "Scedule group for counting and marking surfaces"
+
+schedule EHFinder_CountSurfaces in EHFinder_CountMarkSurfaces
+{
+  LANG: Fortran
+  TRIGGER: eh_area2, eh_centroid
+  SYNC: surface_index
+} "Check if there are more surfaces and initialise while loop control for EHFinder_MarkSurfaces"
+
+schedule EHFinder_MarkSurfaces in EHFinder_CountMarkSurfaces after EHFinder_CountSurfaces WHILE ehfinder::more_points
+{
+  LANG: Fortran
+  TRIGGER: eh_area2, eh_centroid
+  SYNC: surface_index
+} "Mark points inside the current surface until they are all marked"
+
+schedule EHFinder_InfoSurfaces in EHFinder_Surfaces after EHFinder_CountMarkSurfaces
+{
+  LANG: Fortran
+  TRIGGER: eh_area2, eh_centroid
+} "Output input about found surfaces"
+
 schedule EHFinder_FindSurface at CCTK_ANALYSIS
 {
   LANG: Fortran
@@ -145,6 +193,14 @@ if (CCTK_Equals(metric_type,"static conformal") && CCTK_Equals(eh_metric_type,"n
   } "Read in conformal factor from file"
 }
 
+if (use_mask)
+{
+  schedule EHFinder_Read_Mask at CCTK_PRESTEP
+  {
+    LANG: Fortran
+  } "Read in excision mask from file"
+}
+
 #schedule EHFinder_ReadData at CCTK_PRESTEP
 #{
 #  LANG: Fortran