Add the magnetized routine versions for prim2con2prim

and vice versa. 

Add the magnetized version for the ShockTube routine.



git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinInitialData/GRHydro_InitData/trunk@114 ac85fae7-cede-4708-beff-ae01c7fa1c26

1 files changed, 45 insertions, 6 deletions

diff --git a/schedule.ccl b/schedule.ccl
index 1622776..26bdee4 100644
--- a/schedule.ccl
+++ b/schedule.ccl
@@ -6,10 +6,20 @@ schedule GRHydro_InitData_CheckParameters  AT CCTK_PARAMCHECK
 } "Check parameters"
 
 if (CCTK_Equals(initial_hydro,"shocktube")) {
-  schedule GRHydro_shocktube in HydroBase_Initial
+  if(CCTK_Equals(Bvec_evolution_method,"GRHydro"))
   {
-    LANG: Fortran
-  } "Shocktube initial data"
+    schedule GRHydro_shocktubeM in HydroBase_Initial
+    {
+      LANG: Fortran
+    } "Shocktube initial data - MHD version"
+
+  } else {
+    schedule GRHydro_shocktube in HydroBase_Initial
+    {
+      LANG: Fortran
+    } "Shocktube initial data"
+
+  }
 }
 
 if (CCTK_Equals(initial_data,"con2primtest")) {
@@ -27,15 +37,44 @@ if (CCTK_Equals(initial_data,"con2primtest")) {
 
 if (CCTK_Equals(initial_data,"con2prim2con_test")) {
   STORAGE:GRHydro_init_data_reflevel
-  schedule GRHydro_Init_Data_RefinementLevel IN HydroBase_Initial BEFORE c2p2c
+  schedule GRHydro_Init_Data_RefinementLevel IN HydroBase_Initial BEFORE c2p2c_call
   {
     LANG: Fortran
   } "Calculate current refinement level"
 
-  schedule c2p2c in HydroBase_Initial
+  if(CCTK_Equals(Bvec_evolution_method,"GRHydro"))
+  {
+    schedule c2p2cM in HydroBase_Initial AS c2p2c_call
+    {
+      LANG: Fortran
+    } "Testing conservative to primitive to conservative - MHD version"
+  } else {
+    schedule c2p2c in HydroBase_Initial AS c2p2c_call
+    {
+      LANG: Fortran
+    } "Testing conservative to primitive to conservative"
+  }
+}
+
+if (CCTK_Equals(initial_data,"prim2con2prim_test")) {
+  STORAGE:GRHydro_init_data_reflevel
+  schedule GRHydro_Init_Data_RefinementLevel IN HydroBase_Initial BEFORE p2c2p_call
   {
     LANG: Fortran
-  } "Testing conservative to primitive to conservative"
+  } "Calculate current refinement level"
+
+  if(CCTK_Equals(Bvec_evolution_method,"GRHydro"))
+  {
+    schedule p2c2pM in HydroBase_Initial AS p2c2p_call
+    {
+      LANG: Fortran
+    } "Testing primitive to conservative to primitive - MHD version"
+  } else {
+    schedule p2c2p in HydroBase_Initial AS p2c2p_call
+    {
+      LANG: Fortran
+    } "Testing primitive to conservative to primitive"
+  }
 }
 
 if (CCTK_Equals(initial_data,"reconstruction_test")) {