Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename thorns #169

Merged
merged 9 commits into from
Jul 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions ADMBase/configuration.ccl

This file was deleted.

2 changes: 1 addition & 1 deletion ADMBase/README → ADMBaseX/README
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Cactus Code Thorn ADMBase
Cactus Code Thorn ADMBaseX
Author(s) : Erik Schnetter <[email protected]>
Maintainer(s): Erik Schnetter <[email protected]>
Licence : LGPL
Expand Down
3 changes: 3 additions & 0 deletions ADMBaseX/configuration.ccl
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Configuration definition for thorn ADMBaseX

REQUIRES Loop
4 changes: 2 additions & 2 deletions ADMBase/interface.ccl → ADMBaseX/interface.ccl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Interface definition for thorn ADMBase
# Interface definition for thorn ADMBaseX

IMPLEMENTS: ADMBase
IMPLEMENTS: ADMBaseX

USES INCLUDE HEADER: loop_device.hxx

Expand Down
2 changes: 1 addition & 1 deletion ADMBase/param.ccl → ADMBaseX/param.ccl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Parameter definitions for thorn ADMBase
# Parameter definitions for thorn ADMBaseX

RESTRICTED:

Expand Down
36 changes: 18 additions & 18 deletions ADMBase/schedule.ccl → ADMBaseX/schedule.ccl
Original file line number Diff line number Diff line change
@@ -1,83 +1,83 @@
# 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)
} "Set up linear wave initial data"
}

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)
} "Set lapse to 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)
} "Set dtlapse to 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)
} "Set shift to 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)
Expand All @@ -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)
Expand All @@ -111,5 +111,5 @@ if (noise_amplitude != 0) {
SYNC: dtlapse
SYNC: shift
SYNC: dtshift
} "Add noise to ADMBase variables"
} "Add noise to ADMBaseX variables"
}
24 changes: 12 additions & 12 deletions ADMBase/src/admbase.cxx → ADMBaseX/src/admbase.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@

#include <array>

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<int, dim> indextype = {0, 0, 0};
Expand Down Expand Up @@ -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<int, dim> indextype = {0, 0, 0};
Expand All @@ -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<int, dim> indextype = {0, 0, 0};
Expand All @@ -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<int, dim> indextype = {0, 0, 0};
Expand All @@ -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<int, dim> indextype = {0, 0, 0};
Expand All @@ -124,4 +124,4 @@ extern "C" void ADMBase_initial_dtshift(CCTK_ARGUMENTS) {
});
}

} // namespace ADMBase
} // namespace ADMBaseX
8 changes: 4 additions & 4 deletions ADMBase/src/linear_wave.cxx → ADMBaseX/src/linear_wave.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@

#include <cmath>

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;
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion ADMBase/src/make.code.defn → ADMBaseX/src/make.code.defn
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 4 additions & 4 deletions ADMBase/src/noise.cxx → ADMBaseX/src/noise.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@

#include <random>

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
Expand Down Expand Up @@ -85,4 +85,4 @@ extern "C" void ADMBase_add_noise(CCTK_ARGUMENTS) {
[&](const PointDesc &p) { add_noise(dtbetaz_(p.I)); });
}

} // namespace ADMBase
} // namespace ADMBaseX
8 changes: 4 additions & 4 deletions CarpetX/par/brill-lindquist-checkpoint.par
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
ActiveThorns = "
ADMBase
ADMBaseX
BrillLindquist
CarpetX
IOUtil
ODESolvers
TmunuBase
TmunuBaseX
Z4c
"

Expand Down Expand Up @@ -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
Expand Down
22 changes: 11 additions & 11 deletions CarpetX/par/brill-lindquist-read.par
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
ActiveThorns = "
ADMBase
ADMBaseX
CarpetX
IOUtil
ODESolvers
TmunuBase
TmunuBaseX
Z4c
"

Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions CarpetX/par/brill-lindquist-recover.par
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
ActiveThorns = "
ADMBase
ADMBaseX
BrillLindquist
CarpetX
IOUtil
ODESolvers
TmunuBase
TmunuBaseX
Z4c
"

Expand Down
8 changes: 4 additions & 4 deletions CarpetX/par/brill-lindquist-write.par
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
ActiveThorns = "
ADMBase
ADMBaseX
BrillLindquist
CarpetX
IOUtil
ODESolvers
TmunuBase
TmunuBaseX
Z4c
"

Expand Down Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions HydroBase/configuration.ccl

This file was deleted.

6 changes: 3 additions & 3 deletions HydroBase/README → HydroBaseX/README
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Cactus Code Thorn HydroBase
Cactus Code Thorn HydroBaseX
Author(s) : Erik Schnetter <[email protected]>
Maintainer(s): Erik Schnetter <[email protected]>
Licence : LGPL
Expand All @@ -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

Expand Down
3 changes: 3 additions & 0 deletions HydroBaseX/configuration.ccl
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Configuration definition for thorn HydroBaseX

REQUIRES Loop
Loading