diff options
| -rw-r--r-- | interface.ccl | 3 | ||||
| -rw-r--r-- | par/Extract.par | 9 | ||||
| -rw-r--r-- | param.ccl | 5 | ||||
| -rw-r--r-- | schedule.ccl | 7 | ||||
| -rw-r--r-- | src/D3_to_D2.F | 14 | ||||
| -rw-r--r-- | src/Extract.F | 2 | ||||
| -rw-r--r-- | src/ParamCheck.c | 44 | ||||
| -rw-r--r-- | src/make.code.defn | 3 | ||||
| -rw-r--r-- | test/test_extract.par | 11 |
9 files changed, 75 insertions, 23 deletions
diff --git a/interface.ccl b/interface.ccl index ea270ac..e969ab4 100644 --- a/interface.ccl +++ b/interface.ccl @@ -2,7 +2,8 @@ # $Header$ implements: extract -inherits: grid einstein io +inherits: grid ADMBase staticconformal io + private: REAL temps TYPE=GF DIM=3 diff --git a/par/Extract.par b/par/Extract.par index 4e2c3ea..0bc8a58 100644 --- a/par/Extract.par +++ b/par/Extract.par @@ -2,7 +2,7 @@ # Extract.par: Extracts from Schwarzschild Black Hole ################################################################# -ActiveThorns = "boundary pugh pughslab pughreduce adm ioutil iobasic cartgrid3d time einstein pughinterp extract idanalyticbh" +ActiveThorns = "boundary pugh pughslab pughreduce adm admbase admmacros staticconformal coordgauge ioutil iobasic cartgrid3d time pughinterp extract idanalyticbh" io::outdir = "Extract" driver::global_nx = 30 @@ -15,12 +15,13 @@ grid::dxyz = 0.3 time::dtfac = 0.2 -einstein::evolution_system = "ADM" -einstein::slicing = "geodesic" +admbase::evolution_method = "ADM" +admbase::lapse_evolution_method = "geodesic" +admbase::metric_type = "static conformal" cactus::cctk_itlast = 10 -einstein::initial_data = "schwarzschild" +admbase::initial_data = "schwarzschild" ### Extraction parameters @@ -1,7 +1,6 @@ # Parameter definitions for thorn Extract # $Header$ - shares: grid USES KEYWORD domain @@ -10,9 +9,9 @@ shares: io USES STRING outdir -shares: einstein +shares: ADMBase -USES BOOLEAN use_conformal +USES KEYWORD metric_type private: diff --git a/schedule.ccl b/schedule.ccl index bfb2cbb..3573c99 100644 --- a/schedule.ccl +++ b/schedule.ccl @@ -1,8 +1,13 @@ # Schedule definitions for thorn Extract # $Header$ +schedule Extract_ParamCheck at PARAMCHECK +{ + LANG: C +} "Check parameters" + schedule Extract at POSTSTEP { LANG: Fortran - STOR: temps + STORAGE: temps } "Extract waveforms" diff --git a/src/D3_to_D2.F b/src/D3_to_D2.F index 111292c..3203a39 100644 --- a/src/D3_to_D2.F +++ b/src/D3_to_D2.F @@ -130,14 +130,14 @@ c ------------------------------------------------- c Get indices of GFs to interpolate c --------------------------------- - call CCTK_VarIndex(in_array_indices(1), "einstein::psi") + call CCTK_VarIndex(in_array_indices(1), "staticconformal::psi") call CCTK_VarIndex(in_array_indices(2), "extract::g00") - call CCTK_VarIndex(in_array_indices(3), "einstein::gxx") - call CCTK_VarIndex(in_array_indices(4), "einstein::gxy") - call CCTK_VarIndex(in_array_indices(5), "einstein::gxz") - call CCTK_VarIndex(in_array_indices(6), "einstein::gyy") - call CCTK_VarIndex(in_array_indices(7), "einstein::gyz") - call CCTK_VarIndex(in_array_indices(8), "einstein::gzz") + call CCTK_VarIndex(in_array_indices(3), "admbase::gxx") + call CCTK_VarIndex(in_array_indices(4), "admbase::gxy") + call CCTK_VarIndex(in_array_indices(5), "admbase::gxz") + call CCTK_VarIndex(in_array_indices(6), "admbase::gyy") + call CCTK_VarIndex(in_array_indices(7), "admbase::gyz") + call CCTK_VarIndex(in_array_indices(8), "admbase::gzz") c Project un-physical metric and conformal factor onto sphere diff --git a/src/Extract.F b/src/Extract.F index 5d9053b..b9dbcdc 100644 --- a/src/Extract.F +++ b/src/Extract.F @@ -162,7 +162,7 @@ c Create 1D coordinate arrays c See if the ADM mass should be calculated and output IF (doADMmass == 1) THEN do_ADMmass(1) = 1 - IF (use_conformal == 1) THEN + IF (conformal_state == 1) THEN do_ADMmass(2) = 1 ELSE do_ADMmass(2) = 0 diff --git a/src/ParamCheck.c b/src/ParamCheck.c new file mode 100644 index 0000000..c5a4684 --- /dev/null +++ b/src/ParamCheck.c @@ -0,0 +1,44 @@ + /*@@ + @file ParamCheck.c + @date April 26 2002 + @author Gabrielle Allen + @desc + Check parameters for Extract + @enddesc + @@*/ + +#include "cctk.h" +#include "cctk_Arguments.h" +#include "cctk_Parameters.h" + +static const char *rcsid = "$Header$"; + +CCTK_FILEVERSION(CactusEinstein_Extract_ParamCheck_c) + +void Extract_ParamCheck(CCTK_ARGUMENTS); + + /*@@ + @routine Extract_ParamCheck + @date April 26 2002 + @author Gabrielle Allen + @desc + Check parameters for Extract + @enddesc + @calls + @history + + @endhistory + +@@*/ + +void Extract_ParamCheck(CCTK_ARGUMENTS) +{ + + DECLARE_CCTK_ARGUMENTS + DECLARE_CCTK_PARAMETERS + + if(! CCTK_EQUALS(metric_type, "static conformal")) + { + CCTK_PARAMWARN("Extract only works currently with metric_type \"static conformal\""); + } +} diff --git a/src/make.code.defn b/src/make.code.defn index 75fc0c8..0fb3404 100644 --- a/src/make.code.defn +++ b/src/make.code.defn @@ -21,7 +21,8 @@ SRCS = D2_extract_int.F \ ADMmass_integrand3D.F \ momentum_integrand3D.F \ spin_integrand3D.F \ - Advertise.c + Advertise.c \ + ParamCheck.c # Subdirectories containing source files SUBDIRS = diff --git a/test/test_extract.par b/test/test_extract.par index 7f95ae3..e003b48 100644 --- a/test/test_extract.par +++ b/test/test_extract.par @@ -1,7 +1,7 @@ !DESC "Extract waveforms from BH" -ActiveThorns = "Boundary CartGrid3D Time IOUtil IOASCII PUGH PUGHSlab PUGHInterp Extract Einstein IDAnalyticBH ADM" +ActiveThorns = "Boundary CartGrid3D Time IOUtil IOASCII PUGH PUGHSlab PUGHInterp Extract ADMBase StaticConformal IDAnalyticBH ADM ADMMacros CoordGauge" driver::global_nx = 15 @@ -17,14 +17,15 @@ time::dtfac = 0.2 cactus::cctk_itlast = 5 IO::out_every = 1 -einstein::evolution_system ="adm" -einstein::initial_data = "schwarzschild" -einstein::slicing = "geodesic" +admbase::evolution_method ="adm" +admbase::initial_data = "schwarzschild" +admbase::metric_type = "static conformal" +admbase::lapse_evolution_method = "geodesic" idanalyticbh::mass = 1 io::outdir = "test_extract" io::out_fileinfo = "none" -ioascii::out1d_vars = "einstein::alp" +ioascii::out1d_vars = "admbase::alp" ### Extraction parameters |