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, 42 insertions, 8 deletions

diff --git a/interface.ccl b/interface.ccl
index a677f75..5890c5e 100644
--- a/interface.ccl
+++ b/interface.ccl
@@ -60,13 +60,14 @@ CCTK_INT surface_integers TYPE=SCALAR
 
 CCTK_REAL surface_reals TYPE=SCALAR
 {
-  sym_factor
+  sym_factor, theta_sym_factor, phi_sym_factor
 } "Real variables used in surface integration"
 
 CCTK_REAL surface_arrays TYPE=ARRAY DIM=2 TIMELEVELS=1 SIZE=ntheta,nphi GHOSTSIZE=n_array_ghosts,n_array_ghosts DISTRIB=DEFAULT
 {
   ctheta, cphi, rsurf, sintheta, costheta, sinphi, cosphi,
-  drdtheta, drdphi, da, gtt, gtp, gpp, weights
+  drdtheta, drdphi, da, gtt, gtp, gpp, weights, dltheta, dlphi,
+  thetaweights, phiweights
 } "Grid arrays for points on the surface"
 
 CCTK_REAL surface_tmp_arrays TYPE=ARRAY DIM=2 TIMELEVELS=1 SIZE=ntheta,nphi GHOSTSIZE=n_array_ghosts,n_array_ghosts DISTRIB=DEFAULT
@@ -100,30 +101,63 @@ CCTK_INT rep_mask TYPE=GF TIMELEVELS=1
 CCTK_INT re_param_control_pde TYPE=SCALAR
 CCTK_INT re_param_control_approx TYPE=SCALAR
 
-#CCTK_REAL eh_area TYPE=ARRAY DIM=1 TIMELEVELS=1 SIZE=maximum_surface_number GHOSTSIZE=0 DISTRIB=DEFAULT
+CCTK_REAL eh_area TYPE=ARRAY DIM=1 TIMELEVELS=1 SIZE=maximum_surface_number GHOSTSIZE=0 DISTRIB=DEFAULT
 
-CCTK_REAL eh_area TYPE=ARRAY DIM=1 TIMELEVELS=1 SIZE=maximum_surface_number DISTRIB=CONSTANT
+#CCTK_REAL eh_area TYPE=ARRAY DIM=1 TIMELEVELS=1 SIZE=maximum_surface_number DISTRIB=CONSTANT
 
 #CCTK_REAL eh_area[maximum_surface_number] TYPE=SCALAR
 
-#CCTK_REAL eh_area2 TYPE=ARRAY DIM=1 TIMELEVELS=1 SIZE=maximum_surface_number GHOSTSIZE=0 DISTRIB=DEFAULT #"The area of the event horizon(s)"
-CCTK_REAL eh_area2 TYPE=ARRAY DIM=1 TIMELEVELS=1 SIZE=maximum_surface_number DISTRIB=CONSTANT #"The area of the event horizon(s)"
+CCTK_REAL eh_area2 TYPE=ARRAY DIM=1 TIMELEVELS=1 SIZE=maximum_surface_number GHOSTSIZE=0 DISTRIB=DEFAULT #"The area of the event horizon(s)"
+
+#CCTK_REAL eh_area2 TYPE=ARRAY DIM=1 TIMELEVELS=1 SIZE=maximum_surface_number DISTRIB=CONSTANT #"The area of the event horizon(s)"
 
 #CCTK_REAL eh_area2[maximum_surface_number] TYPE=SCALAR
 #CCTK_REAL eh_area3 TYPE=ARRAY DIM=1 TIMELEVELS=1 SIZE=maximum_surface_number DISTRIB=CONSTANT
 
-CCTK_REAL eh_centroid TYPE=ARRAY DIM=1 TIMELEVELS=1 SIZE=maximum_surface_number DISTRIB=CONSTANT
+#CCTK_REAL eh_centroid TYPE=ARRAY DIM=1 TIMELEVELS=1 SIZE=maximum_surface_number DISTRIB=CONSTANT
+#{
+#  eh_centroid_x, eh_centroid_y, eh_centroid_z
+#} "The centroid of the event horizon(s)"
+
+CCTK_REAL eh_centroid TYPE=ARRAY DIM=1 TIMELEVELS=1 SIZE=maximum_surface_number GHOSTSIZE=0 DISTRIB=DEFAULT
 {
   eh_centroid_x, eh_centroid_y, eh_centroid_z
 } "The centroid of the event horizon(s)"
 
-CCTK_REAL eh_centroid2 TYPE=ARRAY DIM=1 TIMELEVELS=1 SIZE=maximum_surface_number DISTRIB=CONSTANT
+#CCTK_REAL eh_centroid2 TYPE=ARRAY DIM=1 TIMELEVELS=1 SIZE=maximum_surface_number DISTRIB=CONSTANT
+#{
+#  eh_centroid2_x, eh_centroid2_y, eh_centroid2_z
+#} "The centroid of the event horizon(s)"
+
+CCTK_REAL eh_centroid2 TYPE=ARRAY DIM=1 TIMELEVELS=1 SIZE=maximum_surface_number GHOSTSIZE=0 DISTRIB=DEFAULT
 {
   eh_centroid2_x, eh_centroid2_y, eh_centroid2_z
 } "The centroid of the event horizon(s)"
 
+#CCTK_REAL eh_circumference TYPE=ARRAY DIM=1 TIMELEVELS=1 SIZE=maximum_surface_number DISTRIB=CONSTANT
+#{
+#  eh_circ_eq, eh_circ_pol
+#} "The circumferences of the event horizon(s)"
+
+CCTK_REAL eh_circumference TYPE=ARRAY DIM=1 TIMELEVELS=1 SIZE=maximum_surface_number GHOSTSIZE=0 DISTRIB=DEFAULT
+{
+  eh_circ_eq, eh_circ_pol
+} "The circumferences of the event horizon(s)"
+
+#CCTK_REAL eh_circumference2 TYPE=ARRAY DIM=1 TIMELEVELS=1 SIZE=maximum_surface_number DISTRIB=CONSTANT
+#{
+#  eh_circ_eq2, eh_circ_pol2
+#} "The circumferences of the event horizon(s)"
+
+CCTK_REAL eh_circumference2 TYPE=ARRAY DIM=1 TIMELEVELS=1 SIZE=maximum_surface_number GHOSTSIZE=0 DISTRIB=DEFAULT
+{
+  eh_circ_eq2, eh_circ_pol2
+} "The circumferences of the event horizon(s)"
+
 #CCTK_REAL eh_centroid3 TYPE=ARRAY DIM=1 TIMELEVELS=1 SIZE=maximum_surface_number DISTRIB=CONSTANT
 #{
 #  eh_centroid3_x, eh_centroid3_y, eh_centroid3_z
 #} "The centroid of the event horizon(s)"
 
+CCTK_REAL eh_group_test[maximum_surface_number] TYPE=SCALAR
+CCTK_REAL eh_group_array_test[maximum_surface_number] TYPE=ARRAY DIM=1 SIZE=100 GHOSTSIZE=0 DISTRIB=DEFAULT