From d44d18d6669220bd75bcd371b81b7a1983d96a38 Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Thu, 6 Jul 2023 14:07:40 -0400 Subject: [PATCH 1/9] ADMBaseX: Rename from ADMBase --- ADMBase/configuration.ccl | 3 -- {ADMBase => ADMBaseX}/README | 2 +- ADMBaseX/configuration.ccl | 3 ++ {ADMBase => ADMBaseX}/interface.ccl | 4 +-- {ADMBase => ADMBaseX}/param.ccl | 2 +- {ADMBase => ADMBaseX}/schedule.ccl | 36 +++++++++++------------ {ADMBase => ADMBaseX}/src/admbase.cxx | 24 +++++++-------- {ADMBase => ADMBaseX}/src/linear_wave.cxx | 8 ++--- {ADMBase => ADMBaseX}/src/make.code.defn | 2 +- {ADMBase => ADMBaseX}/src/noise.cxx | 8 ++--- 10 files changed, 46 insertions(+), 46 deletions(-) delete mode 100644 ADMBase/configuration.ccl rename {ADMBase => ADMBaseX}/README (90%) create mode 100644 ADMBaseX/configuration.ccl rename {ADMBase => ADMBaseX}/interface.ccl (96%) rename {ADMBase => ADMBaseX}/param.ccl (96%) rename {ADMBase => ADMBaseX}/schedule.ccl (64%) rename {ADMBase => ADMBaseX}/src/admbase.cxx (87%) rename {ADMBase => ADMBaseX}/src/linear_wave.cxx (93%) rename {ADMBase => ADMBaseX}/src/make.code.defn (74%) rename {ADMBase => ADMBaseX}/src/noise.cxx (96%) diff --git a/ADMBase/configuration.ccl b/ADMBase/configuration.ccl deleted file mode 100644 index fdf01777a..000000000 --- a/ADMBase/configuration.ccl +++ /dev/null @@ -1,3 +0,0 @@ -# Configuration definition for thorn ADMBase - -REQUIRES Loop diff --git a/ADMBase/README b/ADMBaseX/README similarity index 90% rename from ADMBase/README rename to ADMBaseX/README index 54254d816..ea735f105 100644 --- a/ADMBase/README +++ b/ADMBaseX/README @@ -1,4 +1,4 @@ -Cactus Code Thorn ADMBase +Cactus Code Thorn ADMBaseX Author(s) : Erik Schnetter Maintainer(s): Erik Schnetter Licence : LGPL diff --git a/ADMBaseX/configuration.ccl b/ADMBaseX/configuration.ccl new file mode 100644 index 000000000..198e70337 --- /dev/null +++ b/ADMBaseX/configuration.ccl @@ -0,0 +1,3 @@ +# Configuration definition for thorn ADMBaseX + +REQUIRES Loop diff --git a/ADMBase/interface.ccl b/ADMBaseX/interface.ccl similarity index 96% rename from ADMBase/interface.ccl rename to ADMBaseX/interface.ccl index 68dcb6f39..adaf3b270 100644 --- a/ADMBase/interface.ccl +++ b/ADMBaseX/interface.ccl @@ -1,6 +1,6 @@ -# Interface definition for thorn ADMBase +# Interface definition for thorn ADMBaseX -IMPLEMENTS: ADMBase +IMPLEMENTS: ADMBaseX USES INCLUDE HEADER: loop_device.hxx diff --git a/ADMBase/param.ccl b/ADMBaseX/param.ccl similarity index 96% rename from ADMBase/param.ccl rename to ADMBaseX/param.ccl index d4b45f2e0..725b64ba3 100644 --- a/ADMBase/param.ccl +++ b/ADMBaseX/param.ccl @@ -1,4 +1,4 @@ -# Parameter definitions for thorn ADMBase +# Parameter definitions for thorn ADMBaseX RESTRICTED: diff --git a/ADMBase/schedule.ccl b/ADMBaseX/schedule.ccl similarity index 64% rename from ADMBase/schedule.ccl rename to ADMBaseX/schedule.ccl index f8d393d86..eac37c141 100644 --- a/ADMBase/schedule.ccl +++ b/ADMBaseX/schedule.ccl @@ -1,51 +1,51 @@ -# Schedule definitions for thorn ADMBase +# Schedule definitions for thorn ADMBaseX -SCHEDULE GROUP ADMBase_InitialData AT initial +SCHEDULE GROUP ADMBaseX_InitialData AT initial { } "Schedule group for calculating ADM initial data" -SCHEDULE GROUP ADMBase_InitialGauge AT initial AFTER ADMBase_InitialData +SCHEDULE GROUP ADMBaseX_InitialGauge AT initial AFTER ADMBaseX_InitialData { } "Schedule group for the ADM initial gauge condition" -SCHEDULE GROUP ADMBase_PostInitial AT initial AFTER (ADMBase_InitialData ADMBase_InitialGauge) +SCHEDULE GROUP ADMBaseX_PostInitial AT initial AFTER (ADMBaseX_InitialData ADMBaseX_InitialGauge) { } "Schedule group for modifying the ADM initial data, such as e.g. adding noise" -SCHEDULE GROUP ADMBase_SetADMVars AT postregrid +SCHEDULE GROUP ADMBaseX_SetADMVars AT postregrid { } "Set ADM variables in this group" -SCHEDULE GROUP ADMBase_SetADMVars AT poststep +SCHEDULE GROUP ADMBaseX_SetADMVars AT poststep { } "Set ADM variables in this group" -SCHEDULE GROUP ADMBase_SetADMVars IN ODESolvers_PostStep +SCHEDULE GROUP ADMBaseX_SetADMVars IN ODESolvers_PostStep { } "Set ADM variables in this group" -SCHEDULE GROUP ADMBase_SetADMRHS AT postregrid +SCHEDULE GROUP ADMBaseX_SetADMRHS AT postregrid { } "Set ADM RHS variables in this group" -SCHEDULE GROUP ADMBase_SetADMRHS AT poststep +SCHEDULE GROUP ADMBaseX_SetADMRHS AT poststep { } "Set ADM RHS variables in this group" -SCHEDULE GROUP ADMBase_SetADMRHS IN ODESolvers_PostStep +SCHEDULE GROUP ADMBaseX_SetADMRHS IN ODESolvers_PostStep { } "Set ADM RHS variables in this group" if (CCTK_EQUALS(initial_data, "Cartesian Minkowski")) { - SCHEDULE ADMBase_initial_data IN ADMBase_InitialData + SCHEDULE ADMBaseX_initial_data IN ADMBaseX_InitialData { LANG: C WRITES: metric(everywhere) curv(everywhere) } "Set up Cartesian Minkowski initial data" } else if (CCTK_EQUALS(initial_data, "linear wave")) { - SCHEDULE ADMBase_linear_wave IN ADMBase_InitialData + SCHEDULE ADMBaseX_linear_wave IN ADMBaseX_InitialData { LANG: C WRITES: metric(everywhere) curv(everywhere) @@ -53,7 +53,7 @@ if (CCTK_EQUALS(initial_data, "Cartesian Minkowski")) { } if (CCTK_EQUALS(initial_lapse, "one")) { - SCHEDULE ADMBase_initial_lapse IN ADMBase_InitialGauge + SCHEDULE ADMBaseX_initial_lapse IN ADMBaseX_InitialGauge { LANG: C WRITES: lapse(everywhere) @@ -61,7 +61,7 @@ if (CCTK_EQUALS(initial_lapse, "one")) { } if (CCTK_EQUALS(initial_dtlapse, "zero")) { - SCHEDULE ADMBase_initial_dtlapse IN ADMBase_InitialGauge + SCHEDULE ADMBaseX_initial_dtlapse IN ADMBaseX_InitialGauge { LANG: C WRITES: dtlapse(everywhere) @@ -69,7 +69,7 @@ if (CCTK_EQUALS(initial_dtlapse, "zero")) { } if (CCTK_EQUALS(initial_shift, "zero")) { - SCHEDULE ADMBase_initial_shift IN ADMBase_InitialGauge + SCHEDULE ADMBaseX_initial_shift IN ADMBaseX_InitialGauge { LANG: C WRITES: shift(everywhere) @@ -77,7 +77,7 @@ if (CCTK_EQUALS(initial_shift, "zero")) { } if (CCTK_EQUALS(initial_dtshift, "zero")) { - SCHEDULE ADMBase_initial_dtshift IN ADMBase_InitialGauge + SCHEDULE ADMBaseX_initial_dtshift IN ADMBaseX_InitialGauge { LANG: C WRITES: dtshift(everywhere) @@ -90,7 +90,7 @@ if (noise_amplitude != 0) { # TODO: Also add noise during evolution? # TODO: Noise should be added by a separate thorn. - SCHEDULE ADMBase_add_noise IN ADMBase_PostInitial + SCHEDULE ADMBaseX_add_noise IN ADMBaseX_PostInitial { LANG: C READS: metric(interior) @@ -111,5 +111,5 @@ if (noise_amplitude != 0) { SYNC: dtlapse SYNC: shift SYNC: dtshift - } "Add noise to ADMBase variables" + } "Add noise to ADMBaseX variables" } diff --git a/ADMBase/src/admbase.cxx b/ADMBaseX/src/admbase.cxx similarity index 87% rename from ADMBase/src/admbase.cxx rename to ADMBaseX/src/admbase.cxx index 3f6387bb9..ec23193b9 100644 --- a/ADMBase/src/admbase.cxx +++ b/ADMBaseX/src/admbase.cxx @@ -6,12 +6,12 @@ #include -namespace ADMBase { +namespace ADMBaseX { using namespace std; using namespace Loop; -extern "C" void ADMBase_initial_data(CCTK_ARGUMENTS) { - DECLARE_CCTK_ARGUMENTS_ADMBase_initial_data; +extern "C" void ADMBaseX_initial_data(CCTK_ARGUMENTS) { + DECLARE_CCTK_ARGUMENTS_ADMBaseX_initial_data; DECLARE_CCTK_PARAMETERS; const array indextype = {0, 0, 0}; @@ -52,8 +52,8 @@ extern "C" void ADMBase_initial_data(CCTK_ARGUMENTS) { }); } -extern "C" void ADMBase_initial_lapse(CCTK_ARGUMENTS) { - DECLARE_CCTK_ARGUMENTS_ADMBase_initial_lapse; +extern "C" void ADMBaseX_initial_lapse(CCTK_ARGUMENTS) { + DECLARE_CCTK_ARGUMENTS_ADMBaseX_initial_lapse; DECLARE_CCTK_PARAMETERS; const array indextype = {0, 0, 0}; @@ -67,8 +67,8 @@ extern "C" void ADMBase_initial_lapse(CCTK_ARGUMENTS) { CCTK_ATTRIBUTE_ALWAYS_INLINE { alp_(p.I) = 1; }); } -extern "C" void ADMBase_initial_dtlapse(CCTK_ARGUMENTS) { - DECLARE_CCTK_ARGUMENTS_ADMBase_initial_dtlapse; +extern "C" void ADMBaseX_initial_dtlapse(CCTK_ARGUMENTS) { + DECLARE_CCTK_ARGUMENTS_ADMBaseX_initial_dtlapse; DECLARE_CCTK_PARAMETERS; const array indextype = {0, 0, 0}; @@ -82,8 +82,8 @@ extern "C" void ADMBase_initial_dtlapse(CCTK_ARGUMENTS) { CCTK_ATTRIBUTE_ALWAYS_INLINE { dtalp_(p.I) = 0; }); } -extern "C" void ADMBase_initial_shift(CCTK_ARGUMENTS) { - DECLARE_CCTK_ARGUMENTS_ADMBase_initial_shift; +extern "C" void ADMBaseX_initial_shift(CCTK_ARGUMENTS) { + DECLARE_CCTK_ARGUMENTS_ADMBaseX_initial_shift; DECLARE_CCTK_PARAMETERS; const array indextype = {0, 0, 0}; @@ -103,8 +103,8 @@ extern "C" void ADMBase_initial_shift(CCTK_ARGUMENTS) { }); } -extern "C" void ADMBase_initial_dtshift(CCTK_ARGUMENTS) { - DECLARE_CCTK_ARGUMENTS_ADMBase_initial_dtshift; +extern "C" void ADMBaseX_initial_dtshift(CCTK_ARGUMENTS) { + DECLARE_CCTK_ARGUMENTS_ADMBaseX_initial_dtshift; DECLARE_CCTK_PARAMETERS; const array indextype = {0, 0, 0}; @@ -124,4 +124,4 @@ extern "C" void ADMBase_initial_dtshift(CCTK_ARGUMENTS) { }); } -} // namespace ADMBase +} // namespace ADMBaseX diff --git a/ADMBase/src/linear_wave.cxx b/ADMBaseX/src/linear_wave.cxx similarity index 93% rename from ADMBase/src/linear_wave.cxx rename to ADMBaseX/src/linear_wave.cxx index 220406193..5b69ff814 100644 --- a/ADMBase/src/linear_wave.cxx +++ b/ADMBaseX/src/linear_wave.cxx @@ -6,12 +6,12 @@ #include -namespace ADMBase { +namespace ADMBaseX { using namespace Loop; using namespace std; -extern "C" void ADMBase_linear_wave(CCTK_ARGUMENTS) { - DECLARE_CCTK_ARGUMENTS_ADMBase_linear_wave; +extern "C" void ADMBaseX_linear_wave(CCTK_ARGUMENTS) { + DECLARE_CCTK_ARGUMENTS_ADMBaseX_linear_wave; DECLARE_CCTK_PARAMETERS; const CCTK_REAL t = cctk_time; @@ -58,4 +58,4 @@ extern "C" void ADMBase_linear_wave(CCTK_ARGUMENTS) { [&](const PointDesc &p) { kzz_(p.I) = -bt(p) / 2; }); } -} // namespace ADMBase +} // namespace ADMBaseX diff --git a/ADMBase/src/make.code.defn b/ADMBaseX/src/make.code.defn similarity index 74% rename from ADMBase/src/make.code.defn rename to ADMBaseX/src/make.code.defn index 919d6a77b..d36b01d06 100644 --- a/ADMBase/src/make.code.defn +++ b/ADMBaseX/src/make.code.defn @@ -1,4 +1,4 @@ -# Main make.code.defn file for thorn ADMBase +# Main make.code.defn file for thorn ADMBaseX # Source files in this directory SRCS = admbase.cxx linear_wave.cxx noise.cxx diff --git a/ADMBase/src/noise.cxx b/ADMBaseX/src/noise.cxx similarity index 96% rename from ADMBase/src/noise.cxx rename to ADMBaseX/src/noise.cxx index dcc357fbd..e805b13d7 100644 --- a/ADMBase/src/noise.cxx +++ b/ADMBaseX/src/noise.cxx @@ -6,12 +6,12 @@ #include -namespace ADMBase { +namespace ADMBaseX { using namespace Loop; using namespace std; -extern "C" void ADMBase_add_noise(CCTK_ARGUMENTS) { - DECLARE_CCTK_ARGUMENTS_ADMBase_add_noise; +extern "C" void ADMBaseX_add_noise(CCTK_ARGUMENTS) { + DECLARE_CCTK_ARGUMENTS_ADMBaseX_add_noise; DECLARE_CCTK_PARAMETERS; // Hardware random device @@ -85,4 +85,4 @@ extern "C" void ADMBase_add_noise(CCTK_ARGUMENTS) { [&](const PointDesc &p) { add_noise(dtbetaz_(p.I)); }); } -} // namespace ADMBase +} // namespace ADMBaseX From 02c6fa37eedffcd30015f8378c94bb53f6d2b65a Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Thu, 6 Jul 2023 14:07:53 -0400 Subject: [PATCH 2/9] CarpetX: Rename thorns --- CarpetX/par/brill-lindquist-checkpoint.par | 8 ++++---- CarpetX/par/brill-lindquist-read.par | 22 +++++++++++----------- CarpetX/par/brill-lindquist-recover.par | 4 ++-- CarpetX/par/brill-lindquist-write.par | 8 ++++---- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/CarpetX/par/brill-lindquist-checkpoint.par b/CarpetX/par/brill-lindquist-checkpoint.par index 2b9acd4f2..7ae5391d1 100644 --- a/CarpetX/par/brill-lindquist-checkpoint.par +++ b/CarpetX/par/brill-lindquist-checkpoint.par @@ -1,10 +1,10 @@ ActiveThorns = " - ADMBase + ADMBaseX BrillLindquist CarpetX IOUtil ODESolvers - TmunuBase + TmunuBaseX Z4c " @@ -48,8 +48,8 @@ CarpetX::prolongation_type = "ddf" CarpetX::prolongation_order = 5 CarpetX::interpolation_order = 3 -ADMBase::initial_data = "Brill-Lindquist" -ADMBase::initial_lapse = "Brill-Lindquist" +ADMBaseX::initial_data = "Brill-Lindquist" +ADMBaseX::initial_lapse = "Brill-Lindquist" BrillLindquist::x0 = 0.0 BrillLindquist::mass = 1.0 diff --git a/CarpetX/par/brill-lindquist-read.par b/CarpetX/par/brill-lindquist-read.par index 2f73e09d2..3e31d7b07 100644 --- a/CarpetX/par/brill-lindquist-read.par +++ b/CarpetX/par/brill-lindquist-read.par @@ -1,9 +1,9 @@ ActiveThorns = " - ADMBase + ADMBaseX CarpetX IOUtil ODESolvers - TmunuBase + TmunuBaseX Z4c " @@ -48,9 +48,9 @@ CarpetX::prolongation_order = 5 CarpetX::interpolation_order = 3 # Initial data are set up by the file reader -ADMBase::initial_data = "none" -ADMBase::initial_lapse = "none" -ADMBase::initial_shift = "none" +ADMBaseX::initial_data = "none" +ADMBaseX::initial_lapse = "none" +ADMBaseX::initial_shift = "none" IO::out_dir = $parfile IO::out_every = 1 @@ -61,12 +61,12 @@ CarpetX::filereader_method = "openpmd" IO::filereader_ID_dir = "../../brill-lindquist-write/output-0000/brill-lindquist-write" IO::filereader_ID_files = "brill-lindquist-write" IO::filereader_ID_vars = " - ADMBase::metric - ADMBase::curv - ADMBase::lapse - ADMBase::dtlapse - ADMBase::shift - ADMBase::dtshift + ADMBaseX::metric + ADMBaseX::curv + ADMBaseX::lapse + ADMBaseX::dtlapse + ADMBaseX::shift + ADMBaseX::dtshift " CarpetX::out_metadata = yes diff --git a/CarpetX/par/brill-lindquist-recover.par b/CarpetX/par/brill-lindquist-recover.par index 067e24df6..725ff0b8f 100644 --- a/CarpetX/par/brill-lindquist-recover.par +++ b/CarpetX/par/brill-lindquist-recover.par @@ -1,10 +1,10 @@ ActiveThorns = " - ADMBase + ADMBaseX BrillLindquist CarpetX IOUtil ODESolvers - TmunuBase + TmunuBaseX Z4c " diff --git a/CarpetX/par/brill-lindquist-write.par b/CarpetX/par/brill-lindquist-write.par index e7c67439f..a587c0fc0 100644 --- a/CarpetX/par/brill-lindquist-write.par +++ b/CarpetX/par/brill-lindquist-write.par @@ -1,10 +1,10 @@ ActiveThorns = " - ADMBase + ADMBaseX BrillLindquist CarpetX IOUtil ODESolvers - TmunuBase + TmunuBaseX Z4c " @@ -48,8 +48,8 @@ CarpetX::prolongation_type = "ddf" CarpetX::prolongation_order = 5 CarpetX::interpolation_order = 3 -ADMBase::initial_data = "Brill-Lindquist" -ADMBase::initial_lapse = "Brill-Lindquist" +ADMBaseX::initial_data = "Brill-Lindquist" +ADMBaseX::initial_lapse = "Brill-Lindquist" BrillLindquist::x0 = 0.0 BrillLindquist::mass = 1.0 From 6b99e70d88dc8607ef595a9e7978a0c1fb95b264 Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Thu, 6 Jul 2023 14:08:16 -0400 Subject: [PATCH 3/9] HydroBaseX: Rename from HydroBase --- HydroBase/configuration.ccl | 3 --- {HydroBase => HydroBaseX}/README | 6 +++--- HydroBaseX/configuration.ccl | 3 +++ {HydroBase => HydroBaseX}/interface.ccl | 4 ++-- {HydroBase => HydroBaseX}/param.ccl | 2 +- {HydroBase => HydroBaseX}/schedule.ccl | 14 +++++++------- {HydroBase => HydroBaseX}/src/hydrobase.cxx | 8 ++++---- {HydroBase => HydroBaseX}/src/make.code.defn | 2 +- 8 files changed, 21 insertions(+), 21 deletions(-) delete mode 100644 HydroBase/configuration.ccl rename {HydroBase => HydroBaseX}/README (81%) create mode 100644 HydroBaseX/configuration.ccl rename {HydroBase => HydroBaseX}/interface.ccl (94%) rename {HydroBase => HydroBaseX}/param.ccl (73%) rename {HydroBase => HydroBaseX}/schedule.ccl (65%) rename {HydroBase => HydroBaseX}/src/hydrobase.cxx (90%) rename {HydroBase => HydroBaseX}/src/make.code.defn (69%) diff --git a/HydroBase/configuration.ccl b/HydroBase/configuration.ccl deleted file mode 100644 index dff4ef715..000000000 --- a/HydroBase/configuration.ccl +++ /dev/null @@ -1,3 +0,0 @@ -# Configuration definition for thorn HydroBase - -REQUIRES Loop diff --git a/HydroBase/README b/HydroBaseX/README similarity index 81% rename from HydroBase/README rename to HydroBaseX/README index 95d1ed4de..844e21728 100644 --- a/HydroBase/README +++ b/HydroBaseX/README @@ -1,4 +1,4 @@ -Cactus Code Thorn HydroBase +Cactus Code Thorn HydroBaseX Author(s) : Erik Schnetter Maintainer(s): Erik Schnetter Licence : LGPL @@ -12,9 +12,9 @@ Provide storage for the hydro variables 2. Definitions -The HydroBase variables correspond to the Valencia formulation. +The HydroBaseX variables correspond to the Valencia formulation. -HydroBase uses the following conventions: +HydroBaseX uses the following conventions: M = M_sun c = G = 1 diff --git a/HydroBaseX/configuration.ccl b/HydroBaseX/configuration.ccl new file mode 100644 index 000000000..25b53d845 --- /dev/null +++ b/HydroBaseX/configuration.ccl @@ -0,0 +1,3 @@ +# Configuration definition for thorn HydroBaseX + +REQUIRES Loop diff --git a/HydroBase/interface.ccl b/HydroBaseX/interface.ccl similarity index 94% rename from HydroBase/interface.ccl rename to HydroBaseX/interface.ccl index d317ebc6a..beff9673f 100644 --- a/HydroBase/interface.ccl +++ b/HydroBaseX/interface.ccl @@ -1,6 +1,6 @@ -# Interface definition for thorn HydroBase +# Interface definition for thorn HydroBaseX -IMPLEMENTS: HydroBase +IMPLEMENTS: HydroBaseX USES INCLUDE HEADER: loop_device.hxx diff --git a/HydroBase/param.ccl b/HydroBaseX/param.ccl similarity index 73% rename from HydroBase/param.ccl rename to HydroBaseX/param.ccl index 03e4fca20..36df7414e 100644 --- a/HydroBase/param.ccl +++ b/HydroBaseX/param.ccl @@ -1,4 +1,4 @@ -# Parameter definitions for thorn HydroBase +# Parameter definitions for thorn HydroBaseX RESTRICTED: diff --git a/HydroBase/schedule.ccl b/HydroBaseX/schedule.ccl similarity index 65% rename from HydroBase/schedule.ccl rename to HydroBaseX/schedule.ccl index c17547ef7..88c6f5c0e 100644 --- a/HydroBase/schedule.ccl +++ b/HydroBaseX/schedule.ccl @@ -1,30 +1,30 @@ -# Schedule definitions for thorn HydroBase +# Schedule definitions for thorn HydroBaseX -SCHEDULE GROUP HydroBase_InitialData AT initial +SCHEDULE GROUP HydroBaseX_InitialData AT initial { } "Schedule group for calculating hydro initial data" -SCHEDULE GROUP HydroBase_PostInitial AT initial AFTER HydroBase_InitialData +SCHEDULE GROUP HydroBaseX_PostInitial AT initial AFTER HydroBaseX_InitialData { } "Schedule group for modifying the hydro initial data, such as e.g. adding noise" -SCHEDULE GROUP HydroBase_SetHydroVars AT postregrid +SCHEDULE GROUP HydroBaseX_SetHydroVars AT postregrid { } "Set hydro variables in this group, or before this group" -SCHEDULE GROUP HydroBase_SetHydroVars AT poststep +SCHEDULE GROUP HydroBaseX_SetHydroVars AT poststep { } "Set hydro variables in this group, or before this group" -SCHEDULE GROUP HydroBase_SetHydroVars IN ODESolvers_PostStep +SCHEDULE GROUP HydroBaseX_SetHydroVars IN ODESolvers_PostStep { } "Set hydro variables in this group, or before this group" if (CCTK_EQUALS(initial_hydro, "vacuum")) { - SCHEDULE HydroBase_initial_data IN HydroBase_InitialData + SCHEDULE HydroBaseX_initial_data IN HydroBaseX_InitialData { LANG: C WRITES: rho(everywhere) diff --git a/HydroBase/src/hydrobase.cxx b/HydroBaseX/src/hydrobase.cxx similarity index 90% rename from HydroBase/src/hydrobase.cxx rename to HydroBaseX/src/hydrobase.cxx index fa69de8fe..a90cfd99d 100644 --- a/HydroBase/src/hydrobase.cxx +++ b/HydroBaseX/src/hydrobase.cxx @@ -4,11 +4,11 @@ #include #include -namespace HydroBase { +namespace HydroBaseX { using namespace Loop; -extern "C" void HydroBase_initial_data(CCTK_ARGUMENTS) { - DECLARE_CCTK_ARGUMENTSX_HydroBase_initial_data; +extern "C" void HydroBaseX_initial_data(CCTK_ARGUMENTS) { + DECLARE_CCTK_ARGUMENTSX_HydroBaseX_initial_data; DECLARE_CCTK_PARAMETERS; grid.loop_all_device<1, 1, 1>(grid.nghostzones, @@ -39,4 +39,4 @@ extern "C" void HydroBase_initial_data(CCTK_ARGUMENTS) { CCTK_ATTRIBUTE_ALWAYS_INLINE { Avecz(p.I) = 0; }); } -} // namespace HydroBase +} // namespace HydroBaseX diff --git a/HydroBase/src/make.code.defn b/HydroBaseX/src/make.code.defn similarity index 69% rename from HydroBase/src/make.code.defn rename to HydroBaseX/src/make.code.defn index 58d9399ad..e03051094 100644 --- a/HydroBase/src/make.code.defn +++ b/HydroBaseX/src/make.code.defn @@ -1,4 +1,4 @@ -# Main make.code.defn file for thorn HydroBase +# Main make.code.defn file for thorn HydroBaseX # Source files in this directory SRCS = hydrobase.cxx From 62bc2afe62d591a44179ad39d615dd85a54a860d Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Thu, 6 Jul 2023 14:08:49 -0400 Subject: [PATCH 4/9] PDESolvers: Rename thorns --- PDESolvers/src/solve.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PDESolvers/src/solve.cxx b/PDESolvers/src/solve.cxx index c809b1c5b..9a149a733 100644 --- a/PDESolvers/src/solve.cxx +++ b/PDESolvers/src/solve.cxx @@ -1131,8 +1131,8 @@ extern "C" void PDESolvers_Solve(CCTK_ARGUMENTS) { block_prolongated_offsets, block_prolongated_sizes, Jp); // TODO: fix this - const std::vector solinds{CCTK_VarIndex("Poisson2::sol")}; - const std::vector resinds{CCTK_VarIndex("Poisson2::res")}; + const std::vector solinds{CCTK_VarIndex("Poisson::sol")}; + const std::vector resinds{CCTK_VarIndex("Poisson::res")}; const int nvars = solinds.size(); assert(int(resinds.size()) == nvars); From dfd88e7c2b1a0b41e89bb49386768e06fc3a7dc4 Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Thu, 6 Jul 2023 14:09:13 -0400 Subject: [PATCH 5/9] Poisson: Rename from Poisson2 --- {Poisson2 => Poisson}/README | 2 +- Poisson/configuration.ccl | 3 ++ {Poisson2 => Poisson}/interface.ccl | 4 +-- {Poisson2 => Poisson}/par/poisson-fd4.par | 4 +-- {Poisson2 => Poisson}/par/poisson-logo.par | 4 +-- {Poisson2 => Poisson}/par/poisson-logo.png | Bin {Poisson2 => Poisson}/par/poisson-rl2.par | 2 +- {Poisson2 => Poisson}/par/poisson-rl4.par | 2 +- {Poisson2 => Poisson}/par/poisson.par | 2 +- {Poisson2 => Poisson}/param.ccl | 2 +- {Poisson2 => Poisson}/schedule.ccl | 32 ++++++++--------- {Poisson2 => Poisson}/src/make.code.defn | 2 +- {Poisson2 => Poisson}/src/poisson.cxx | 40 ++++++++++----------- Poisson2/configuration.ccl | 3 -- 14 files changed, 51 insertions(+), 51 deletions(-) rename {Poisson2 => Poisson}/README (89%) create mode 100644 Poisson/configuration.ccl rename {Poisson2 => Poisson}/interface.ccl (89%) rename {Poisson2 => Poisson}/par/poisson-fd4.par (97%) rename {Poisson2 => Poisson}/par/poisson-logo.par (96%) rename {Poisson2 => Poisson}/par/poisson-logo.png (100%) rename {Poisson2 => Poisson}/par/poisson-rl2.par (99%) rename {Poisson2 => Poisson}/par/poisson-rl4.par (99%) rename {Poisson2 => Poisson}/par/poisson.par (98%) rename {Poisson2 => Poisson}/param.ccl (88%) rename {Poisson2 => Poisson}/schedule.ccl (54%) rename {Poisson2 => Poisson}/src/make.code.defn (69%) rename {Poisson2 => Poisson}/src/poisson.cxx (90%) delete mode 100644 Poisson2/configuration.ccl diff --git a/Poisson2/README b/Poisson/README similarity index 89% rename from Poisson2/README rename to Poisson/README index c90a4a0db..790d0619c 100644 --- a/Poisson2/README +++ b/Poisson/README @@ -1,4 +1,4 @@ -Cactus Code Thorn Poisson2 +Cactus Code Thorn Poisson Author(s) : Erik Schnetter Maintainer(s): Erik Schnetter Licence : LGPL diff --git a/Poisson/configuration.ccl b/Poisson/configuration.ccl new file mode 100644 index 000000000..052505876 --- /dev/null +++ b/Poisson/configuration.ccl @@ -0,0 +1,3 @@ +# Configuration definitions for thorn Poisson + +REQUIRES PDESolvers diff --git a/Poisson2/interface.ccl b/Poisson/interface.ccl similarity index 89% rename from Poisson2/interface.ccl rename to Poisson/interface.ccl index 1cf1ed0f2..5c94c918c 100644 --- a/Poisson2/interface.ccl +++ b/Poisson/interface.ccl @@ -1,6 +1,6 @@ -# Interface definition for thorn Poisson2 +# Interface definition for thorn Poisson -IMPLEMENTS: Poisson2 +IMPLEMENTS: Poisson INHERITS: PDESolvers diff --git a/Poisson2/par/poisson-fd4.par b/Poisson/par/poisson-fd4.par similarity index 97% rename from Poisson2/par/poisson-fd4.par rename to Poisson/par/poisson-fd4.par index 4b65266e6..ee314bc60 100644 --- a/Poisson2/par/poisson-fd4.par +++ b/Poisson/par/poisson-fd4.par @@ -2,7 +2,7 @@ ActiveThorns = " CarpetX IOUtil PDESolvers - Poisson2 + Poisson SystemTopology " @@ -44,7 +44,7 @@ PDESolvers::petsc_options = "-snes_linesearch_type basic -ksp_type bcgs -snes_mo PDESolvers::dnz = 13 PDESolvers::onz = 8 -Poisson2::fdorder = 4 +Poisson::fdorder = 4 IO::out_dir = $parfile IO::out_every = 1 diff --git a/Poisson2/par/poisson-logo.par b/Poisson/par/poisson-logo.par similarity index 96% rename from Poisson2/par/poisson-logo.par rename to Poisson/par/poisson-logo.par index 02d9f314e..703f47f8f 100644 --- a/Poisson2/par/poisson-logo.par +++ b/Poisson/par/poisson-logo.par @@ -2,7 +2,7 @@ ActiveThorns = " CarpetX IOUtil PDESolvers - Poisson2 + Poisson " CarpetX::verbose = no @@ -41,7 +41,7 @@ CarpetX::interpolation_order = 1 PDESolvers::petsc_options = "-snes_linesearch_type basic -ksp_type bcgs -snes_monitor ascii -snes_converged_reason -ksp_monitor -ksp_converged_reason" -Poisson2::source = "logo" +Poisson::source = "logo" IO::out_dir = $parfile IO::out_every = 1 diff --git a/Poisson2/par/poisson-logo.png b/Poisson/par/poisson-logo.png similarity index 100% rename from Poisson2/par/poisson-logo.png rename to Poisson/par/poisson-logo.png diff --git a/Poisson2/par/poisson-rl2.par b/Poisson/par/poisson-rl2.par similarity index 99% rename from Poisson2/par/poisson-rl2.par rename to Poisson/par/poisson-rl2.par index c8d3c54a0..6fd92c442 100644 --- a/Poisson2/par/poisson-rl2.par +++ b/Poisson/par/poisson-rl2.par @@ -3,7 +3,7 @@ ActiveThorns = " ErrorEstimator IOUtil PDESolvers - Poisson2 + Poisson SystemTopology " diff --git a/Poisson2/par/poisson-rl4.par b/Poisson/par/poisson-rl4.par similarity index 99% rename from Poisson2/par/poisson-rl4.par rename to Poisson/par/poisson-rl4.par index 54f114777..fe65c0202 100644 --- a/Poisson2/par/poisson-rl4.par +++ b/Poisson/par/poisson-rl4.par @@ -3,7 +3,7 @@ ActiveThorns = " ErrorEstimator IOUtil PDESolvers - Poisson2 + Poisson SystemTopology " diff --git a/Poisson2/par/poisson.par b/Poisson/par/poisson.par similarity index 98% rename from Poisson2/par/poisson.par rename to Poisson/par/poisson.par index 6b04e3e94..59d116505 100644 --- a/Poisson2/par/poisson.par +++ b/Poisson/par/poisson.par @@ -2,7 +2,7 @@ ActiveThorns = " CarpetX IOUtil PDESolvers - Poisson2 + Poisson SystemTopology " diff --git a/Poisson2/param.ccl b/Poisson/param.ccl similarity index 88% rename from Poisson2/param.ccl rename to Poisson/param.ccl index bf736ddb9..2e18b887a 100644 --- a/Poisson2/param.ccl +++ b/Poisson/param.ccl @@ -1,4 +1,4 @@ -# Parameter definitions for thorn Poisson2 +# Parameter definitions for thorn Poisson INT fdorder "Finite differenc order" { diff --git a/Poisson2/schedule.ccl b/Poisson/schedule.ccl similarity index 54% rename from Poisson2/schedule.ccl rename to Poisson/schedule.ccl index 3c96ff1eb..66ae55793 100644 --- a/Poisson2/schedule.ccl +++ b/Poisson/schedule.ccl @@ -1,32 +1,32 @@ -# Schedule definitions for thorn Poisson2 +# Schedule definitions for thorn Poisson -SCHEDULE Poisson2_Source AT initial BEFORE PDESolvers_Solve +SCHEDULE Poisson_Source AT initial BEFORE PDESolvers_Solve { LANG: C WRITES: src(everywhere) } "Set source function" -SCHEDULE Poisson2_ChooseInitialGuess AT initial BEFORE Poisson2_Init +SCHEDULE Poisson_ChooseInitialGuess AT initial BEFORE Poisson_Init { LANG: C OPTIONS: GLOBAL WRITES: need_initial_guess } "Set need_initial_guess" -SCHEDULE Poisson2_Init AT initial BEFORE PDESolvers_Solve IF Poisson2::need_initial_guess +SCHEDULE Poisson_Init AT initial BEFORE PDESolvers_Solve IF Poisson::need_initial_guess { LANG: C WRITES: sol(interior) } "Initialize solution" -SCHEDULE Poisson2_Sync AT initial AFTER Poisson2_Init BEFORE PDESolvers_Solve # IF Poisson2::need_initial_guess +SCHEDULE Poisson_Sync AT initial AFTER Poisson_Init BEFORE PDESolvers_Solve # IF Poisson::need_initial_guess { LANG: C OPTIONS: global SYNC: sol } "Synchronize solution" -SCHEDULE Poisson2_Boundaries AT initial AFTER Poisson2_Sync BEFORE PDESolvers_Solve # IF Poisson2::need_initial_guess +SCHEDULE Poisson_Boundaries AT initial AFTER Poisson_Sync BEFORE PDESolvers_Solve # IF Poisson::need_initial_guess { LANG: C WRITES: sol(boundary) @@ -34,20 +34,20 @@ SCHEDULE Poisson2_Boundaries AT initial AFTER Poisson2_Sync BEFORE PDESolvers_So -SCHEDULE Poisson2_Sync IN PDESolvers_Residual +SCHEDULE Poisson_Sync IN PDESolvers_Residual { LANG: C OPTIONS: global SYNC: sol } "Synchronize solution" -SCHEDULE Poisson2_Boundaries IN PDESolvers_Residual AFTER Poisson2_Sync +SCHEDULE Poisson_Boundaries IN PDESolvers_Residual AFTER Poisson_Sync { LANG: C WRITES: sol(boundary) } "Initialize boundaries of solution" -SCHEDULE Poisson2_Residual IN PDESolvers_Residual AFTER (Poisson2_Sync, Poisson2_Boundaries) +SCHEDULE Poisson_Residual IN PDESolvers_Residual AFTER (Poisson_Sync, Poisson_Boundaries) { LANG: C READS: PDESolvers::point_type(everywhere) @@ -56,7 +56,7 @@ SCHEDULE Poisson2_Residual IN PDESolvers_Residual AFTER (Poisson2_Sync, Poisson2 WRITES: res(interior) } "Evaluate residual" -# SCHEDULE Poisson2_ResidualBoundaries IN PDESolvers_Residual AFTER Poisson2_Sync +# SCHEDULE Poisson_ResidualBoundaries IN PDESolvers_Residual AFTER Poisson_Sync # { # LANG: C # READS: PDESolvers::point_type(everywhere) @@ -65,27 +65,27 @@ SCHEDULE Poisson2_Residual IN PDESolvers_Residual AFTER (Poisson2_Sync, Poisson2 # WRITES: res(boundary) # } "Evaluate residual on boundaries" # -# SCHEDULE Poisson2_ResidualSync IN PDESolvers_Residual AFTER (Poisson2_Residual, Poisson2_ResidualBoundaries) +# SCHEDULE Poisson_ResidualSync IN PDESolvers_Residual AFTER (Poisson_Residual, Poisson_ResidualBoundaries) # { # LANG: C # OPTIONS: global # SYNC: res # } "Synchronize residual" -SCHEDULE Poisson2_Sync IN PDESolvers_Jacobian +SCHEDULE Poisson_Sync IN PDESolvers_Jacobian { LANG: C OPTIONS: global SYNC: sol } "Synchronize solution" -SCHEDULE Poisson2_Boundaries IN PDESolvers_Jacobian AFTER Poisson2_Sync +SCHEDULE Poisson_Boundaries IN PDESolvers_Jacobian AFTER Poisson_Sync { LANG: C WRITES: sol(boundary) } "Initialize boundaries of solution" -SCHEDULE Poisson2_Jacobian IN PDESolvers_Jacobian AFTER (Poisson2_Sync, Poisson2_Boundaries) +SCHEDULE Poisson_Jacobian IN PDESolvers_Jacobian AFTER (Poisson_Sync, Poisson_Boundaries) { LANG: C READS: PDESolvers::point_type(everywhere) @@ -100,14 +100,14 @@ SCHEDULE GROUP PDESolvers_Residual AT initial AFTER PDESolvers_Solve { } "Evaluate residual after solving" -SCHEDULE Poisson2_ResidualSync AT initial AFTER PDESolvers_Residual +SCHEDULE Poisson_ResidualSync AT initial AFTER PDESolvers_Residual { LANG: C OPTIONS: global SYNC: res } "Synchronize residual" -SCHEDULE Poisson2_ResidualBoundaries AT initial AFTER Poisson2_ResidualSync +SCHEDULE Poisson_ResidualBoundaries AT initial AFTER Poisson_ResidualSync { LANG: C READS: PDESolvers::point_type(boundary) diff --git a/Poisson2/src/make.code.defn b/Poisson/src/make.code.defn similarity index 69% rename from Poisson2/src/make.code.defn rename to Poisson/src/make.code.defn index 3994717f9..c16ebc593 100644 --- a/Poisson2/src/make.code.defn +++ b/Poisson/src/make.code.defn @@ -1,4 +1,4 @@ -# Main make.code.defn file for thorn Poisson2 +# Main make.code.defn file for thorn Poisson # Source files in this directory SRCS = poisson.cxx diff --git a/Poisson2/src/poisson.cxx b/Poisson/src/poisson.cxx similarity index 90% rename from Poisson2/src/poisson.cxx rename to Poisson/src/poisson.cxx index 6caecf0cb..cc87fadd6 100644 --- a/Poisson2/src/poisson.cxx +++ b/Poisson/src/poisson.cxx @@ -19,12 +19,12 @@ #include #include -namespace Poisson2 { +namespace Poisson { constexpr int dim = Loop::dim; -extern "C" void Poisson2_Source(CCTK_ARGUMENTS) { - DECLARE_CCTK_ARGUMENTS_Poisson2_Source; +extern "C" void Poisson_Source(CCTK_ARGUMENTS) { + DECLARE_CCTK_ARGUMENTS_Poisson_Source; DECLARE_CCTK_PARAMETERS; const int npoints = 27; // 3 levels @@ -66,16 +66,16 @@ extern "C" void Poisson2_Source(CCTK_ARGUMENTS) { } } -extern "C" void Poisson2_ChooseInitialGuess(CCTK_ARGUMENTS) { - DECLARE_CCTK_ARGUMENTS_Poisson2_ChooseInitialGuess; +extern "C" void Poisson_ChooseInitialGuess(CCTK_ARGUMENTS) { + DECLARE_CCTK_ARGUMENTS_Poisson_ChooseInitialGuess; // Set up an initial guess only when initializing the coarsest // level. Otherwise, keep the data from the previous solve. *need_initial_guess = CarpetX::ghext->num_levels() == 1; } -extern "C" void Poisson2_Init(CCTK_ARGUMENTS) { - DECLARE_CCTK_ARGUMENTS_Poisson2_Init; +extern "C" void Poisson_Init(CCTK_ARGUMENTS) { + DECLARE_CCTK_ARGUMENTS_Poisson_Init; const std::array indextype = {0, 0, 0}; const Loop::GF3D2layout layout1(cctkGH, indextype); @@ -88,13 +88,13 @@ extern "C" void Poisson2_Init(CCTK_ARGUMENTS) { ARITH_INLINE { gf_sol(p.I) = 0; }); } -extern "C" void Poisson2_Sync(CCTK_ARGUMENTS) { - DECLARE_CCTK_ARGUMENTS_Poisson2_Sync; +extern "C" void Poisson_Sync(CCTK_ARGUMENTS) { + DECLARE_CCTK_ARGUMENTS_Poisson_Sync; // do nothing } -extern "C" void Poisson2_Boundaries(CCTK_ARGUMENTS) { - DECLARE_CCTK_ARGUMENTS_Poisson2_Boundaries; +extern "C" void Poisson_Boundaries(CCTK_ARGUMENTS) { + DECLARE_CCTK_ARGUMENTS_Poisson_Boundaries; const std::array indextype = {0, 0, 0}; const Loop::GF3D2layout layout1(cctkGH, indextype); @@ -152,8 +152,8 @@ dual1 residual(const int fdorder, const Loop::GF3D2 &point_type, return ddsol - src(p.I); } -extern "C" void Poisson2_Residual(CCTK_ARGUMENTS) { - DECLARE_CCTK_ARGUMENTS_Poisson2_Residual; +extern "C" void Poisson_Residual(CCTK_ARGUMENTS) { + DECLARE_CCTK_ARGUMENTS_Poisson_Residual; DECLARE_CCTK_PARAMETERS; const std::array indextype = {0, 0, 0}; @@ -204,13 +204,13 @@ extern "C" void Poisson2_Residual(CCTK_ARGUMENTS) { }); } -extern "C" void Poisson2_ResidualSync(CCTK_ARGUMENTS) { - DECLARE_CCTK_ARGUMENTS_Poisson2_ResidualSync; +extern "C" void Poisson_ResidualSync(CCTK_ARGUMENTS) { + DECLARE_CCTK_ARGUMENTS_Poisson_ResidualSync; // do nothing } -extern "C" void Poisson2_ResidualBoundaries(CCTK_ARGUMENTS) { - DECLARE_CCTK_ARGUMENTS_Poisson2_ResidualBoundaries; +extern "C" void Poisson_ResidualBoundaries(CCTK_ARGUMENTS) { + DECLARE_CCTK_ARGUMENTS_Poisson_ResidualBoundaries; DECLARE_CCTK_PARAMETERS; const std::array indextype = {0, 0, 0}; @@ -227,8 +227,8 @@ extern "C" void Poisson2_ResidualBoundaries(CCTK_ARGUMENTS) { }); } -extern "C" void Poisson2_Jacobian(CCTK_ARGUMENTS) { - DECLARE_CCTK_ARGUMENTS_Poisson2_Jacobian; +extern "C" void Poisson_Jacobian(CCTK_ARGUMENTS) { + DECLARE_CCTK_ARGUMENTS_Poisson_Jacobian; DECLARE_CCTK_PARAMETERS; const std::array indextype = {0, 0, 0}; @@ -288,4 +288,4 @@ extern "C" void Poisson2_Jacobian(CCTK_ARGUMENTS) { }); } -} // namespace Poisson2 +} // namespace Poisson diff --git a/Poisson2/configuration.ccl b/Poisson2/configuration.ccl deleted file mode 100644 index 686a1a5d8..000000000 --- a/Poisson2/configuration.ccl +++ /dev/null @@ -1,3 +0,0 @@ -# Configuration definitions for thorn Poisson2 - -REQUIRES PDESolvers From a8e17fc05ccc407610db4b0f86aad97f6530c8aa Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Thu, 6 Jul 2023 14:09:37 -0400 Subject: [PATCH 6/9] CI: Rename thorns --- scripts/carpetx.th | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/carpetx.th b/scripts/carpetx.th index 6b16c627d..d0018a494 100644 --- a/scripts/carpetx.th +++ b/scripts/carpetx.th @@ -696,7 +696,7 @@ Numerical/AEILocalInterp !TARGET = $ARR !TYPE = ignore !CHECKOUT = -CarpetX/ADMBase +CarpetX/ADMBaseX CarpetX/Algo CarpetX/Arith CarpetX/CarpetX @@ -704,11 +704,11 @@ CarpetX/Coordinates CarpetX/Derivs CarpetX/ErrorEstimator CarpetX/FluxWaveToyX -CarpetX/HydroBase +CarpetX/HydroBaseX CarpetX/Loop CarpetX/ODESolvers CarpetX/PDESolvers -CarpetX/Poisson2 +CarpetX/Poisson CarpetX/SIMDWaveToyX CarpetX/SpacetimeWaveToyX CarpetX/StaggeredWaveToyX @@ -721,5 +721,5 @@ CarpetX/TestODESolvers2 CarpetX/TestOutput CarpetX/TestProlongate CarpetX/TestSymmetries -CarpetX/TmunuBase +CarpetX/TmunuBaseX CarpetX/WaveToyX From 0c2618ac782c42e9d23d0ca9619109599e74e6aa Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Thu, 6 Jul 2023 14:09:59 -0400 Subject: [PATCH 7/9] TestInterpolate: Rename thorns --- TestInterpolate/README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TestInterpolate/README b/TestInterpolate/README index 4b9367145..51d7a871b 100644 --- a/TestInterpolate/README +++ b/TestInterpolate/README @@ -8,4 +8,4 @@ Licence : LGPL Test interpolator interface(s) in CarpetX -Taken from test originally in AHFinder +Taken from test originally in AHFinderX From 802665f6858836538b87c101e485696fec10d833 Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Thu, 6 Jul 2023 14:10:16 -0400 Subject: [PATCH 8/9] TmunuBaseX: Rename from TmunuBase --- TmunuBase/configuration.ccl | 3 -- TmunuBase/param.ccl | 1 - TmunuBase/schedule.ccl | 29 -------------------- {TmunuBase => TmunuBaseX}/README | 2 +- TmunuBaseX/configuration.ccl | 3 ++ {TmunuBase => TmunuBaseX}/interface.ccl | 4 +-- TmunuBaseX/param.ccl | 1 + TmunuBaseX/schedule.ccl | 29 ++++++++++++++++++++ {TmunuBase => TmunuBaseX}/src/make.code.defn | 2 +- {TmunuBase => TmunuBaseX}/src/tmunubase.cxx | 8 +++--- 10 files changed, 41 insertions(+), 41 deletions(-) delete mode 100644 TmunuBase/configuration.ccl delete mode 100644 TmunuBase/param.ccl delete mode 100644 TmunuBase/schedule.ccl rename {TmunuBase => TmunuBaseX}/README (90%) create mode 100644 TmunuBaseX/configuration.ccl rename {TmunuBase => TmunuBaseX}/interface.ccl (85%) create mode 100644 TmunuBaseX/param.ccl create mode 100644 TmunuBaseX/schedule.ccl rename {TmunuBase => TmunuBaseX}/src/make.code.defn (69%) rename {TmunuBase => TmunuBaseX}/src/tmunubase.cxx (95%) diff --git a/TmunuBase/configuration.ccl b/TmunuBase/configuration.ccl deleted file mode 100644 index 299ac1a6f..000000000 --- a/TmunuBase/configuration.ccl +++ /dev/null @@ -1,3 +0,0 @@ -# Configuration definition for thorn TmunuBase - -REQUIRES Loop diff --git a/TmunuBase/param.ccl b/TmunuBase/param.ccl deleted file mode 100644 index e2674e742..000000000 --- a/TmunuBase/param.ccl +++ /dev/null @@ -1 +0,0 @@ -# Parameter definitions for thorn TmunuBase diff --git a/TmunuBase/schedule.ccl b/TmunuBase/schedule.ccl deleted file mode 100644 index 9d7d1bdab..000000000 --- a/TmunuBase/schedule.ccl +++ /dev/null @@ -1,29 +0,0 @@ -# Schedule definitions for thorn TmunuBase - -SCHEDULE GROUP TmunuBase_SetTmunuVars AT initial AFTER ADMBase_SetADMVars -{ -} "Schedule group for setting T_munu" - -SCHEDULE GROUP TmunuBase_SetTmunuVars AT postregrid AFTER ADMBase_SetADMVars -{ -} "Schedule group for setting T_munu" - -SCHEDULE GROUP TmunuBase_SetTmunuVars AT poststep AFTER ADMBase_SetADMVars -{ -} "Schedule group for setting T_munu" - -SCHEDULE GROUP TmunuBase_SetTmunuVars IN ODESolvers_PostStep AFTER ADMBase_SetADMVars -{ -} "Schedule group for setting T_munu" - - - -SCHEDULE TmunuBase_ZeroTmunu IN TmunuBase_SetTmunuVars -{ - LANG: C - WRITES: eTtt(everywhere) eTti(everywhere) eTij(everywhere) -} "Set T_munu to zero" - -SCHEDULE GROUP TmunuBase_AddToTmunu IN TmunuBase_SetTmunuVars AFTER TmunuBase_ZeroTmunu -{ -} "Add to T_munu here" diff --git a/TmunuBase/README b/TmunuBaseX/README similarity index 90% rename from TmunuBase/README rename to TmunuBaseX/README index 7c64c085d..1f0be3419 100644 --- a/TmunuBase/README +++ b/TmunuBaseX/README @@ -1,4 +1,4 @@ -Cactus Code Thorn TmunuBase +Cactus Code Thorn TmunuBaseX Author(s) : Erik Schnetter Maintainer(s): Erik Schnetter Licence : LGPL diff --git a/TmunuBaseX/configuration.ccl b/TmunuBaseX/configuration.ccl new file mode 100644 index 000000000..0ad3c01a7 --- /dev/null +++ b/TmunuBaseX/configuration.ccl @@ -0,0 +1,3 @@ +# Configuration definition for thorn TmunuBaseX + +REQUIRES Loop diff --git a/TmunuBase/interface.ccl b/TmunuBaseX/interface.ccl similarity index 85% rename from TmunuBase/interface.ccl rename to TmunuBaseX/interface.ccl index f1b5926b5..c8bab26ad 100644 --- a/TmunuBase/interface.ccl +++ b/TmunuBaseX/interface.ccl @@ -1,6 +1,6 @@ -# Interface definition for thorn TmunuBase +# Interface definition for thorn TmunuBaseX -IMPLEMENTS: TmunuBase +IMPLEMENTS: TmunuBaseX USES INCLUDE HEADER: loop_device.hxx diff --git a/TmunuBaseX/param.ccl b/TmunuBaseX/param.ccl new file mode 100644 index 000000000..4ea7499f6 --- /dev/null +++ b/TmunuBaseX/param.ccl @@ -0,0 +1 @@ +# Parameter definitions for thorn TmunuBaseX diff --git a/TmunuBaseX/schedule.ccl b/TmunuBaseX/schedule.ccl new file mode 100644 index 000000000..985c80e05 --- /dev/null +++ b/TmunuBaseX/schedule.ccl @@ -0,0 +1,29 @@ +# Schedule definitions for thorn TmunuBaseX + +SCHEDULE GROUP TmunuBaseX_SetTmunuVars AT initial AFTER ADMBaseX_SetADMVars +{ +} "Schedule group for setting T_munu" + +SCHEDULE GROUP TmunuBaseX_SetTmunuVars AT postregrid AFTER ADMBaseX_SetADMVars +{ +} "Schedule group for setting T_munu" + +SCHEDULE GROUP TmunuBaseX_SetTmunuVars AT poststep AFTER ADMBaseX_SetADMVars +{ +} "Schedule group for setting T_munu" + +SCHEDULE GROUP TmunuBaseX_SetTmunuVars IN ODESolvers_PostStep AFTER ADMBaseX_SetADMVars +{ +} "Schedule group for setting T_munu" + + + +SCHEDULE TmunuBaseX_ZeroTmunu IN TmunuBaseX_SetTmunuVars +{ + LANG: C + WRITES: eTtt(everywhere) eTti(everywhere) eTij(everywhere) +} "Set T_munu to zero" + +SCHEDULE GROUP TmunuBaseX_AddToTmunu IN TmunuBaseX_SetTmunuVars AFTER TmunuBaseX_ZeroTmunu +{ +} "Add to T_munu here" diff --git a/TmunuBase/src/make.code.defn b/TmunuBaseX/src/make.code.defn similarity index 69% rename from TmunuBase/src/make.code.defn rename to TmunuBaseX/src/make.code.defn index ec5cd0ecd..4dd0cf21c 100644 --- a/TmunuBase/src/make.code.defn +++ b/TmunuBaseX/src/make.code.defn @@ -1,4 +1,4 @@ -# Main make.code.defn file for thorn TmunuBase +# Main make.code.defn file for thorn TmunuBaseX # Source files in this directory SRCS = tmunubase.cxx diff --git a/TmunuBase/src/tmunubase.cxx b/TmunuBaseX/src/tmunubase.cxx similarity index 95% rename from TmunuBase/src/tmunubase.cxx rename to TmunuBaseX/src/tmunubase.cxx index 7318c4906..656eae0e9 100644 --- a/TmunuBase/src/tmunubase.cxx +++ b/TmunuBaseX/src/tmunubase.cxx @@ -6,12 +6,12 @@ #include -namespace TmunuBase { +namespace TmunuBaseX { using namespace std; using namespace Loop; -extern "C" void TmunuBase_ZeroTmunu(CCTK_ARGUMENTS) { - DECLARE_CCTK_ARGUMENTS_TmunuBase_ZeroTmunu; +extern "C" void TmunuBaseX_ZeroTmunu(CCTK_ARGUMENTS) { + DECLARE_CCTK_ARGUMENTS_TmunuBaseX_ZeroTmunu; DECLARE_CCTK_PARAMETERS; const array indextype = {0, 0, 0}; @@ -78,4 +78,4 @@ extern "C" void TmunuBase_ZeroTmunu(CCTK_ARGUMENTS) { }); } -} // namespace TmunuBase +} // namespace TmunuBaseX From 423d0abce8c6f199655025cdb2713f8729920c97 Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Thu, 6 Jul 2023 14:21:35 -0400 Subject: [PATCH 9/9] CI: Update machine descriptions for renamed thorns --- scripts/actions-cpu-real32.ini | 2 +- scripts/actions-cuda-real32.ini | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/actions-cpu-real32.ini b/scripts/actions-cpu-real32.ini index 41f6af9d8..93c621e54 100644 --- a/scripts/actions-cpu-real32.ini +++ b/scripts/actions-cpu-real32.ini @@ -24,7 +24,7 @@ makejobs = 2 disabled-thorns = <