Provide initial data also for dtlapse and dtshift.

git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinInitialData/Meudon_Mag_NS/trunk@3 9a8dfbc3-8997-403f-b745-98a780c092cc

4 files changed, 37 insertions, 16 deletions

diff --git a/param.ccl b/param.ccl
index b154c6f..cb88ec9 100644
--- a/param.ccl
+++ b/param.ccl
@@ -17,6 +17,16 @@ EXTENDS KEYWORD initial_shift
   "ID_Mag_NS" :: ""
 }
 
+EXTENDS KEYWORD initial_dtlapse
+{
+  "ID_Mag_NS" :: ""
+}
+
+EXTENDS KEYWORD initial_dtshift
+{
+  "ID_Mag_NS" :: ""
+}
+
 
 
 SHARES: HydroBase
@@ -26,7 +36,7 @@ EXTENDS KEYWORD initial_hydro
   "ID_Mag_NS" :: ""
 }
 
-EXTENDS KEYWORD initial_Bmag
+EXTENDS KEYWORD initial_Bvec
 {
   "ID_Mag_NS" :: ""
 }
diff --git a/schedule.ccl b/schedule.ccl
index eac9010..f6ee5ee 100644
--- a/schedule.ccl
+++ b/schedule.ccl
@@ -1,17 +1,19 @@
 # Schedule definitions for thorn ID_Mag_NS
 
-if (CCTK_EQUALS (initial_data,  "ID_Mag_NS") ||
-    CCTK_EQUALS (initial_lapse, "ID_Mag_NS") ||
-    CCTK_EQUALS (initial_shift, "ID_Mag_NS") ||
-    CCTK_EQUALS (initial_hydro, "ID_Mag_NS") ||
-    CCTK_EQUALS (initial_Bmag,  "ID_Mag_NS"))
+if (CCTK_EQUALS (initial_data,    "ID_Mag_NS") ||
+    CCTK_EQUALS (initial_lapse,   "ID_Mag_NS") ||
+    CCTK_EQUALS (initial_shift,   "ID_Mag_NS") ||
+    CCTK_EQUALS (initial_dtlapse, "ID_Mag_NS") ||
+    CCTK_EQUALS (initial_dtshift, "ID_Mag_NS") ||
+    CCTK_EQUALS (initial_hydro,   "ID_Mag_NS") ||
+    CCTK_EQUALS (initial_Bvec,    "ID_Mag_NS"))
 {
   SCHEDULE ID_Mag_NS_check_parameters AT paramcheck
   {
     LANG: C
   } "Check parameters"
   
-  SCHEDULE ID_Mag_NS_initialise IN ADMBase_Initial
+  SCHEDULE ID_Mag_NS_initialise IN ADMBase_InitialData
   {
     LANG: C
   } "Set up magnetised neutron star initial data"
diff --git a/src/Mag_NS.cc b/src/Mag_NS.cc
index af67c4c..3787557 100644
--- a/src/Mag_NS.cc
+++ b/src/Mag_NS.cc
@@ -98,6 +98,13 @@ void ID_Mag_NS_initialise (CCTK_ARGUMENTS)
     betay[i] = mag_ns.beta_y[i];
     betaz[i] = mag_ns.beta_z[i];
     
+    // These initial data assume stationarity
+    dtalp[i] = 0.0;
+    
+    dtbetax[i] = 0.0;
+    dtbetay[i] = 0.0;
+    dtbetaz[i] = 0.0;
+    
     CCTK_REAL g[3][3];
     g[0][0] = mag_ns.g_xx[i];
     g[0][1] = mag_ns.g_xy[i];
@@ -154,9 +161,9 @@ void ID_Mag_NS_initialise (CCTK_ARGUMENTS)
     vel[i+  npoints] = mag_ns.u_euler_y[i] / vel_unit;
     vel[i+2*npoints] = mag_ns.u_euler_z[i] / vel_unit;
     
-    Bmag[i          ] = mag_ns.bb_x[i] / B_unit;
-    Bmag[i+  npoints] = mag_ns.bb_y[i] / B_unit;
-    Bmag[i+2*npoints] = mag_ns.bb_z[i] / B_unit;
+    Bvec[i          ] = mag_ns.bb_x[i] / B_unit;
+    Bvec[i+  npoints] = mag_ns.bb_y[i] / B_unit;
+    Bvec[i+2*npoints] = mag_ns.bb_z[i] / B_unit;
     
   } // for i
   
diff --git a/src/check_parameters.cc b/src/check_parameters.cc
index fac34a1..fe0680c 100644
--- a/src/check_parameters.cc
+++ b/src/check_parameters.cc
@@ -10,12 +10,14 @@ void ID_Mag_NS_check_parameters (CCTK_ARGUMENTS)
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
   
-  if (not CCTK_EQUALS (initial_data , "ID_Mag_NS") or
-      not CCTK_EQUALS (initial_lapse, "ID_Mag_NS") or
-      not CCTK_EQUALS (initial_shift, "ID_Mag_NS") or
-      not CCTK_EQUALS (initial_hydro, "ID_Mag_NS") or
-      not CCTK_EQUALS (initial_Bmag,  "ID_Mag_NS"))
+  if (not CCTK_EQUALS (initial_data,    "ID_Mag_NS") or
+      not CCTK_EQUALS (initial_lapse,   "ID_Mag_NS") or
+      not CCTK_EQUALS (initial_shift,   "ID_Mag_NS") or
+      not CCTK_EQUALS (initial_dtlapse, "ID_Mag_NS") or
+      not CCTK_EQUALS (initial_dtshift, "ID_Mag_NS") or
+      not CCTK_EQUALS (initial_hydro,   "ID_Mag_NS") or
+      not CCTK_EQUALS (initial_Bvec,    "ID_Mag_NS"))
   {
-    CCTK_PARAMWARN ("The parameters ADMBase::initial_data, ADMBase::initial_lapse, ADMBase::initial_shift, HydroBase::initial_hydro, and HydroBase::initial_Bmag must all be set to the value \"ID_Mag_NS\"");
+    CCTK_PARAMWARN ("The parameters ADMBase::initial_data, ADMBase::initial_lapse, ADMBase::initial_shift, ADMBase::initial_dtlapse, ADMBase::initial_dtshift, HydroBase::initial_hydro, and HydroBase::initial_Bvec must all be set to the value \"ID_Mag_NS\"");
   }
 }