From 17f782f2a241db7f2ed8795cb4a1af7ed7ec28e5 Mon Sep 17 00:00:00 2001 From: rhaas Date: Thu, 15 Sep 2011 16:51:30 +0000 Subject: remove explicit dependence on Multipatch thorns GRHydro now compiles and runs without MP thorns present and behaves identical to the old version git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinEvolve/GRHydro/trunk@274 c83d129a-5a75-4d5a-9c4d-ed3a5855bf45 --- src/GRHydro_RegisterVars.cc | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'src/GRHydro_RegisterVars.cc') diff --git a/src/GRHydro_RegisterVars.cc b/src/GRHydro_RegisterVars.cc index 5e91721..43346ed 100644 --- a/src/GRHydro_RegisterVars.cc +++ b/src/GRHydro_RegisterVars.cc @@ -13,6 +13,8 @@ using namespace std; +extern "C" CCTK_INT GRHydro_UseGeneralCoordinates(const cGH * cctkGH); + // Utility functions to register variables with MoL // Note: We could check for the return value here, but MoL issues a // level 0 warning in that case anyway. If that changes in the @@ -37,6 +39,8 @@ extern "C"void GRHydro_Register(CCTK_ARGUMENTS) DECLARE_CCTK_ARGUMENTS; DECLARE_CCTK_PARAMETERS; + const int general_coordinates = GRHydro_UseGeneralCoordinates(cctkGH); + // We need some aliased functions, so we first check if they are available string needed_funs[5] = {"MoLRegisterEvolvedGroup", "MoLRegisterConstrainedGroup", @@ -55,11 +59,13 @@ extern "C"void GRHydro_Register(CCTK_ARGUMENTS) register_constrained("HydroBase::eps"); register_constrained("HydroBase::w_lorentz"); register_constrained("HydroBase::vel"); - register_constrained("GRHydro::lvel"); + if (general_coordinates) { + register_constrained("GRHydro::lvel"); - register_constrained("grhydro::local_shift"); - register_constrained("grhydro::local_metric"); - register_constrained("grhydro::local_extrinsic_curvature"); + register_constrained("grhydro::local_shift"); + register_constrained("grhydro::local_metric"); + register_constrained("grhydro::local_extrinsic_curvature"); + } if (CCTK_EQUALS(evolution_method, "GRHydro")) { @@ -69,7 +75,9 @@ extern "C"void GRHydro_Register(CCTK_ARGUMENTS) if (CCTK_EQUALS(Bvec_evolution_method, "GRHydro")) { register_constrained("HydroBase::Bvec"); - register_constrained("GRHydro::lBvec"); + if (general_coordinates) { + register_constrained("GRHydro::lBvec"); + } register_evolved("GRHydro::Bcons", "GRHydro::Bconsrhs"); if(clean_divergence) { register_evolved("GRHydro::psidc" , "GRHydro::psidcrhs"); -- cgit v1.2.3