diff options
| author | jthorn <jthorn@f88db872-0e4f-0410-b76b-b9085cfa78c5> | 2002-10-26 16:52:56 +0000 |
|---|---|---|
| committer | jthorn <jthorn@f88db872-0e4f-0410-b76b-b9085cfa78c5> | 2002-10-26 16:52:56 +0000 |
| commit | a2944e3f02a40de52fa7c4d3b79e39b634285c0e (patch) | |
| tree | 914d945a01abf51d73f64053ad55b142dd9119c1 /src | |
| parent | 30690c8fb6f6a46b1316b75a4465b2381c83cc68 (diff) | |
store BH diagnostics (= centroid x,y,z, area, m_irreducible)
in Cactus arrays so they're accessible to other thorns and/or I/O methods
git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinAnalysis/AHFinderDirect/trunk@858 f88db872-0e4f-0410-b76b-b9085cfa78c5
Diffstat (limited to 'src')
| -rw-r--r-- | src/driver/driver.hh | 2 | ||||
| -rw-r--r-- | src/driver/find_horizons.cc | 19 |
2 files changed, 17 insertions, 4 deletions
diff --git a/src/driver/driver.hh b/src/driver/driver.hh index 2f6036b..9cb0684 100644 --- a/src/driver/driver.hh +++ b/src/driver/driver.hh @@ -159,9 +159,9 @@ struct AH_info struct initial_guess_info initial_guess_info; bool AH_found; + fp centroid_x, centroid_y, centroid_z; fp area; fp m_irreducible; - fp centroid_x, centroid_y, centroid_z; }; // diff --git a/src/driver/find_horizons.cc b/src/driver/find_horizons.cc index 8e871ff..32b30b5 100644 --- a/src/driver/find_horizons.cc +++ b/src/driver/find_horizons.cc @@ -199,6 +199,8 @@ setup_Cactus_gridfn_data_ptrs(cctkGH, state.cgi); state.Jac_info, state.cgi, state.gi, ps, AH_info.Jac_ptr, hn, state.N_horizons); + + // compute BH diagnostics? if (AH_info.AH_found) then { BH_diagnostics(state.diagnostics_info, @@ -222,6 +224,17 @@ setup_Cactus_gridfn_data_ptrs(cctkGH, state.cgi); then CCTK_VInfo(CCTK_THORNSTRING, "no apparent horizon found"); } + + // store results in Cactus array variables + AH_found[hn] = AH_info.AH_found; + if (AH_info.AH_found) + then { + centroid_x[hn] = AH_info.centroid_x; + centroid_y[hn] = AH_info.centroid_y; + centroid_z[hn] = AH_info.centroid_z; + area[hn] = AH_info.area; + m_irreducible[hn] = AH_info.m_irreducible; + } break; default: CCTK_VWarn(-1, __LINE__, __FILE__, CCTK_THORNSTRING, @@ -589,12 +602,12 @@ default: int(ps.type())); /*NOTREACHED*/ } -AH_info.area = integral_one; -AH_info.m_irreducible = sqrt(AH_info.area / (16.0*PI)); - AH_info.centroid_x = integral_x / integral_one; AH_info.centroid_y = integral_y / integral_one; AH_info.centroid_z = integral_z / integral_one; + +AH_info.area = integral_one; +AH_info.m_irreducible = sqrt(AH_info.area / (16.0*PI)); } } |