aboutsummaryrefslogtreecommitdiff
path: root/src/driver/find_horizons.cc
diff options
context:
space:
mode:
authorjthorn <jthorn@f88db872-0e4f-0410-b76b-b9085cfa78c5>2002-11-15 15:13:57 +0000
committerjthorn <jthorn@f88db872-0e4f-0410-b76b-b9085cfa78c5>2002-11-15 15:13:57 +0000
commitc6f79b96c5c07f518dd8bbfd2829dda289be25cb (patch)
tree2235a15480838e46420d0f6f34db175441894c3d /src/driver/find_horizons.cc
parent998e71cd3357c649978ccf012e6b8f990be9b2bf (diff)
rename parameter surface_integral_method to integral_method
add support for computing BH circumferences in xy, xz, yz planes as requested by Ed recently git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinAnalysis/AHFinderDirect/trunk@893 f88db872-0e4f-0410-b76b-b9085cfa78c5
Diffstat (limited to 'src/driver/find_horizons.cc')
-rw-r--r--src/driver/find_horizons.cc28
1 files changed, 23 insertions, 5 deletions
diff --git a/src/driver/find_horizons.cc b/src/driver/find_horizons.cc
index 0dd4356..35b5085 100644
--- a/src/driver/find_horizons.cc
+++ b/src/driver/find_horizons.cc
@@ -578,15 +578,15 @@ void compute_BH_diagnostics
// compute raw surface integrals
//
fp integral_one = surface_integral(ps, gfns::gfn__one,
- BH_diagnostics_info.surface_integral_method);
+ BH_diagnostics_info.integral_method);
fp integral_h = surface_integral(ps, gfns::gfn__h,
- BH_diagnostics_info.surface_integral_method);
+ BH_diagnostics_info.integral_method);
fp integral_x = surface_integral(ps, gfns::gfn__global_x,
- BH_diagnostics_info.surface_integral_method);
+ BH_diagnostics_info.integral_method);
fp integral_y = surface_integral(ps, gfns::gfn__global_y,
- BH_diagnostics_info.surface_integral_method);
+ BH_diagnostics_info.integral_method);
fp integral_z = surface_integral(ps, gfns::gfn__global_z,
- BH_diagnostics_info.surface_integral_method);
+ BH_diagnostics_info.integral_method);
//
// adjust integrals to take into account patch system not covering full sphere
@@ -639,6 +639,24 @@ BH_diagnostics.centroid_y = integral_y / integral_one;
BH_diagnostics.centroid_z = integral_z / integral_one;
BH_diagnostics.area = integral_one;
+BH_diagnostics.circumference_xy = ps.xy_circumference
+ (gfns::gfn__h,
+ gfns::gfn__g_dd_11, gfns::gfn__g_dd_12, gfns::gfn__g_dd_13,
+ gfns::gfn__g_dd_22, gfns::gfn__g_dd_23,
+ gfns::gfn__g_dd_33,
+ BH_diagnostics_info.integral_method);
+BH_diagnostics.circumference_xz = ps.xz_circumference
+ (gfns::gfn__h,
+ gfns::gfn__g_dd_11, gfns::gfn__g_dd_12, gfns::gfn__g_dd_13,
+ gfns::gfn__g_dd_22, gfns::gfn__g_dd_23,
+ gfns::gfn__g_dd_33,
+ BH_diagnostics_info.integral_method);
+BH_diagnostics.circumference_yz = ps.yz_circumference
+ (gfns::gfn__h,
+ gfns::gfn__g_dd_11, gfns::gfn__g_dd_12, gfns::gfn__g_dd_13,
+ gfns::gfn__g_dd_22, gfns::gfn__g_dd_23,
+ gfns::gfn__g_dd_33,
+ BH_diagnostics_info.integral_method);
BH_diagnostics.mean_radius = integral_h / integral_one;
BH_diagnostics.m_irreducible = sqrt(BH_diagnostics.area / (16.0*PI));
}