From 086a7882930af2fc364bef8df62d77c68a4b239e Mon Sep 17 00:00:00 2001 From: schnetter Date: Mon, 7 Dec 2009 17:15:01 +0000 Subject: Provide initial data also for dtlapse and dtshift. git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinInitialData/Meudon_Bin_NS/trunk@3 f2ea251b-07d6-4a45-8f2c-a162b3fa7596 --- param.ccl | 10 ++++++++++ schedule.ccl | 12 +++++++----- src/Bin_NS.cc | 10 +++++++++- src/check_parameters.cc | 12 +++++++----- 4 files changed, 33 insertions(+), 11 deletions(-) diff --git a/param.ccl b/param.ccl index c1e192a..d3c1588 100644 --- a/param.ccl +++ b/param.ccl @@ -17,6 +17,16 @@ EXTENDS KEYWORD initial_shift "ID_Bin_NS" :: "" } +EXTENDS KEYWORD initial_dtlapse +{ + "ID_Bin_NS" :: "" +} + +EXTENDS KEYWORD initial_dtshift +{ + "ID_Bin_NS" :: "" +} + SHARES: HydroBase diff --git a/schedule.ccl b/schedule.ccl index fedc249..8145e2e 100644 --- a/schedule.ccl +++ b/schedule.ccl @@ -1,16 +1,18 @@ # Schedule definitions for thorn ID_Bin_NS -if (CCTK_EQUALS (initial_data, "ID_Bin_NS") || - CCTK_EQUALS (initial_lapse, "ID_Bin_NS") || - CCTK_EQUALS (initial_shift, "ID_Bin_NS") || - CCTK_EQUALS (initial_hydro, "ID_Bin_NS")) +if (CCTK_EQUALS (initial_data, "ID_Bin_NS") || + CCTK_EQUALS (initial_lapse, "ID_Bin_NS") || + CCTK_EQUALS (initial_shift, "ID_Bin_NS") || + CCTK_EQUALS (initial_dtlapse, "ID_Bin_NS") || + CCTK_EQUALS (initial_dtshift, "ID_Bin_NS") || + CCTK_EQUALS (initial_hydro, "ID_Bin_NS")) { SCHEDULE ID_Bin_NS_check_parameters AT paramcheck { LANG: C } "Check parameters" - SCHEDULE ID_Bin_NS_initialise IN ADMBase_Initial + SCHEDULE ID_Bin_NS_initialise IN ADMBase_InitialData { LANG: C } "Set up binary neutron star initial data" diff --git a/src/Bin_NS.cc b/src/Bin_NS.cc index 4e2696f..c04bf66 100644 --- a/src/Bin_NS.cc +++ b/src/Bin_NS.cc @@ -1,5 +1,5 @@ -#include #include +#include #include #include @@ -94,6 +94,14 @@ void ID_Bin_NS_initialise (CCTK_ARGUMENTS) betay[i] = bin_ns.beta_y[i]; betaz[i] = bin_ns.beta_z[i]; + // These initial data assume a helical Killing vector field + // TODO: calculate spatial derivatives to set this correctly + dtalp[i] = 0.0; + + dtbetax[i] = 0.0; + dtbetay[i] = 0.0; + dtbetaz[i] = 0.0; + CCTK_REAL g[3][3]; g[0][0] = bin_ns.g_xx[i]; g[0][1] = bin_ns.g_xy[i]; diff --git a/src/check_parameters.cc b/src/check_parameters.cc index bef3136..40a760f 100644 --- a/src/check_parameters.cc +++ b/src/check_parameters.cc @@ -10,11 +10,13 @@ void ID_Bin_NS_check_parameters (CCTK_ARGUMENTS) DECLARE_CCTK_ARGUMENTS; DECLARE_CCTK_PARAMETERS; - if (not CCTK_EQUALS (initial_data , "ID_Bin_NS") or - not CCTK_EQUALS (initial_lapse, "ID_Bin_NS") or - not CCTK_EQUALS (initial_shift, "ID_Bin_NS") or - not CCTK_EQUALS (initial_hydro, "ID_Bin_NS")) + if (not CCTK_EQUALS (initial_data, "ID_Bin_NS") or + not CCTK_EQUALS (initial_lapse, "ID_Bin_NS") or + not CCTK_EQUALS (initial_shift, "ID_Bin_NS") or + not CCTK_EQUALS (initial_dtlapse, "ID_Bin_NS") or + not CCTK_EQUALS (initial_dtshift, "ID_Bin_NS") or + not CCTK_EQUALS (initial_hydro, "ID_Bin_NS")) { - CCTK_PARAMWARN ("The parameters ADMBase::initial_data, ADMBase::initial_lapse, ADMBase::initial_shift, and HydroBase::initial_hydro must all be set to the value \"ID_Bin_NS\""); + CCTK_PARAMWARN ("The parameters ADMBase::initial_data, ADMBase::initial_lapse, ADMBase::initial_shift, ADMBase::initial_dtlapse, ADMBase::initial_dtshift, and HydroBase::initial_hydro must all be set to the value \"ID_Bin_NS\""); } } -- cgit v1.2.3