User: cott Date: 2010/05/26 06:40 PM
Added: /trunk/src/ GRHydro_Con2PrimM.F90
Modified: /trunk/ interface.ccl, param.ccl, schedule.ccl /trunk/src/ GRHydro_ParamCheck.F90, make.code.defn
Log: * initial structural modifications to start with MHD development (Noble/Ott) -> add comoving b-field: bcom[3] and bcom0 -> add integer variable MHD which is set in ParamCheck to 0 or 1 according to HydroBase::Bvec_evolution_method being GRHydro or something else (don't want to do string comparisons very often) -> skeleton routine Conservative2PrimitiveM in separate .F90 file -> extend keyword Bvec_evolution_method with "GRHydro"
* code compiles, should not hurt anything already there, does not do anyting (yet)
File Changes:
Directory: /trunk/src/ ======================
File [added]: GRHydro_Con2PrimM.F90 Delta lines: +16 -0 =================================================================== --- trunk/src/GRHydro_Con2PrimM.F90 (rev 0) +++ trunk/src/GRHydro_Con2PrimM.F90 2010-05-26 23:40:05 UTC (rev 115) @@ -0,0 +1,16 @@ +#include "cctk.h" +#include "cctk_Parameters.h" +#include "cctk_Arguments.h" +#include "cctk_Functions.h" +#include "SpaceMask.h" + + +subroutine Conservative2PrimitiveM(CCTK_ARGUMENTS) + + implicit none + + DECLARE_CCTK_ARGUMENTS + DECLARE_CCTK_PARAMETERS + + +end subroutine Conservative2PrimitiveM
File [modified]: GRHydro_ParamCheck.F90 Delta lines: +9 -0 =================================================================== --- trunk/src/GRHydro_ParamCheck.F90 2010-05-03 03:59:34 UTC (rev 114) +++ trunk/src/GRHydro_ParamCheck.F90 2010-05-26 23:40:05 UTC (rev 115) @@ -90,5 +90,14 @@ if (CCTK_EQUALS(bound,"static")) then call CCTK_PARAMWARN("GRHydro::bound = 'static' is no longer supported, use 'none' instead"); end if + + if (CCTK_EQUALS(Bvec_evolution_method,"GRHydro")) then + MHD = 1 + else + MHD = 0 + endif + + + end subroutine GRHydro_ParamCheck
File [modified]: make.code.defn Delta lines: +1 -0 =================================================================== --- trunk/src/make.code.defn 2010-05-03 03:59:34 UTC (rev 114) +++ trunk/src/make.code.defn 2010-05-26 23:40:05 UTC (rev 115) @@ -7,6 +7,7 @@ GRHydro_Boundaries.F90 \ GRHydro_CalcUpdate.F90 \ GRHydro_Con2Prim.F90 \ + GRHydro_Con2PrimM.F90 \ GRHydro_Eigenproblem.F90 \ GRHydro_Eigenproblem_Marquina.F90 \ GRHydro_ENOReconstruct.F90 \
Directory: /trunk/ ==================
File [modified]: interface.ccl Delta lines: +6 -1 =================================================================== --- trunk/interface.ccl 2010-05-03 03:59:34 UTC (rev 114) +++ trunk/interface.ccl 2010-05-26 23:40:05 UTC (rev 115) @@ -186,9 +186,12 @@
real tau type = GF Timelevels = 3 tags='ProlongationParameter="HydroBase::prolongation_type" tensortypealias="Scalar" tensorweight=+1.0 interpolator="matter"' "internal energy"
-real scon[3] type = GF Timelevels = 3 tags='ProlongationParameter="HydroBase::prolongation_type" tensortypealias="D" tensorweight=+1.0 interpolator="matter"' "generalized momenta" +real scon[3] type = GF Timelevels = 3 tags='Prolongation="HydroBase::prolongation_type" tensortypealias="D" tensorweight=+1.0 interpolator="matter"' "generalized momenta"
+real bcom[3] type = GF Timelevels = 3 tags='Prolongation="none" tensortypealias="D" tensorweight=+1.0 interpolator="matter"' "comoving magnetic field components"
+real bcom0 type = GF Timelevels = 3 tags='Prolongation="none" tensortypealias="Scalar"' "0 component of the comoving magnetic field" + real GRHydro_tracers[number_of_tracers] type = GF Timelevels = 3 tags='ProlongationParameter="HydroBase::prolongation_type" tensortypealias="Scalar"' { tracer @@ -257,6 +260,8 @@
private:
+int MHD type = SCALAR tags='checkpoint="no"' "Are we doing MHD? Set in ParamCheck" + int GRHydro_reflevel type = SCALAR tags='checkpoint="no"' "Refinement level GRHydro is working on right now"
real GRHydro_con_bext type = GF Timelevels = 1 tags='Prolongation="None" checkpoint="no"'
File [modified]: param.ccl Delta lines: +4 -0 =================================================================== --- trunk/param.ccl 2010-05-03 03:59:34 UTC (rev 114) +++ trunk/param.ccl 2010-05-26 23:40:05 UTC (rev 115) @@ -30,6 +30,10 @@ { "GRHydro" :: "Use GRHydro to evolve the hydro variables" } +EXTENDS KEYWORD Bvec_evolution_method "" +{ + "GRHydro" :: "Use GRHydro to evolve the MHD variables" +}
######################################### ### PARAMETRES SHARED FROM MoL ###
File [modified]: schedule.ccl Delta lines: +11 -0 =================================================================== --- trunk/schedule.ccl 2010-05-03 03:59:34 UTC (rev 114) +++ trunk/schedule.ccl 2010-05-26 23:40:05 UTC (rev 115) @@ -23,6 +23,11 @@ } STORAGE: ADMBase::metric[3], ADMBase::curv[3] STORAGE: ADMBase::lapse[3] + if(CCTK_Equals(Bvec_evolution_method,"GRHydro")) + { + STORAGE:bcom0[3] + STORAGE:bcom[3] + } } else { @@ -36,7 +41,13 @@ } STORAGE: ADMBase::metric[2], ADMBase::curv[2] STORAGE: ADMBase::lapse[2] + if(CCTK_Equals(Bvec_evolution_method,"GRHydro")) + { + STORAGE:bcom0[2] + STORAGE:bcom[2] + } } +STORAGE:MHD STORAGE:GRHydro_reflevel STORAGE:densrhs STORAGE:taurhs