From 4bf5cd614e20c710dce70ab72c5c2f759a554ea0 Mon Sep 17 00:00:00 2001 From: schnetter Date: Mon, 7 Dec 2009 17:14:46 +0000 Subject: Provide initial data also for dtlapse and dtshift. git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinInitialData/Meudon_Bin_BH/trunk@3 0994f19a-7e1f-4f5a-9787-1e7a3bb7f33f --- param.ccl | 10 ++++++++++ schedule.ccl | 10 ++++++---- src/Bin_BH.cc | 8 ++++++++ src/check_parameters.cc | 10 ++++++---- 4 files changed, 30 insertions(+), 8 deletions(-) diff --git a/param.ccl b/param.ccl index 1125d91..318352b 100644 --- a/param.ccl +++ b/param.ccl @@ -17,6 +17,16 @@ EXTENDS KEYWORD initial_shift "ID_Bin_BH" :: "" } +EXTENDS KEYWORD initial_dtlapse +{ + "ID_Bin_BH" :: "" +} + +EXTENDS KEYWORD initial_dtshift +{ + "ID_Bin_BH" :: "" +} + PRIVATE: diff --git a/schedule.ccl b/schedule.ccl index 6b147e5..483f224 100644 --- a/schedule.ccl +++ b/schedule.ccl @@ -1,15 +1,17 @@ # Schedule definitions for thorn ID_Bin_BH -if (CCTK_EQUALS (initial_data, "ID_Bin_BH") || - CCTK_EQUALS (initial_lapse, "ID_Bin_BH") || - CCTK_EQUALS (initial_shift, "ID_Bin_BH")) +if (CCTK_EQUALS (initial_data, "ID_Bin_BH") || + CCTK_EQUALS (initial_lapse, "ID_Bin_BH") || + CCTK_EQUALS (initial_shift, "ID_Bin_BH") || + CCTK_EQUALS (initial_dtlapse, "ID_Bin_BH") || + CCTK_EQUALS (initial_dtshift, "ID_Bin_BH")) { SCHEDULE ID_Bin_BH_check_parameters AT paramcheck { LANG: C } "Check parameters" - SCHEDULE ID_Bin_BH_initialise IN ADMBase_Initial + SCHEDULE ID_Bin_BH_initialise IN ADMBase_InitialData { LANG: C } "Set up binary black hole initial data" diff --git a/src/Bin_BH.cc b/src/Bin_BH.cc index 693cdbc..87b0a7d 100644 --- a/src/Bin_BH.cc +++ b/src/Bin_BH.cc @@ -60,6 +60,14 @@ void ID_Bin_BH_initialise (CCTK_ARGUMENTS) betay[i] = bin_bh.beta_y[i]; betaz[i] = bin_bh.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_bh.g_xx[i]; g[0][1] = bin_bh.g_xy[i]; diff --git a/src/check_parameters.cc b/src/check_parameters.cc index 1709d8d..f3b626f 100644 --- a/src/check_parameters.cc +++ b/src/check_parameters.cc @@ -10,10 +10,12 @@ void ID_Bin_BH_check_parameters (CCTK_ARGUMENTS) DECLARE_CCTK_ARGUMENTS; DECLARE_CCTK_PARAMETERS; - if (not CCTK_EQUALS (initial_data , "ID_Bin_BH") or - not CCTK_EQUALS (initial_lapse, "ID_Bin_BH") or - not CCTK_EQUALS (initial_shift, "ID_Bin_BH")) + if (not CCTK_EQUALS (initial_data, "ID_Bin_BH") or + not CCTK_EQUALS (initial_lapse, "ID_Bin_BH") or + not CCTK_EQUALS (initial_shift, "ID_Bin_BH") or + not CCTK_EQUALS (initial_dtlapse, "ID_Bin_BH") or + not CCTK_EQUALS (initial_dtshift, "ID_Bin_BH")) { - CCTK_PARAMWARN ("The parameters ADMBase::initial_data, ADMBase::initial_lapse, and ADMBase::initial_shift must all be set to the value \"ID_Bin_BH\""); + CCTK_PARAMWARN ("The parameters ADMBase::initial_data, ADMBase::initial_lapse, ADMBase::initial_shift , ADMBase::initial_dtlapse, and ADMBase::initial_dtshift must all be set to the value \"ID_Bin_BH\""); } } -- cgit v1.2.3