Corrosponding changes to the *.ccl files in support of the area calculation.

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

1 files changed, 17 insertions, 4 deletions

diff --git a/schedule.ccl b/schedule.ccl
index 336f55b..7a6d5c8 100644
--- a/schedule.ccl
+++ b/schedule.ccl
@@ -16,6 +16,7 @@ else
   STORAGE: level_bak
   STORAGE: mask_bak
   STORAGE: surface_arrays
+  STORAGE: center_arrays
 }
 
 # Check for metric_state
@@ -69,6 +70,18 @@ schedule EHFinder_Init at CCTK_POSTINITIAL
   SYNC: level_set
 } "Setup the initial surface"
 
+schedule EHFinder_Init_Weights at CCTK_POSTINITIAL
+{
+  LANG: FORTRAN
+} "Setup weights for Simpson integration"
+
+schedule EHFinder_FindSurface at CCTK_ANALYSIS
+{
+  LANG: Fortran
+  STORAGE: surface_tmp_arrays, surface_int_array
+  TRIGGER: eh_area2
+} "Find Surface"
+
 schedule EHFinder_Integrate at CCTK_ANALYSIS after EHFinder_FindSurface
 {
   LANG: Fortran
@@ -76,12 +89,12 @@ schedule EHFinder_Integrate at CCTK_ANALYSIS after EHFinder_FindSurface
   TRIGGER: eh_area
 } "Calculate integrals"
 
-schedule EHFinder_FindSurface at CCTK_ANALYSIS
+schedule EHFinder_Integrate2 at CCTK_ANALYSIS after EHFinder_FindSurface
 {
   LANG: Fortran
-  STORAGE: eh_area, surface_tmp_arrays, surface_int_array
-  TRIGGER: eh_area
-} "Find Surface"
+  STORAGE: eh_area2, interp_metric_arrays, surface_tmp_arrays, integrate_tmp_array
+  TRIGGER: eh_area2
+} "Calculate integrals2"
 
 # Read in the data used in reconstructing the 4-metric if necessary