diff options
| author | knarf <knarf@54511f98-0e4f-0410-826e-eb8b393f5a1e> | 2006-05-30 07:51:38 +0000 |
|---|---|---|
| committer | knarf <knarf@54511f98-0e4f-0410-826e-eb8b393f5a1e> | 2006-05-30 07:51:38 +0000 |
| commit | ee271f6f8719900a288a8d22494462cdeeb4f22e (patch) | |
| tree | b50442e6d67e9bd9f5f6390331cdc9ebf69e5b03 | |
| parent | f5b40de16a27dec6e3a50f85ec4ddebf9ca336bd (diff) | |
- do not try to obtain mask descriptors if not needed (eliminates warnings)
- in case it is requested, but failes, abort with a hint what to do
git-svn-id: http://svn.aei.mpg.de/numrel/AEIThorns/ADMMass/trunk@18 54511f98-0e4f-0410-826e-eb8b393f5a1e
| -rw-r--r-- | src/volume_integral.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/volume_integral.c b/src/volume_integral.c index 0526b15..dcbf1a0 100644 --- a/src/volume_integral.c +++ b/src/volume_integral.c @@ -46,8 +46,17 @@ void ADMMass_Volume(CCTK_ARGUMENTS) const CCTK_REAL OneOverTwoDY = 1.0 / (2.0 * CCTK_DELTA_SPACE(1)); const CCTK_REAL OneOverTwoDZ = 1.0 / (2.0 * CCTK_DELTA_SPACE(2)); - mask_descriptor = SpaceMask_GetTypeBits("OutsideMask"); - state_descriptor_outside = SpaceMask_GetStateBits("OutsideMask", "outside"); + if (ADMMass_Excise_Horizons) + { + mask_descriptor = SpaceMask_GetTypeBits("OutsideMask"); + if (mask_descriptor < 0) + CCTK_WARN(0, "Thorn OutsideMask not activated, but " + "ADMMass_Excise_Horizons requires it."); + state_descriptor_outside = SpaceMask_GetStateBits("OutsideMask", + "outside"); + if (state_descriptor_outside < 0) + CCTK_WARN(0, "Error in obtaining OutsideMask state descriptors"); + } if (ADMMass_use_surface_distance_as_volume_radius && (ADMMass_volume_radius[*ADMMass_LoopCounter] < 0.0)) |