diff options
author | rhaas <rhaas@c83d129a-5a75-4d5a-9c4d-ed3a5855bf45> | 2011-09-15 16:51:30 +0000 |
---|---|---|
committer | rhaas <rhaas@c83d129a-5a75-4d5a-9c4d-ed3a5855bf45> | 2011-09-15 16:51:30 +0000 |
commit | 17f782f2a241db7f2ed8795cb4a1af7ed7ec28e5 (patch) | |
tree | e58d5366b5a8638b020dc8307e9181023b3fcdb6 /schedule.ccl | |
parent | e0dc2af4862d5ddb874328bd097f7f516231dd8c (diff) |
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
Diffstat (limited to 'schedule.ccl')
-rw-r--r-- | schedule.ccl | 81 |
1 files changed, 46 insertions, 35 deletions
diff --git a/schedule.ccl b/schedule.ccl index 1c64d4f..208648b 100644 --- a/schedule.ccl +++ b/schedule.ccl @@ -184,13 +184,20 @@ if (!CCTK_Equals(initial_shift,"none")) ### Storage for local tensor quantities ### ############################################## -STORAGE: lvel[3] -if(CCTK_Equals(Bvec_evolution_method,"GRHydro")) { - STORAGE: lBvec[3] +# the official test is to test Coordinates::general_coordinates, however +# at schedule time, this is not yet set or accessible if we really insist on +# running with Coordinates but with a Cartesian (trivial) coordinate system +# _and_ we really want to safe this memory then it has to be turned off at +# runtime via CCTK_GroupStorageDecrease +if(CCTK_IsImplementationActive("Coordinates")) { + STORAGE: lvel[3] + if(CCTK_Equals(Bvec_evolution_method,"GRHydro")) { + STORAGE: lBvec[3] + } + STORAGE: local_metric[3] + STORAGE: local_extrinsic_curvature + STORAGE: local_shift } -STORAGE: local_metric[3] -STORAGE: local_extrinsic_curvature -STORAGE: local_shift ############################################## ### Storage for the conformal state scalar ### @@ -226,11 +233,13 @@ schedule GRHydro_ParamCheck AT PARAMCHECK LANG: Fortran } "Check parameters" -schedule GRHydro_check_Jacobian_state AT BASEGRID AFTER (TmunuBase_SetStressEnergyState Coordinates_SetGlobalCoords_Group) -{ - LANG: C - OPTIONS: GLOBAL -} "Test state of Jacobians" +if(CCTK_IsImplementationActive("Coordinates")) { + schedule GRHydro_check_Jacobian_state AT BASEGRID AFTER (TmunuBase_SetStressEnergyState Coordinates_SetGlobalCoords_Group) + { + LANG: C + OPTIONS: GLOBAL + } "Test state of Jacobians" +} ###################################### ### Standard symmetry registration ### @@ -501,39 +510,41 @@ schedule GRHydro_SetupDescriptors AT CCTK_Initial BEFORE HydroBase_Initial ##################################################################### -schedule GRHydroTransformPrimToLocalBasis AT INITIAL AFTER (HydroBase_Initial, ADMBase_PostInitial) BEFORE HydroBase_Prim2ConInitial -{ - LANG: FORTRAN -} "Transform primitive vars to local tensor basis." +if(CCTK_IsImplementationActive("Coordinates")) { + schedule GRHydroTransformPrimToLocalBasis AT INITIAL AFTER (HydroBase_Initial, ADMBase_PostInitial) BEFORE HydroBase_Prim2ConInitial + { + LANG: C + } "Transform primitive vars to local tensor basis." -schedule GRHydroTransformADMToLocalBasis AT INITIAL AFTER HydroBase_Initial BEFORE GRHydroTransformPrimToLocalBasis -{ - LANG: FORTRAN -} "Transform ADM metric, extr. curv. and shift to local tensor basis." + schedule GRHydroTransformADMToLocalBasis AT INITIAL AFTER HydroBase_Initial BEFORE GRHydroTransformPrimToLocalBasis + { + LANG: C + } "Transform ADM metric, extr. curv. and shift to local tensor basis." -schedule GRHydroTransformADMToLocalBasis IN ADMBase_SetADMVars -{ - LANG: FORTRAN -} "Transform metric and shift to local tensor basis." + schedule GRHydroTransformADMToLocalBasis IN ADMBase_SetADMVars + { + LANG: C + } "Transform metric and shift to local tensor basis." -#schedule GRHydroTransformADMToLocalBasis IN CTG_Convert_to_ADM AFTER CTGBase_Convert_CTG_to_ADM -#{ -# LANG: FORTRAN -#} "Transform metric and shift to local tensor basis." + #schedule GRHydroTransformADMToLocalBasis IN CTG_Convert_to_ADM AFTER CTGBase_Convert_CTG_to_ADM + #{ + # LANG: C + #} "Transform metric and shift to local tensor basis." -#schedule GRHydroTransformADMToLocalBasis IN MoL_Step BEFORE MoL_CalcRHS -#{ -# LANG: FORTRAN -#} "Transform metric and shift to local tensor basis." + #schedule GRHydroTransformADMToLocalBasis IN MoL_Step BEFORE MoL_CalcRHS + #{ + # LANG: C + #} "Transform metric and shift to local tensor basis." -schedule GRHydroTransformPrimToGlobalBasis IN HydroBase_PostStep AFTER HydroBase_Con2Prim -{ - LANG: FORTRAN -} "Transform primitive vars to global tensor basis." + schedule GRHydroTransformPrimToGlobalBasis IN HydroBase_PostStep AFTER HydroBase_Con2Prim + { + LANG: C + } "Transform primitive vars to global tensor basis." +} schedule group GRHydroRHS IN HydroBase_RHS |