1 files changed, 53 insertions, 30 deletions
diff --git a/schedule.ccl b/schedule.ccl
index 572ea93..7652251 100644
--- a/schedule.ccl
+++ b/schedule.ccl
@@ -17,7 +17,8 @@ else
   STORAGE: mask_bak
   STORAGE: surface_arrays
   STORAGE: center_arrays
-  STORAGE: eh_area2
+#  STORAGE: eh_area, eh_centroid
+  STORAGE: eh_area2, eh_centroid2
 #  STORAGE: surface_index
 }
 
@@ -88,77 +89,99 @@ schedule EHFinder_InitWeights at CCTK_POSTINITIAL
 schedule GROUP EHFinder_Surfaces at CCTK_ANALYSIS
 {
   STORAGE: more_surfaces, surface_counter, more_points, points_counter
+  STORAGE: integrate_counter
   STORAGE: surface_index
-  TRIGGER: eh_area2, eh_centroid
-} "Schedule group for counting the number of surfaces and integrating over them"
+#  STORAGE: eh_area2, eh_centroid2
+  TRIGGERS: eh_area, eh_centroid
+} "Count the number of surfaces and integrate over them"
 
 
 schedule EHFinder_CountSurfacesInit in EHFinder_Surfaces
 {
   LANG: Fortran
-  TRIGGER: eh_area2, eh_centroid
-} "Initialising while loop control for the group EHFinder_CountMarkSurfaces"
+  TRIGGERS: eh_area, eh_centroid
+} "Initialise while loop control"
 
 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"
+  TRIGGERS: eh_area, eh_centroid
+} "Counting and mark surfaces"
 
 schedule EHFinder_CountSurfaces in EHFinder_CountMarkSurfaces
 {
   LANG: Fortran
-  TRIGGER: eh_area2, eh_centroid
+  TRIGGERS: eh_area, eh_centroid
   SYNC: surface_index
-} "Check if there are more surfaces and initialise while loop control for EHFinder_MarkSurfaces"
+} "Check if there are more surfaces"
 
 schedule EHFinder_MarkSurfaces in EHFinder_CountMarkSurfaces after EHFinder_CountSurfaces WHILE ehfinder::more_points
 {
   LANG: Fortran
-  TRIGGER: eh_area2, eh_centroid
+  TRIGGERS: eh_area, eh_centroid
   SYNC: surface_index
-} "Mark points inside the current surface until they are all marked"
+} "Mark points inside the current surface"
 
 schedule EHFinder_InfoSurfaces in EHFinder_Surfaces after EHFinder_CountMarkSurfaces
 {
   LANG: Fortran
-  TRIGGER: eh_area2, eh_centroid
-} "Output input about found surfaces"
+  TRIGGERS: eh_area, eh_centroid
+} "Output info about found surfaces"
 
-schedule EHFinder_FindSurface at CCTK_ANALYSIS
+schedule group EHFinder_Integration in EHFinder_Surfaces after EHFinder_InfoSurfaces while ehfinder::integrate_counter
 {
-  LANG: Fortran
-  STORAGE: surface_tmp_arrays, surface_int_array
-  TRIGGER: eh_area2, eh_centroid
-} "Find Surface"
+  TRIGGERS: eh_area, eh_centroid
+} "Find and integrate over surfaces"
 
-schedule EHFinder_Integrate at CCTK_ANALYSIS after EHFinder_FindSurface
+schedule EHFinder_FindSurface in EHFinder_Integration
 {
   LANG: Fortran
-  STORAGE: eh_area
-  TRIGGER: eh_area
-} "Calculate integrals"
+  STORAGE: surface_tmp_arrays, surface_int_array
+  TRIGGERS: eh_area, eh_centroid
+} "Find Surface"
 
-schedule EHFinder_FindSurfaceElement at CCTK_ANALYSIS after EHFinder_FindSurface
+schedule EHFinder_FindSurfaceElement in EHFinder_Integration after EHFinder_FindSurface
 {
   LANG: Fortran
   STORAGE: surface_tmp_arrays, interp_metric_arrays 
-  TRIGGER: eh_area2, eh_centroid
+  TRIGGERS: eh_area, eh_centroid
 } "Find Surface Area Element"
 
-schedule EHFinder_IntegrateArea at CCTK_ANALYSIS after EHFinder_FindSurfaceElement
+schedule EHFinder_IntegrateArea in EHFinder_Integration after EHFinder_FindSurfaceElement
 {
   LANG: Fortran
-  STORAGE: integrate_tmp_array
-  TRIGGER: eh_area2, eh_centroid
+  STORAGE: integrate_tmp_array 
+  TRIGGERS: eh_area, eh_centroid
 } "Calculate area integrals"
 
-schedule EHFinder_IntegrateCentroid at CCTK_ANALYSIS after EHFinder_IntegrateArea
+schedule EHFinder_IntegrateCentroid in EHFinder_Integration after EHFinder_IntegrateArea
 {
   LANG: Fortran
-  STORAGE: eh_centroid, surface_tmp_arrays, integrate_tmp_array
-  TRIGGER: eh_centroid
+  STORAGE: surface_tmp_arrays, integrate_tmp_array
+  TRIGGERS: eh_centroid
 } "Calculate centroid integrals"
 
+schedule EHFinder_CopyArea at CCTK_ANALYSIS after EHFinder_Surfaces
+{
+  LANG: Fortran
+  STORAGE: eh_area
+  TRIGGERS: eh_area
+} "Copy areas to output variable"
+
+schedule EHFinder_CopyCentroid at CCTK_ANALYSIS after EHFinder_Surfaces
+{
+  LANG: Fortran
+  STORAGE: eh_centroid
+  TRIGGERS: eh_centroid
+} "Copy areas to output variable"
+
+#schedule EHFinder_Integrate at CCTK_ANALYSIS
+#schedule EHFinder_Integrate at CCTK_ANALYSIS
+#{
+#  LANG: Fortran
+#  STORAGE: eh_area
+#  TRIGGERS: eh_area
+#} "Calculate integrals"
+
 # Read in the data used in reconstructing the 4-metric if necessary
 
 if (CCTK_Equals(eh_metric_type,"numerical"))