Added calculations of circumferences. Results of area, centroid and

circumference calculations are stored in 1D grid arrays. This will change
when support for vector groups of grid scalars are added to Cactus.


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

1 files changed, 26 insertions, 12 deletions

diff --git a/schedule.ccl b/schedule.ccl
index e049e3f..ade0b15 100644
--- a/schedule.ccl
+++ b/schedule.ccl
@@ -18,7 +18,7 @@ else
   STORAGE: surface_arrays
   STORAGE: center_arrays
 #  STORAGE: eh_area, eh_centroid
-  STORAGE: eh_area2, eh_centroid2
+  STORAGE: eh_area2, eh_centroid2, eh_circumference2
 #  STORAGE: surface_index
 }
 
@@ -92,65 +92,65 @@ schedule GROUP EHFinder_Surfaces at CCTK_ANALYSIS
   STORAGE: surface_reals
   STORAGE: surface_index
 #  STORAGE: eh_area2, eh_centroid2
-  TRIGGERS: eh_area, eh_centroid
+  TRIGGERS: eh_area, eh_centroid, eh_circumference
 } "Count the number of surfaces and integrate over them"
 
 
 schedule EHFinder_CountSurfacesInit in EHFinder_Surfaces
 {
   LANG: Fortran
-  TRIGGERS: eh_area, eh_centroid
+  TRIGGERS: eh_area, eh_centroid, eh_circumference
 } "Initialise while loop control"
 
 schedule GROUP EHFinder_CountMarkSurfaces in EHFinder_Surfaces after EHFinder_CountSurfacesInit WHILE ehfinder::more_surfaces
 {
-  TRIGGERS: eh_area, eh_centroid
+  TRIGGERS: eh_area, eh_centroid, eh_circumference
 } "Counting and mark surfaces"
 
 schedule EHFinder_CountSurfaces in EHFinder_CountMarkSurfaces
 {
   LANG: Fortran
-  TRIGGERS: eh_area, eh_centroid
+  TRIGGERS: eh_area, eh_centroid, eh_circumference
   SYNC: surface_index
 } "Check if there are more surfaces"
 
 schedule EHFinder_MarkSurfaces in EHFinder_CountMarkSurfaces after EHFinder_CountSurfaces WHILE ehfinder::more_points
 {
   LANG: Fortran
-  TRIGGERS: eh_area, eh_centroid
+  TRIGGERS: eh_area, eh_centroid, eh_circumference
   SYNC: surface_index
 } "Mark points inside the current surface"
 
 schedule EHFinder_InfoSurfaces in EHFinder_Surfaces after EHFinder_CountMarkSurfaces
 {
   LANG: Fortran
-  TRIGGERS: eh_area, eh_centroid
+  TRIGGERS: eh_area, eh_centroid, eh_circumference
 } "Output info about found surfaces"
 
 schedule group EHFinder_Integration in EHFinder_Surfaces after EHFinder_InfoSurfaces while ehfinder::integrate_counter
 {
-  TRIGGERS: eh_area, eh_centroid
+  TRIGGERS: eh_area, eh_centroid, eh_circumference
 } "Find and integrate over surfaces"
 
 schedule EHFinder_FindSurface in EHFinder_Integration
 {
   LANG: Fortran
   STORAGE: surface_tmp_arrays, surface_int_array
-  TRIGGERS: eh_area, eh_centroid
+  TRIGGERS: eh_area, eh_centroid, eh_circumference
 } "Find Surface"
 
 schedule EHFinder_FindSurfaceElement in EHFinder_Integration after EHFinder_FindSurface
 {
   LANG: Fortran
   STORAGE: surface_tmp_arrays, interp_metric_arrays 
-  TRIGGERS: eh_area, eh_centroid
+  TRIGGERS: eh_area, eh_centroid, eh_circumference
 } "Find Surface Area Element"
 
 schedule EHFinder_IntegrateArea in EHFinder_Integration after EHFinder_FindSurfaceElement
 {
   LANG: Fortran
   STORAGE: integrate_tmp_array 
-  TRIGGERS: eh_area, eh_centroid
+  TRIGGERS: eh_area, eh_centroid, eh_circumference
 } "Calculate area integrals"
 
 schedule EHFinder_IntegrateCentroid in EHFinder_Integration after EHFinder_IntegrateArea
@@ -160,6 +160,13 @@ schedule EHFinder_IntegrateCentroid in EHFinder_Integration after EHFinder_Integ
   TRIGGERS: eh_centroid
 } "Calculate centroid integrals"
 
+schedule EHFinder_IntegrateEquatorial in EHFinder_Integration after EHFinder_IntegrateArea
+{
+  LANG: Fortran
+  STORAGE: surface_tmp_arrays, integrate_tmp_array
+  TRIGGERS: eh_circumference
+} "Calculate circumferences"
+
 schedule EHFinder_CopyArea at CCTK_ANALYSIS after EHFinder_Surfaces
 {
   LANG: Fortran
@@ -172,7 +179,14 @@ schedule EHFinder_CopyCentroid at CCTK_ANALYSIS after EHFinder_Surfaces
   LANG: Fortran
   STORAGE: eh_centroid
   TRIGGERS: eh_centroid
-} "Copy areas to output variable"
+} "Copy centroids to output variable"
+
+schedule EHFinder_CopyCircumference at CCTK_ANALYSIS after EHFinder_Surfaces
+{
+  LANG: Fortran
+  STORAGE: eh_circumference
+  TRIGGERS: eh_circumference
+} "Copy circumferences to output variable"
 
 #schedule EHFinder_Integrate at CCTK_ANALYSIS
 #schedule EHFinder_Integrate at CCTK_ANALYSIS