Skip to content

Commit

Permalink
CarpetX: Rename the thorn providing regrid_error from Regrid to Carpe…
Browse files Browse the repository at this point in the history
…tXRegrid
  • Loading branch information
stevenrbrandt committed Aug 2, 2024
1 parent 5949f97 commit ede9a79
Show file tree
Hide file tree
Showing 155 changed files with 146 additions and 52 deletions.
2 changes: 1 addition & 1 deletion BoxInBox/interface.ccl
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

IMPLEMENTS: BoxInBox

INHERITS: Driver, Regrid
INHERITS: Driver, CarpetXRegrid

USES INCLUDE HEADER: defs.hxx
USES INCLUDE HEADER: loop_device.hxx
Expand Down
4 changes: 2 additions & 2 deletions BoxInBox/schedule.ccl
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ SCHEDULE BoxInBox_Setup AS EstimateError AT postinitial
READS: positions
READS: radii
READS: radiixyz
WRITES: Regrid::regrid_error(interior)
WRITES: CarpetXRegrid::regrid_error(interior)
} "Estimate error"

SCHEDULE BoxInBox_Setup AS EstimateError AT poststep
Expand All @@ -30,5 +30,5 @@ SCHEDULE BoxInBox_Setup AS EstimateError AT poststep
READS: positions
READS: radii
READS: radiixyz
WRITES: Regrid::regrid_error(interior)
WRITES: CarpetXRegrid::regrid_error(interior)
} "Estimate error"
6 changes: 5 additions & 1 deletion BoxInBox/test/levels1.par
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,11 @@ CarpetX::out_norm_vars = "all"
CarpetX::out_norm_omit_unstable = yes

CarpetX::out_tsv_vars = "
Regrid::regrid_error
CarpetXRegrid::regrid_error
CoordinatesX::vertex_coords
CoordinatesX::cell_coords
"

Driver::periodic_x = no
Driver::periodic_y = no
Driver::periodic_z = no
5 changes: 4 additions & 1 deletion BoxInBox/test/levels2.par
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,10 @@ CarpetX::out_norm_vars = "all"
CarpetX::out_norm_omit_unstable = yes

CarpetX::out_tsv_vars = "
Regrid::regrid_error
CarpetXRegrid::regrid_error
CoordinatesX::vertex_coords
CoordinatesX::cell_coords
"
Driver::periodic_x = no
Driver::periodic_y = no
Driver::periodic_z = no
5 changes: 4 additions & 1 deletion BoxInBox/test/levels20.par
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,10 @@ CarpetX::out_norm_vars = "all"
CarpetX::out_norm_omit_unstable = yes

CarpetX::out_tsv_vars = "
Regrid::regrid_error
CarpetXRegrid::regrid_error
CoordinatesX::vertex_coords
CoordinatesX::cell_coords
"
Driver::periodic_x = no
Driver::periodic_y = no
Driver::periodic_z = no
5 changes: 4 additions & 1 deletion BoxInBox/test/levels3.par
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,10 @@ CarpetX::out_norm_vars = "all"
CarpetX::out_norm_omit_unstable = yes

CarpetX::out_tsv_vars = "
Regrid::regrid_error
CarpetXRegrid::regrid_error
CoordinatesX::vertex_coords
CoordinatesX::cell_coords
"
Driver::periodic_x = no
Driver::periodic_y = no
Driver::periodic_z = no
5 changes: 4 additions & 1 deletion BoxInBox/test/regions2.par
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,10 @@ CarpetX::out_norm_vars = "all"
CarpetX::out_norm_omit_unstable = yes

CarpetX::out_tsv_vars = "
Regrid::regrid_error
CarpetXRegrid::regrid_error
CoordinatesX::vertex_coords
CoordinatesX::cell_coords
"
Driver::periodic_x = no
Driver::periodic_y = no
Driver::periodic_z = no
5 changes: 4 additions & 1 deletion BoxInBox/test/regions3.par
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,10 @@ CarpetX::out_norm_vars = "all"
CarpetX::out_norm_omit_unstable = yes

CarpetX::out_tsv_vars = "
Regrid::regrid_error
CarpetXRegrid::regrid_error
CoordinatesX::vertex_coords
CoordinatesX::cell_coords
"
Driver::periodic_x = no
Driver::periodic_y = no
Driver::periodic_z = no
5 changes: 4 additions & 1 deletion BoxInBox/test/unigrid.par
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,10 @@ CarpetX::out_norm_vars = "all"
CarpetX::out_norm_omit_unstable = yes

CarpetX::out_tsv_vars = "
Regrid::regrid_error
CarpetXRegrid::regrid_error
CoordinatesX::vertex_coords
CoordinatesX::cell_coords
"
Driver::periodic_x = no
Driver::periodic_y = no
Driver::periodic_z = no
2 changes: 0 additions & 2 deletions CarpetX/interface.ccl
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

IMPLEMENTS: Driver

INHERITS: IO

USES INCLUDE HEADER: silo.hxx

USES INCLUDE HEADER: defs.hxx
Expand Down
15 changes: 7 additions & 8 deletions CarpetX/param.ccl
Original file line number Diff line number Diff line change
Expand Up @@ -72,22 +72,21 @@ CCTK_INT ncells_z "Number of grid cells"
RESTRICTED:

# Do not use
BOOLEAN periodic "Periodic"
BOOLEAN periodic "Do not use"
{
no :: "Only valid value"
} no

BOOLEAN periodic_x "Periodic"
BOOLEAN periodic_x "Do not use"
{
} no
} yes

BOOLEAN periodic_y "Periodic"
BOOLEAN periodic_y "Do not use"
{
} no
} yes

BOOLEAN periodic_z "Periodic"
BOOLEAN periodic_z "Do not use"
{
} no
} yes



Expand Down
2 changes: 1 addition & 1 deletion CarpetX/schedule.ccl
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ if (!CCTK_Equals(recover, "no") && *recover_file)
#SCHEDULE CarpetX_InitError AT basegrid
#{
# LANG: C
# WRITES: Regrid::regrid_error(everywhere)
# WRITES: CarpetXRegrid::regrid_error(everywhere)
#} "Initialize regridding error to zero"


Expand Down
2 changes: 1 addition & 1 deletion CarpetX/src/driver.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -1534,7 +1534,7 @@ void CactusAmrCore::ErrorEst(const int level, amrex::TagBoxArray &tags,
#pragma omp critical
CCTK_VINFO("ErrorEst patch %d level %d", patch, level);

const int gi = CCTK_GroupIndex("Regrid::regrid_error");
const int gi = CCTK_GroupIndex("CarpetXRegrid::regrid_error");
assert(gi >= 0);
const int vi = 0;
const int tl = 0;
Expand Down
4 changes: 2 additions & 2 deletions CarpetX/src/schedule.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -2240,7 +2240,7 @@ int SyncGroupsByDirI(const cGH *restrict cctkGH, int numgroups,
CCTK_VINFO("SyncGroups %s", buf.str().c_str());
}

const int gi_regrid_error = CCTK_GroupIndex("Regrid::regrid_error");
const int gi_regrid_error = CCTK_GroupIndex("CarpetXRegrid::regrid_error");
assert(gi_regrid_error >= 0);

vector<int> groups;
Expand Down Expand Up @@ -2621,7 +2621,7 @@ void Restrict(const cGH *cctkGH, int level, const vector<int> &groups) {
static Timer timer("Restrict");
Interval interval(timer);

const int gi_regrid_error = CCTK_GroupIndex("Regrid::regrid_error");
const int gi_regrid_error = CCTK_GroupIndex("CarpetXRegrid::regrid_error");
assert(gi_regrid_error >= 0);

for (const auto &patchdata : ghext->patchdata) {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion Regrid/interface.ccl → CarpetXRegrid/interface.ccl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Interface definition for thorn Regrid
implements: Regrid
implements: CarpetXRegrid
inherits:
PUBLIC:

Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion Regrid/schedule.ccl → CarpetXRegrid/schedule.ccl
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
SCHEDULE CarpetX_InitError AT basegrid
{
LANG: C
WRITES: Regrid::regrid_error(everywhere)
WRITES: CarpetXRegrid::regrid_error(everywhere)
} "Initialize regridding error to zero"
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
//#include "schedule.hxx"

#include <loop.hxx>
#include <loop_device.hxx>

#include <cctk.h>
Expand Down
2 changes: 1 addition & 1 deletion ErrorEstimator/interface.ccl
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

IMPLEMENTS: ErrorEstimator

INHERITS: Driver, Regrid
INHERITS: Driver, CarpetXRegrid



Expand Down
4 changes: 2 additions & 2 deletions ErrorEstimator/schedule.ccl
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
SCHEDULE ErrorEstimator_Estimate AS EstimateError AT postinitial
{
LANG: C
WRITES: Regrid::regrid_error(interior)
WRITES: CarpetXRegrid::regrid_error(interior)
} "Estimate error"

SCHEDULE ErrorEstimator_Estimate AS EstimateError AT poststep
{
LANG: C
WRITES: Regrid::regrid_error(interior)
WRITES: CarpetXRegrid::regrid_error(interior)
} "Estimate error"
3 changes: 3 additions & 0 deletions FluxWaveToyX/test/radiative.par
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,6 @@ CarpetX::out_tsv_vars = "
FluxWaveToyX::energy
FluxWaveToyX::error
"
Driver::periodic_x = no
Driver::periodic_y = no
Driver::periodic_z = no
3 changes: 3 additions & 0 deletions FluxWaveToyX/test/reflecting.par
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,6 @@ CarpetX::out_tsv_vars = "
FluxWaveToyX::energy
FluxWaveToyX::error
"
Driver::periodic_x = no
Driver::periodic_y = no
Driver::periodic_z = no
2 changes: 1 addition & 1 deletion MovingBoxToy/par/circle.par
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ CarpetX::out_norm_vars = "all"
CarpetX::out_norm_omit_unstable = yes

CarpetX::out_silo_vars = "
Regrid::regrid_error
CarpetXRegrid::regrid_error
CoordinatesX::vertex_coords
CoordinatesX::cell_coords
"
Expand Down
2 changes: 1 addition & 1 deletion MovingBoxToy/test/circle.par
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ CarpetX::out_norm_vars = "all"
CarpetX::out_norm_omit_unstable = yes

CarpetX::out_tsv_vars = "
Regrid::regrid_error
CarpetXRegrid::regrid_error
CoordinatesX::vertex_coords
CoordinatesX::cell_coords
"
Expand Down
2 changes: 1 addition & 1 deletion TestBoxInBox/test/moving.par
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ CarpetX::out_norm_vars = "all"
CarpetX::out_norm_omit_unstable = yes

CarpetX::out_tsv_vars = "
Regrid::regrid_error
CarpetXRegrid::regrid_error
CoordinatesX::vertex_coords
CoordinatesX::cell_coords
"
2 changes: 1 addition & 1 deletion TestDerivs/interface.ccl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Interface definition for thorn TestDerivs
IMPLEMENTS: TestDerivs

INHERITS: Driver, Regrid
INHERITS: Driver, CarpetXRegrid

USES INCLUDE HEADER: defs.hxx
USES INCLUDE HEADER: loop_device.hxx
Expand Down
2 changes: 1 addition & 1 deletion TestDerivs/schedule.ccl
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ STORAGE: ddchi
SCHEDULE TestDerivs_SetError AT postinitial
{
LANG: C
WRITES: Regrid::regrid_error(interior)
WRITES: CarpetXRegrid::regrid_error(interior)
} "Set up test grid"

SCHEDULE TestDerivs_Set AT initial
Expand Down
2 changes: 1 addition & 1 deletion TestNorms/interface.ccl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Interface definition for thorn TestNorms
implements: TestNorms
inherits: Driver, Regrid
inherits: Driver, CarpetXRegrid

uses include header: loop.hxx

Expand Down
2 changes: 1 addition & 1 deletion TestNorms/schedule.ccl
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ STORAGE: gf111
SCHEDULE TestNorms_SetError AT postinitial
{
LANG: C
WRITES: Regrid::regrid_error(interior)
WRITES: CarpetXRegrid::regrid_error(interior)
} "Set up test grid"

SCHEDULE TestNorms_Set AT initial
Expand Down
2 changes: 1 addition & 1 deletion TestODESolvers/test/test-constant.par
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ CarpetX::out_metadata = no
CarpetX::out_norm_omit_unstable = yes
# TestODESolvers::corder requires larger tolerances (~1e-5)
CarpetX::out_norm_vars = "
Regrid::regrid_error
CarpetXRegrid::regrid_error
# TestODESolvers::corder
TestODESolvers::error
TestODESolvers::error2
Expand Down
2 changes: 1 addition & 1 deletion TestODESolvers/test/test-dp87.par
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ CarpetX::out_metadata = no
CarpetX::out_norm_omit_unstable = yes
# TestODESolvers::corder requires larger tolerances (~1e-5)
CarpetX::out_norm_vars = "
Regrid::regrid_error
CarpetXRegrid::regrid_error
# TestODESolvers::corder
TestODESolvers::error
TestODESolvers::error2
Expand Down
2 changes: 1 addition & 1 deletion TestODESolvers/test/test-euler.par
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ CarpetX::out_metadata = no
CarpetX::out_norm_omit_unstable = yes
# TestODESolvers::corder requires larger tolerances (~1e-5)
CarpetX::out_norm_vars = "
Regrid::regrid_error
CarpetXRegrid::regrid_error
# TestODESolvers::corder
TestODESolvers::error
TestODESolvers::error2
Expand Down
2 changes: 1 addition & 1 deletion TestODESolvers/test/test-rk2.par
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ CarpetX::out_metadata = no
CarpetX::out_norm_omit_unstable = yes
# TestODESolvers::corder requires larger tolerances (~1e-5)
CarpetX::out_norm_vars = "
Regrid::regrid_error
CarpetXRegrid::regrid_error
# TestODESolvers::corder
TestODESolvers::error
TestODESolvers::error2
Expand Down
2 changes: 1 addition & 1 deletion TestODESolvers/test/test-rk3.par
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ CarpetX::out_metadata = no
CarpetX::out_norm_omit_unstable = yes
# TestODESolvers::corder requires larger tolerances (~1e-5)
CarpetX::out_norm_vars = "
Regrid::regrid_error
CarpetXRegrid::regrid_error
# TestODESolvers::corder
TestODESolvers::error
TestODESolvers::error2
Expand Down
2 changes: 1 addition & 1 deletion TestODESolvers/test/test-rk4.par
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ CarpetX::out_metadata = no
CarpetX::out_norm_omit_unstable = yes
# TestODESolvers::corder requires larger tolerances (~1e-5)
CarpetX::out_norm_vars = "
Regrid::regrid_error
CarpetXRegrid::regrid_error
# TestODESolvers::corder
TestODESolvers::error
TestODESolvers::error2
Expand Down
2 changes: 1 addition & 1 deletion TestODESolvers/test/test-rkf78.par
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ CarpetX::out_metadata = no
CarpetX::out_norm_omit_unstable = yes
# TestODESolvers::corder requires larger tolerances (~1e-5)
CarpetX::out_norm_vars = "
Regrid::regrid_error
CarpetXRegrid::regrid_error
# TestODESolvers::corder
TestODESolvers::error
TestODESolvers::error2
Expand Down
2 changes: 1 addition & 1 deletion TestODESolvers/test/test-ssprk3.par
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ CarpetX::out_metadata = no
CarpetX::out_norm_omit_unstable = yes
# TestODESolvers::corder requires larger tolerances (~1e-5)
CarpetX::out_norm_vars = "
Regrid::regrid_error
CarpetXRegrid::regrid_error
# TestODESolvers::corder
TestODESolvers::error
TestODESolvers::error2
Expand Down
3 changes: 3 additions & 0 deletions TestOutput/test/checkpoint-openpmd.par
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,6 @@ IO::checkpoint_dir = $parfile + "/checkpoints"
IO::checkpoint_ID = yes
IO::checkpoint_every = 1
IO::checkpoint_on_terminate = yes
Driver::periodic_x = no
Driver::periodic_y = no
Driver::periodic_z = no
3 changes: 3 additions & 0 deletions TestOutput/test/output-arrays.par
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,6 @@ CarpetX::out_tsv_vars = "
TestOutput::a2
TestOutput::a3
"
Driver::periodic_x = no
Driver::periodic_y = no
Driver::periodic_z = no
3 changes: 3 additions & 0 deletions TestOutput/test/output-openpmd.par
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,6 @@ CarpetX::out_openpmd_vars = "
TestOutput::a2
TestOutput::a3
"
Driver::periodic_x = no
Driver::periodic_y = no
Driver::periodic_z = no
Loading

0 comments on commit ede9a79

Please sign in to comment.