Added variables and scheduled routines for calculating the eh centroid.

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

1 files changed, 21 insertions, 6 deletions

diff --git a/schedule.ccl b/schedule.ccl
index 7a6d5c8..47bafca 100644
--- a/schedule.ccl
+++ b/schedule.ccl
@@ -17,6 +17,7 @@ else
   STORAGE: mask_bak
   STORAGE: surface_arrays
   STORAGE: center_arrays
+  STORAGE: eh_area2
 }
 
 # Check for metric_state
@@ -70,7 +71,7 @@ schedule EHFinder_Init at CCTK_POSTINITIAL
   SYNC: level_set
 } "Setup the initial surface"
 
-schedule EHFinder_Init_Weights at CCTK_POSTINITIAL
+schedule EHFinder_InitWeights at CCTK_POSTINITIAL
 {
   LANG: FORTRAN
 } "Setup weights for Simpson integration"
@@ -79,7 +80,7 @@ schedule EHFinder_FindSurface at CCTK_ANALYSIS
 {
   LANG: Fortran
   STORAGE: surface_tmp_arrays, surface_int_array
-  TRIGGER: eh_area2
+  TRIGGER: eh_area2, eh_centroid
 } "Find Surface"
 
 schedule EHFinder_Integrate at CCTK_ANALYSIS after EHFinder_FindSurface
@@ -89,12 +90,26 @@ schedule EHFinder_Integrate at CCTK_ANALYSIS after EHFinder_FindSurface
   TRIGGER: eh_area
 } "Calculate integrals"
 
-schedule EHFinder_Integrate2 at CCTK_ANALYSIS after EHFinder_FindSurface
+schedule EHFinder_FindSurfaceElement at CCTK_ANALYSIS after EHFinder_FindSurface
 {
   LANG: Fortran
-  STORAGE: eh_area2, interp_metric_arrays, surface_tmp_arrays, integrate_tmp_array
-  TRIGGER: eh_area2
-} "Calculate integrals2"
+  STORAGE: surface_tmp_arrays, interp_metric_arrays 
+  TRIGGER: eh_area2, eh_centroid
+} "Find Surface Area Element"
+
+schedule EHFinder_IntegrateArea at CCTK_ANALYSIS after EHFinder_FindSurfaceElement
+{
+  LANG: Fortran
+  STORAGE: integrate_tmp_array
+  TRIGGER: eh_area2, eh_centroid
+} "Calculate area integrals"
+
+schedule EHFinder_IntegrateCentroid at CCTK_ANALYSIS after EHFinder_IntegrateArea
+{
+  LANG: Fortran
+  STORAGE: eh_centroid, surface_tmp_arrays, integrate_tmp_array
+  TRIGGER: eh_centroid
+} "Calculate centroid integrals"
 
 # Read in the data used in reconstructing the 4-metric if necessary