aboutsummaryrefslogtreecommitdiff
path: root/Examples/EulerSR
diff options
context:
space:
mode:
Diffstat (limited to 'Examples/EulerSR')
-rw-r--r--Examples/EulerSR/schedule.ccl295
-rw-r--r--Examples/EulerSR/src/eulersr_cons_calc_conserved.cc27
-rw-r--r--Examples/EulerSR/src/eulersr_cons_calc_flux_1.cc31
-rw-r--r--Examples/EulerSR/src/eulersr_cons_calc_flux_2.cc31
-rw-r--r--Examples/EulerSR/src/eulersr_cons_calc_flux_3.cc31
-rw-r--r--Examples/EulerSR/src/eulersr_cons_calc_intercell_conserved_1.cc31
-rw-r--r--Examples/EulerSR/src/eulersr_cons_calc_intercell_conserved_2.cc31
-rw-r--r--Examples/EulerSR/src/eulersr_cons_calc_intercell_conserved_3.cc31
-rw-r--r--Examples/EulerSR/src/eulersr_cons_calc_primitives.cc43
-rw-r--r--Examples/EulerSR/src/eulersr_cons_calc_reconstruct_1.cc26
-rw-r--r--Examples/EulerSR/src/eulersr_cons_calc_reconstruct_2.cc26
-rw-r--r--Examples/EulerSR/src/eulersr_cons_calc_reconstruct_3.cc26
-rw-r--r--Examples/EulerSR/src/eulersr_cons_calc_rhs_1.cc26
-rw-r--r--Examples/EulerSR/src/eulersr_cons_calc_rhs_2.cc26
-rw-r--r--Examples/EulerSR/src/eulersr_cons_calc_rhs_3.cc26
-rw-r--r--Examples/EulerSR/src/eulersr_cons_calc_zero_rhs.cc21
-rw-r--r--Examples/EulerSR/src/eulersr_initial_shock.cc22
-rw-r--r--Examples/EulerSR/src/make.code.defn2
18 files changed, 577 insertions, 175 deletions
diff --git a/Examples/EulerSR/schedule.ccl b/Examples/EulerSR/schedule.ccl
index d6b29e0..87edede 100644
--- a/Examples/EulerSR/schedule.ccl
+++ b/Examples/EulerSR/schedule.ccl
@@ -190,12 +190,6 @@ schedule EulerSR_Startup at STARTUP
OPTIONS: meta
} "create banner"
-schedule EulerSR_RegisterVars in MoL_Register
-{
- LANG: C
- OPTIONS: meta
-} "Register Variables for MoL"
-
schedule EulerSR_RegisterSymmetries in SymmetryRegister
{
LANG: C
@@ -208,22 +202,68 @@ if (CCTK_EQUALS(initial_data, "shock"))
schedule eulersr_initial_shock at CCTK_INITIAL as eulersr_initial
{
LANG: C
+ READS: grid::x
+ WRITES: EulerSR::epsi
+ WRITES: EulerSR::rho
+ WRITES: EulerSR::v1
+ WRITES: EulerSR::v2
+ WRITES: EulerSR::v3
} "eulersr_initial_shock"
}
schedule eulersr_cons_calc_zero_rhs in MoL_CalcRHS
{
LANG: C
+ WRITES: EulerSR::Denrhs
+ WRITES: EulerSR::S1rhs
+ WRITES: EulerSR::S2rhs
+ WRITES: EulerSR::S3rhs
+ WRITES: EulerSR::taurhs
} "eulersr_cons_calc_zero_rhs"
schedule eulersr_cons_calc_conserved at POSTINITIAL
{
LANG: C
+ READS: EulerSR::Den
+ READS: EulerSR::epsi
+ READS: EulerSR::h
+ READS: EulerSR::p
+ READS: EulerSR::rho
+ READS: EulerSR::v1
+ READS: EulerSR::v2
+ READS: EulerSR::v3
+ READS: EulerSR::W
+ WRITES: EulerSR::Den
+ WRITES: EulerSR::h
+ WRITES: EulerSR::p
+ WRITES: EulerSR::S1
+ WRITES: EulerSR::S2
+ WRITES: EulerSR::S3
+ WRITES: EulerSR::tau
+ WRITES: EulerSR::W
} "eulersr_cons_calc_conserved"
schedule eulersr_cons_calc_primitives in MoL_PostStep after EulerSR_ApplyBCs
{
LANG: C
+ READS: EulerSR::Den
+ READS: EulerSR::epsi
+ READS: EulerSR::h
+ READS: EulerSR::p
+ READS: EulerSR::rho
+ READS: EulerSR::S1
+ READS: EulerSR::S2
+ READS: EulerSR::S3
+ READS: EulerSR::tau
+ READS: EulerSR::W
+ WRITES: EulerSR::epsi
+ WRITES: EulerSR::h
+ WRITES: EulerSR::p
+ WRITES: EulerSR::rho
+ WRITES: EulerSR::v1
+ WRITES: EulerSR::v2
+ WRITES: EulerSR::v3
+ WRITES: EulerSR::W
} "eulersr_cons_calc_primitives"
schedule group eulersr_cons_calc_reconstruct_1_group in MoL_CalcRHS after eulersr_cons_calc_zero_rhs
@@ -234,6 +274,21 @@ schedule group eulersr_cons_calc_reconstruct_1_group in MoL_CalcRHS after eulers
schedule eulersr_cons_calc_reconstruct_1 in eulersr_cons_calc_reconstruct_1_group
{
LANG: C
+ READS: EulerSR::epsi
+ READS: EulerSR::rho
+ READS: EulerSR::v1
+ READS: EulerSR::v2
+ READS: EulerSR::v3
+ WRITES: EulerSR::epsiLeft
+ WRITES: EulerSR::epsiRight
+ WRITES: EulerSR::rhoLeft
+ WRITES: EulerSR::rhoRight
+ WRITES: EulerSR::v1Left
+ WRITES: EulerSR::v1Right
+ WRITES: EulerSR::v2Left
+ WRITES: EulerSR::v2Right
+ WRITES: EulerSR::v3Left
+ WRITES: EulerSR::v3Right
} "eulersr_cons_calc_reconstruct_1"
schedule eulersr_cons_calc_reconstruct_1_SelectBCs in eulersr_cons_calc_reconstruct_1_bc_group
@@ -265,6 +320,34 @@ schedule group eulersr_cons_calc_reconstruct_1_bc_group in MoL_PseudoEvolutionBo
schedule eulersr_cons_calc_intercell_conserved_1 in MoL_CalcRHS after eulersr_cons_calc_reconstruct_1
{
LANG: C
+ READS: EulerSR::DenLeft
+ READS: EulerSR::DenRight
+ READS: EulerSR::epsiLeft
+ READS: EulerSR::epsiRight
+ READS: EulerSR::h
+ READS: EulerSR::p
+ READS: EulerSR::rhoLeft
+ READS: EulerSR::rhoRight
+ READS: EulerSR::v1Left
+ READS: EulerSR::v1Right
+ READS: EulerSR::v2Left
+ READS: EulerSR::v2Right
+ READS: EulerSR::v3Left
+ READS: EulerSR::v3Right
+ READS: EulerSR::W
+ WRITES: EulerSR::DenLeft
+ WRITES: EulerSR::DenRight
+ WRITES: EulerSR::h
+ WRITES: EulerSR::p
+ WRITES: EulerSR::S1Left
+ WRITES: EulerSR::S1Right
+ WRITES: EulerSR::S2Left
+ WRITES: EulerSR::S2Right
+ WRITES: EulerSR::S3Left
+ WRITES: EulerSR::S3Right
+ WRITES: EulerSR::tauLeft
+ WRITES: EulerSR::tauRight
+ WRITES: EulerSR::W
} "eulersr_cons_calc_intercell_conserved_1"
schedule group eulersr_cons_calc_flux_1_group in MoL_CalcRHS after eulersr_cons_calc_intercell_conserved_1
@@ -275,6 +358,27 @@ schedule group eulersr_cons_calc_flux_1_group in MoL_CalcRHS after eulersr_cons_
schedule eulersr_cons_calc_flux_1 in eulersr_cons_calc_flux_1_group
{
LANG: C
+ READS: EulerSR::DenLeft
+ READS: EulerSR::DenRight
+ READS: EulerSR::epsiLeft
+ READS: EulerSR::epsiRight
+ READS: EulerSR::rhoLeft
+ READS: EulerSR::rhoRight
+ READS: EulerSR::S1Left
+ READS: EulerSR::S1Right
+ READS: EulerSR::S2Left
+ READS: EulerSR::S2Right
+ READS: EulerSR::S3Left
+ READS: EulerSR::S3Right
+ READS: EulerSR::tauLeft
+ READS: EulerSR::tauRight
+ READS: EulerSR::v1Left
+ READS: EulerSR::v1Right
+ WRITES: EulerSR::DenFlux
+ WRITES: EulerSR::S1Flux
+ WRITES: EulerSR::S2Flux
+ WRITES: EulerSR::S3Flux
+ WRITES: EulerSR::tauFlux
} "eulersr_cons_calc_flux_1"
schedule eulersr_cons_calc_flux_1_SelectBCs in eulersr_cons_calc_flux_1_bc_group
@@ -306,6 +410,21 @@ schedule group eulersr_cons_calc_flux_1_bc_group in MoL_PseudoEvolutionBoundarie
schedule eulersr_cons_calc_rhs_1 in MoL_CalcRHS after eulersr_cons_calc_flux_1
{
LANG: C
+ READS: EulerSR::DenFlux
+ READS: EulerSR::Denrhs
+ READS: EulerSR::S1Flux
+ READS: EulerSR::S1rhs
+ READS: EulerSR::S2Flux
+ READS: EulerSR::S2rhs
+ READS: EulerSR::S3Flux
+ READS: EulerSR::S3rhs
+ READS: EulerSR::tauFlux
+ READS: EulerSR::taurhs
+ WRITES: EulerSR::Denrhs
+ WRITES: EulerSR::S1rhs
+ WRITES: EulerSR::S2rhs
+ WRITES: EulerSR::S3rhs
+ WRITES: EulerSR::taurhs
} "eulersr_cons_calc_rhs_1"
schedule group eulersr_cons_calc_reconstruct_2_group in MoL_CalcRHS after eulersr_cons_calc_rhs_1
@@ -316,6 +435,21 @@ schedule group eulersr_cons_calc_reconstruct_2_group in MoL_CalcRHS after eulers
schedule eulersr_cons_calc_reconstruct_2 in eulersr_cons_calc_reconstruct_2_group
{
LANG: C
+ READS: EulerSR::epsi
+ READS: EulerSR::rho
+ READS: EulerSR::v1
+ READS: EulerSR::v2
+ READS: EulerSR::v3
+ WRITES: EulerSR::epsiLeft
+ WRITES: EulerSR::epsiRight
+ WRITES: EulerSR::rhoLeft
+ WRITES: EulerSR::rhoRight
+ WRITES: EulerSR::v1Left
+ WRITES: EulerSR::v1Right
+ WRITES: EulerSR::v2Left
+ WRITES: EulerSR::v2Right
+ WRITES: EulerSR::v3Left
+ WRITES: EulerSR::v3Right
} "eulersr_cons_calc_reconstruct_2"
schedule eulersr_cons_calc_reconstruct_2_SelectBCs in eulersr_cons_calc_reconstruct_2_bc_group
@@ -347,6 +481,34 @@ schedule group eulersr_cons_calc_reconstruct_2_bc_group in MoL_PseudoEvolutionBo
schedule eulersr_cons_calc_intercell_conserved_2 in MoL_CalcRHS after eulersr_cons_calc_reconstruct_2
{
LANG: C
+ READS: EulerSR::DenLeft
+ READS: EulerSR::DenRight
+ READS: EulerSR::epsiLeft
+ READS: EulerSR::epsiRight
+ READS: EulerSR::h
+ READS: EulerSR::p
+ READS: EulerSR::rhoLeft
+ READS: EulerSR::rhoRight
+ READS: EulerSR::v1Left
+ READS: EulerSR::v1Right
+ READS: EulerSR::v2Left
+ READS: EulerSR::v2Right
+ READS: EulerSR::v3Left
+ READS: EulerSR::v3Right
+ READS: EulerSR::W
+ WRITES: EulerSR::DenLeft
+ WRITES: EulerSR::DenRight
+ WRITES: EulerSR::h
+ WRITES: EulerSR::p
+ WRITES: EulerSR::S1Left
+ WRITES: EulerSR::S1Right
+ WRITES: EulerSR::S2Left
+ WRITES: EulerSR::S2Right
+ WRITES: EulerSR::S3Left
+ WRITES: EulerSR::S3Right
+ WRITES: EulerSR::tauLeft
+ WRITES: EulerSR::tauRight
+ WRITES: EulerSR::W
} "eulersr_cons_calc_intercell_conserved_2"
schedule group eulersr_cons_calc_flux_2_group in MoL_CalcRHS after eulersr_cons_calc_intercell_conserved_2
@@ -357,6 +519,27 @@ schedule group eulersr_cons_calc_flux_2_group in MoL_CalcRHS after eulersr_cons_
schedule eulersr_cons_calc_flux_2 in eulersr_cons_calc_flux_2_group
{
LANG: C
+ READS: EulerSR::DenLeft
+ READS: EulerSR::DenRight
+ READS: EulerSR::epsiLeft
+ READS: EulerSR::epsiRight
+ READS: EulerSR::rhoLeft
+ READS: EulerSR::rhoRight
+ READS: EulerSR::S1Left
+ READS: EulerSR::S1Right
+ READS: EulerSR::S2Left
+ READS: EulerSR::S2Right
+ READS: EulerSR::S3Left
+ READS: EulerSR::S3Right
+ READS: EulerSR::tauLeft
+ READS: EulerSR::tauRight
+ READS: EulerSR::v2Left
+ READS: EulerSR::v2Right
+ WRITES: EulerSR::DenFlux
+ WRITES: EulerSR::S1Flux
+ WRITES: EulerSR::S2Flux
+ WRITES: EulerSR::S3Flux
+ WRITES: EulerSR::tauFlux
} "eulersr_cons_calc_flux_2"
schedule eulersr_cons_calc_flux_2_SelectBCs in eulersr_cons_calc_flux_2_bc_group
@@ -388,6 +571,21 @@ schedule group eulersr_cons_calc_flux_2_bc_group in MoL_PseudoEvolutionBoundarie
schedule eulersr_cons_calc_rhs_2 in MoL_CalcRHS after eulersr_cons_calc_flux_2
{
LANG: C
+ READS: EulerSR::DenFlux
+ READS: EulerSR::Denrhs
+ READS: EulerSR::S1Flux
+ READS: EulerSR::S1rhs
+ READS: EulerSR::S2Flux
+ READS: EulerSR::S2rhs
+ READS: EulerSR::S3Flux
+ READS: EulerSR::S3rhs
+ READS: EulerSR::tauFlux
+ READS: EulerSR::taurhs
+ WRITES: EulerSR::Denrhs
+ WRITES: EulerSR::S1rhs
+ WRITES: EulerSR::S2rhs
+ WRITES: EulerSR::S3rhs
+ WRITES: EulerSR::taurhs
} "eulersr_cons_calc_rhs_2"
schedule group eulersr_cons_calc_reconstruct_3_group in MoL_CalcRHS after eulersr_cons_calc_rhs_2
@@ -398,6 +596,21 @@ schedule group eulersr_cons_calc_reconstruct_3_group in MoL_CalcRHS after eulers
schedule eulersr_cons_calc_reconstruct_3 in eulersr_cons_calc_reconstruct_3_group
{
LANG: C
+ READS: EulerSR::epsi
+ READS: EulerSR::rho
+ READS: EulerSR::v1
+ READS: EulerSR::v2
+ READS: EulerSR::v3
+ WRITES: EulerSR::epsiLeft
+ WRITES: EulerSR::epsiRight
+ WRITES: EulerSR::rhoLeft
+ WRITES: EulerSR::rhoRight
+ WRITES: EulerSR::v1Left
+ WRITES: EulerSR::v1Right
+ WRITES: EulerSR::v2Left
+ WRITES: EulerSR::v2Right
+ WRITES: EulerSR::v3Left
+ WRITES: EulerSR::v3Right
} "eulersr_cons_calc_reconstruct_3"
schedule eulersr_cons_calc_reconstruct_3_SelectBCs in eulersr_cons_calc_reconstruct_3_bc_group
@@ -429,6 +642,34 @@ schedule group eulersr_cons_calc_reconstruct_3_bc_group in MoL_PseudoEvolutionBo
schedule eulersr_cons_calc_intercell_conserved_3 in MoL_CalcRHS after eulersr_cons_calc_reconstruct_3
{
LANG: C
+ READS: EulerSR::DenLeft
+ READS: EulerSR::DenRight
+ READS: EulerSR::epsiLeft
+ READS: EulerSR::epsiRight
+ READS: EulerSR::h
+ READS: EulerSR::p
+ READS: EulerSR::rhoLeft
+ READS: EulerSR::rhoRight
+ READS: EulerSR::v1Left
+ READS: EulerSR::v1Right
+ READS: EulerSR::v2Left
+ READS: EulerSR::v2Right
+ READS: EulerSR::v3Left
+ READS: EulerSR::v3Right
+ READS: EulerSR::W
+ WRITES: EulerSR::DenLeft
+ WRITES: EulerSR::DenRight
+ WRITES: EulerSR::h
+ WRITES: EulerSR::p
+ WRITES: EulerSR::S1Left
+ WRITES: EulerSR::S1Right
+ WRITES: EulerSR::S2Left
+ WRITES: EulerSR::S2Right
+ WRITES: EulerSR::S3Left
+ WRITES: EulerSR::S3Right
+ WRITES: EulerSR::tauLeft
+ WRITES: EulerSR::tauRight
+ WRITES: EulerSR::W
} "eulersr_cons_calc_intercell_conserved_3"
schedule group eulersr_cons_calc_flux_3_group in MoL_CalcRHS after eulersr_cons_calc_intercell_conserved_3
@@ -439,6 +680,27 @@ schedule group eulersr_cons_calc_flux_3_group in MoL_CalcRHS after eulersr_cons_
schedule eulersr_cons_calc_flux_3 in eulersr_cons_calc_flux_3_group
{
LANG: C
+ READS: EulerSR::DenLeft
+ READS: EulerSR::DenRight
+ READS: EulerSR::epsiLeft
+ READS: EulerSR::epsiRight
+ READS: EulerSR::rhoLeft
+ READS: EulerSR::rhoRight
+ READS: EulerSR::S1Left
+ READS: EulerSR::S1Right
+ READS: EulerSR::S2Left
+ READS: EulerSR::S2Right
+ READS: EulerSR::S3Left
+ READS: EulerSR::S3Right
+ READS: EulerSR::tauLeft
+ READS: EulerSR::tauRight
+ READS: EulerSR::v3Left
+ READS: EulerSR::v3Right
+ WRITES: EulerSR::DenFlux
+ WRITES: EulerSR::S1Flux
+ WRITES: EulerSR::S2Flux
+ WRITES: EulerSR::S3Flux
+ WRITES: EulerSR::tauFlux
} "eulersr_cons_calc_flux_3"
schedule eulersr_cons_calc_flux_3_SelectBCs in eulersr_cons_calc_flux_3_bc_group
@@ -470,6 +732,21 @@ schedule group eulersr_cons_calc_flux_3_bc_group in MoL_PseudoEvolutionBoundarie
schedule eulersr_cons_calc_rhs_3 in MoL_CalcRHS after eulersr_cons_calc_flux_3
{
LANG: C
+ READS: EulerSR::DenFlux
+ READS: EulerSR::Denrhs
+ READS: EulerSR::S1Flux
+ READS: EulerSR::S1rhs
+ READS: EulerSR::S2Flux
+ READS: EulerSR::S2rhs
+ READS: EulerSR::S3Flux
+ READS: EulerSR::S3rhs
+ READS: EulerSR::tauFlux
+ READS: EulerSR::taurhs
+ WRITES: EulerSR::Denrhs
+ WRITES: EulerSR::S1rhs
+ WRITES: EulerSR::S2rhs
+ WRITES: EulerSR::S3rhs
+ WRITES: EulerSR::taurhs
} "eulersr_cons_calc_rhs_3"
schedule EulerSR_SelectBoundConds in MoL_PostStep
@@ -487,6 +764,12 @@ schedule EulerSR_CheckBoundaries at BASEGRID
OPTIONS: meta
} "check boundaries treatment"
+schedule EulerSR_RegisterVars in MoL_Register
+{
+ LANG: C
+ OPTIONS: meta
+} "Register Variables for MoL"
+
schedule group ApplyBCs as EulerSR_ApplyBCs in MoL_PostStep after EulerSR_SelectBoundConds
{
# no language specified
diff --git a/Examples/EulerSR/src/eulersr_cons_calc_conserved.cc b/Examples/EulerSR/src/eulersr_cons_calc_conserved.cc
index 673ff99..ba11a6e 100644
--- a/Examples/EulerSR/src/eulersr_cons_calc_conserved.cc
+++ b/Examples/EulerSR/src/eulersr_cons_calc_conserved.cc
@@ -17,10 +17,10 @@
/* Define macros used in calculations */
#define INITVALUE (42)
-#define QAD(x) (SQR(SQR(x)))
-#define INV(x) ((1.0) / (x))
+#define INV(x) ((CCTK_REAL)1.0 / (x))
#define SQR(x) ((x) * (x))
-#define CUB(x) ((x) * (x) * (x))
+#define CUB(x) ((x) * SQR(x))
+#define QAD(x) (SQR(SQR(x)))
static void eulersr_cons_calc_conserved_Body(cGH const * restrict const cctkGH, int const dir, int const face, CCTK_REAL const normal[3], CCTK_REAL const tangentA[3], CCTK_REAL const tangentB[3], int const imin[3], int const imax[3], int const n_subblock_gfs, CCTK_REAL * restrict const subblock_gfs[])
{
@@ -28,8 +28,6 @@ static void eulersr_cons_calc_conserved_Body(cGH const * restrict const cctkGH,
DECLARE_CCTK_PARAMETERS;
- /* Declare finite differencing variables */
-
/* Include user-supplied include files */
/* Initialise finite differencing variables */
@@ -72,9 +70,9 @@ static void eulersr_cons_calc_conserved_Body(cGH const * restrict const cctkGH,
/* Loop over the grid points */
#pragma omp parallel
- CCTK_LOOP3 (eulersr_cons_calc_conserved,
+ CCTK_LOOP3(eulersr_cons_calc_conserved,
i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],
- cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
+ cctk_ash[0],cctk_ash[1],cctk_ash[2])
{
ptrdiff_t const index = di*i + dj*j + dk*k;
@@ -124,7 +122,7 @@ static void eulersr_cons_calc_conserved_Body(cGH const * restrict const cctkGH,
tau[index] = tauL;
W[index] = WL;
}
- CCTK_ENDLOOP3 (eulersr_cons_calc_conserved);
+ CCTK_ENDLOOP3(eulersr_cons_calc_conserved);
}
extern "C" void eulersr_cons_calc_conserved(CCTK_ARGUMENTS)
@@ -143,11 +141,20 @@ extern "C" void eulersr_cons_calc_conserved(CCTK_ARGUMENTS)
return;
}
- const char *groups[] = {"EulerSR::Den_group","EulerSR::epsi_group","EulerSR::h_group","EulerSR::p_group","EulerSR::rho_group","EulerSR::S_group","EulerSR::tau_group","EulerSR::v_group","EulerSR::W_group"};
+ const char *const groups[] = {
+ "EulerSR::Den_group",
+ "EulerSR::epsi_group",
+ "EulerSR::h_group",
+ "EulerSR::p_group",
+ "EulerSR::rho_group",
+ "EulerSR::S_group",
+ "EulerSR::tau_group",
+ "EulerSR::v_group",
+ "EulerSR::W_group"};
GenericFD_AssertGroupStorage(cctkGH, "eulersr_cons_calc_conserved", 9, groups);
- GenericFD_LoopOverEverything(cctkGH, &eulersr_cons_calc_conserved_Body);
+ GenericFD_LoopOverEverything(cctkGH, eulersr_cons_calc_conserved_Body);
if (verbose > 1)
{
diff --git a/Examples/EulerSR/src/eulersr_cons_calc_flux_1.cc b/Examples/EulerSR/src/eulersr_cons_calc_flux_1.cc
index 843de50..a618b63 100644
--- a/Examples/EulerSR/src/eulersr_cons_calc_flux_1.cc
+++ b/Examples/EulerSR/src/eulersr_cons_calc_flux_1.cc
@@ -17,10 +17,10 @@
/* Define macros used in calculations */
#define INITVALUE (42)
-#define QAD(x) (SQR(SQR(x)))
-#define INV(x) ((1.0) / (x))
+#define INV(x) ((CCTK_REAL)1.0 / (x))
#define SQR(x) ((x) * (x))
-#define CUB(x) ((x) * (x) * (x))
+#define CUB(x) ((x) * SQR(x))
+#define QAD(x) (SQR(SQR(x)))
extern "C" void eulersr_cons_calc_flux_1_SelectBCs(CCTK_ARGUMENTS)
{
@@ -52,8 +52,6 @@ static void eulersr_cons_calc_flux_1_Body(cGH const * restrict const cctkGH, int
DECLARE_CCTK_PARAMETERS;
- /* Declare finite differencing variables */
-
/* Include user-supplied include files */
/* Initialise finite differencing variables */
@@ -96,9 +94,9 @@ static void eulersr_cons_calc_flux_1_Body(cGH const * restrict const cctkGH, int
/* Loop over the grid points */
#pragma omp parallel
- CCTK_LOOP3 (eulersr_cons_calc_flux_1,
+ CCTK_LOOP3(eulersr_cons_calc_flux_1,
i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],
- cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
+ cctk_ash[0],cctk_ash[1],cctk_ash[2])
{
ptrdiff_t const index = di*i + dj*j + dk*k;
@@ -181,7 +179,7 @@ static void eulersr_cons_calc_flux_1_Body(cGH const * restrict const cctkGH, int
S3Flux[index] = S3FluxL;
tauFlux[index] = tauFluxL;
}
- CCTK_ENDLOOP3 (eulersr_cons_calc_flux_1);
+ CCTK_ENDLOOP3(eulersr_cons_calc_flux_1);
}
extern "C" void eulersr_cons_calc_flux_1(CCTK_ARGUMENTS)
@@ -200,12 +198,25 @@ extern "C" void eulersr_cons_calc_flux_1(CCTK_ARGUMENTS)
return;
}
- const char *groups[] = {"EulerSR::Den_flux_group","EulerSR::Den_lr_group","EulerSR::epsi_lr_group","EulerSR::rho_lr_group","EulerSR::S1_flux_group","EulerSR::S1_lr_group","EulerSR::S2_flux_group","EulerSR::S2_lr_group","EulerSR::S3_flux_group","EulerSR::S3_lr_group","EulerSR::tau_flux_group","EulerSR::tau_lr_group","EulerSR::v1_lr_group"};
+ const char *const groups[] = {
+ "EulerSR::Den_flux_group",
+ "EulerSR::Den_lr_group",
+ "EulerSR::epsi_lr_group",
+ "EulerSR::rho_lr_group",
+ "EulerSR::S1_flux_group",
+ "EulerSR::S1_lr_group",
+ "EulerSR::S2_flux_group",
+ "EulerSR::S2_lr_group",
+ "EulerSR::S3_flux_group",
+ "EulerSR::S3_lr_group",
+ "EulerSR::tau_flux_group",
+ "EulerSR::tau_lr_group",
+ "EulerSR::v1_lr_group"};
GenericFD_AssertGroupStorage(cctkGH, "eulersr_cons_calc_flux_1", 13, groups);
GenericFD_EnsureStencilFits(cctkGH, "eulersr_cons_calc_flux_1", 1, 1, 1);
- GenericFD_LoopOverInterior(cctkGH, &eulersr_cons_calc_flux_1_Body);
+ GenericFD_LoopOverInterior(cctkGH, eulersr_cons_calc_flux_1_Body);
if (verbose > 1)
{
diff --git a/Examples/EulerSR/src/eulersr_cons_calc_flux_2.cc b/Examples/EulerSR/src/eulersr_cons_calc_flux_2.cc
index fb8553c..9c264a5 100644
--- a/Examples/EulerSR/src/eulersr_cons_calc_flux_2.cc
+++ b/Examples/EulerSR/src/eulersr_cons_calc_flux_2.cc
@@ -17,10 +17,10 @@
/* Define macros used in calculations */
#define INITVALUE (42)
-#define QAD(x) (SQR(SQR(x)))
-#define INV(x) ((1.0) / (x))
+#define INV(x) ((CCTK_REAL)1.0 / (x))
#define SQR(x) ((x) * (x))
-#define CUB(x) ((x) * (x) * (x))
+#define CUB(x) ((x) * SQR(x))
+#define QAD(x) (SQR(SQR(x)))
extern "C" void eulersr_cons_calc_flux_2_SelectBCs(CCTK_ARGUMENTS)
{
@@ -52,8 +52,6 @@ static void eulersr_cons_calc_flux_2_Body(cGH const * restrict const cctkGH, int
DECLARE_CCTK_PARAMETERS;
- /* Declare finite differencing variables */
-
/* Include user-supplied include files */
/* Initialise finite differencing variables */
@@ -96,9 +94,9 @@ static void eulersr_cons_calc_flux_2_Body(cGH const * restrict const cctkGH, int
/* Loop over the grid points */
#pragma omp parallel
- CCTK_LOOP3 (eulersr_cons_calc_flux_2,
+ CCTK_LOOP3(eulersr_cons_calc_flux_2,
i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],
- cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
+ cctk_ash[0],cctk_ash[1],cctk_ash[2])
{
ptrdiff_t const index = di*i + dj*j + dk*k;
@@ -181,7 +179,7 @@ static void eulersr_cons_calc_flux_2_Body(cGH const * restrict const cctkGH, int
S3Flux[index] = S3FluxL;
tauFlux[index] = tauFluxL;
}
- CCTK_ENDLOOP3 (eulersr_cons_calc_flux_2);
+ CCTK_ENDLOOP3(eulersr_cons_calc_flux_2);
}
extern "C" void eulersr_cons_calc_flux_2(CCTK_ARGUMENTS)
@@ -200,12 +198,25 @@ extern "C" void eulersr_cons_calc_flux_2(CCTK_ARGUMENTS)
return;
}
- const char *groups[] = {"EulerSR::Den_flux_group","EulerSR::Den_lr_group","EulerSR::epsi_lr_group","EulerSR::rho_lr_group","EulerSR::S1_flux_group","EulerSR::S1_lr_group","EulerSR::S2_flux_group","EulerSR::S2_lr_group","EulerSR::S3_flux_group","EulerSR::S3_lr_group","EulerSR::tau_flux_group","EulerSR::tau_lr_group","EulerSR::v2_lr_group"};
+ const char *const groups[] = {
+ "EulerSR::Den_flux_group",
+ "EulerSR::Den_lr_group",
+ "EulerSR::epsi_lr_group",
+ "EulerSR::rho_lr_group",
+ "EulerSR::S1_flux_group",
+ "EulerSR::S1_lr_group",
+ "EulerSR::S2_flux_group",
+ "EulerSR::S2_lr_group",
+ "EulerSR::S3_flux_group",
+ "EulerSR::S3_lr_group",
+ "EulerSR::tau_flux_group",
+ "EulerSR::tau_lr_group",
+ "EulerSR::v2_lr_group"};
GenericFD_AssertGroupStorage(cctkGH, "eulersr_cons_calc_flux_2", 13, groups);
GenericFD_EnsureStencilFits(cctkGH, "eulersr_cons_calc_flux_2", 1, 1, 1);
- GenericFD_LoopOverInterior(cctkGH, &eulersr_cons_calc_flux_2_Body);
+ GenericFD_LoopOverInterior(cctkGH, eulersr_cons_calc_flux_2_Body);
if (verbose > 1)
{
diff --git a/Examples/EulerSR/src/eulersr_cons_calc_flux_3.cc b/Examples/EulerSR/src/eulersr_cons_calc_flux_3.cc
index 90fc2b7..ede78c8 100644
--- a/Examples/EulerSR/src/eulersr_cons_calc_flux_3.cc
+++ b/Examples/EulerSR/src/eulersr_cons_calc_flux_3.cc
@@ -17,10 +17,10 @@
/* Define macros used in calculations */
#define INITVALUE (42)
-#define QAD(x) (SQR(SQR(x)))
-#define INV(x) ((1.0) / (x))
+#define INV(x) ((CCTK_REAL)1.0 / (x))
#define SQR(x) ((x) * (x))
-#define CUB(x) ((x) * (x) * (x))
+#define CUB(x) ((x) * SQR(x))
+#define QAD(x) (SQR(SQR(x)))
extern "C" void eulersr_cons_calc_flux_3_SelectBCs(CCTK_ARGUMENTS)
{
@@ -52,8 +52,6 @@ static void eulersr_cons_calc_flux_3_Body(cGH const * restrict const cctkGH, int
DECLARE_CCTK_PARAMETERS;
- /* Declare finite differencing variables */
-
/* Include user-supplied include files */
/* Initialise finite differencing variables */
@@ -96,9 +94,9 @@ static void eulersr_cons_calc_flux_3_Body(cGH const * restrict const cctkGH, int
/* Loop over the grid points */
#pragma omp parallel
- CCTK_LOOP3 (eulersr_cons_calc_flux_3,
+ CCTK_LOOP3(eulersr_cons_calc_flux_3,
i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],
- cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
+ cctk_ash[0],cctk_ash[1],cctk_ash[2])
{
ptrdiff_t const index = di*i + dj*j + dk*k;
@@ -181,7 +179,7 @@ static void eulersr_cons_calc_flux_3_Body(cGH const * restrict const cctkGH, int
S3Flux[index] = S3FluxL;
tauFlux[index] = tauFluxL;
}
- CCTK_ENDLOOP3 (eulersr_cons_calc_flux_3);
+ CCTK_ENDLOOP3(eulersr_cons_calc_flux_3);
}
extern "C" void eulersr_cons_calc_flux_3(CCTK_ARGUMENTS)
@@ -200,12 +198,25 @@ extern "C" void eulersr_cons_calc_flux_3(CCTK_ARGUMENTS)
return;
}
- const char *groups[] = {"EulerSR::Den_flux_group","EulerSR::Den_lr_group","EulerSR::epsi_lr_group","EulerSR::rho_lr_group","EulerSR::S1_flux_group","EulerSR::S1_lr_group","EulerSR::S2_flux_group","EulerSR::S2_lr_group","EulerSR::S3_flux_group","EulerSR::S3_lr_group","EulerSR::tau_flux_group","EulerSR::tau_lr_group","EulerSR::v3_lr_group"};
+ const char *const groups[] = {
+ "EulerSR::Den_flux_group",
+ "EulerSR::Den_lr_group",
+ "EulerSR::epsi_lr_group",
+ "EulerSR::rho_lr_group",
+ "EulerSR::S1_flux_group",
+ "EulerSR::S1_lr_group",
+ "EulerSR::S2_flux_group",
+ "EulerSR::S2_lr_group",
+ "EulerSR::S3_flux_group",
+ "EulerSR::S3_lr_group",
+ "EulerSR::tau_flux_group",
+ "EulerSR::tau_lr_group",
+ "EulerSR::v3_lr_group"};
GenericFD_AssertGroupStorage(cctkGH, "eulersr_cons_calc_flux_3", 13, groups);
GenericFD_EnsureStencilFits(cctkGH, "eulersr_cons_calc_flux_3", 1, 1, 1);
- GenericFD_LoopOverInterior(cctkGH, &eulersr_cons_calc_flux_3_Body);
+ GenericFD_LoopOverInterior(cctkGH, eulersr_cons_calc_flux_3_Body);
if (verbose > 1)
{
diff --git a/Examples/EulerSR/src/eulersr_cons_calc_intercell_conserved_1.cc b/Examples/EulerSR/src/eulersr_cons_calc_intercell_conserved_1.cc
index df163c1..773d8f5 100644
--- a/Examples/EulerSR/src/eulersr_cons_calc_intercell_conserved_1.cc
+++ b/Examples/EulerSR/src/eulersr_cons_calc_intercell_conserved_1.cc
@@ -17,10 +17,10 @@
/* Define macros used in calculations */
#define INITVALUE (42)
-#define QAD(x) (SQR(SQR(x)))
-#define INV(x) ((1.0) / (x))
+#define INV(x) ((CCTK_REAL)1.0 / (x))
#define SQR(x) ((x) * (x))
-#define CUB(x) ((x) * (x) * (x))
+#define CUB(x) ((x) * SQR(x))
+#define QAD(x) (SQR(SQR(x)))
static void eulersr_cons_calc_intercell_conserved_1_Body(cGH const * restrict const cctkGH, int const dir, int const face, CCTK_REAL const normal[3], CCTK_REAL const tangentA[3], CCTK_REAL const tangentB[3], int const imin[3], int const imax[3], int const n_subblock_gfs, CCTK_REAL * restrict const subblock_gfs[])
{
@@ -28,8 +28,6 @@ static void eulersr_cons_calc_intercell_conserved_1_Body(cGH const * restrict co
DECLARE_CCTK_PARAMETERS;
- /* Declare finite differencing variables */
-
/* Include user-supplied include files */
/* Initialise finite differencing variables */
@@ -72,9 +70,9 @@ static void eulersr_cons_calc_intercell_conserved_1_Body(cGH const * restrict co
/* Loop over the grid points */
#pragma omp parallel
- CCTK_LOOP3 (eulersr_cons_calc_intercell_conserved_1,
+ CCTK_LOOP3(eulersr_cons_calc_intercell_conserved_1,
i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],
- cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
+ cctk_ash[0],cctk_ash[1],cctk_ash[2])
{
ptrdiff_t const index = di*i + dj*j + dk*k;
@@ -154,7 +152,7 @@ static void eulersr_cons_calc_intercell_conserved_1_Body(cGH const * restrict co
tauRight[index] = tauRightL;
W[index] = WL;
}
- CCTK_ENDLOOP3 (eulersr_cons_calc_intercell_conserved_1);
+ CCTK_ENDLOOP3(eulersr_cons_calc_intercell_conserved_1);
}
extern "C" void eulersr_cons_calc_intercell_conserved_1(CCTK_ARGUMENTS)
@@ -173,11 +171,24 @@ extern "C" void eulersr_cons_calc_intercell_conserved_1(CCTK_ARGUMENTS)
return;
}
- const char *groups[] = {"EulerSR::Den_lr_group","EulerSR::epsi_lr_group","EulerSR::h_group","EulerSR::p_group","EulerSR::rho_lr_group","EulerSR::S1_lr_group","EulerSR::S2_lr_group","EulerSR::S3_lr_group","EulerSR::tau_lr_group","EulerSR::v1_lr_group","EulerSR::v2_lr_group","EulerSR::v3_lr_group","EulerSR::W_group"};
+ const char *const groups[] = {
+ "EulerSR::Den_lr_group",
+ "EulerSR::epsi_lr_group",
+ "EulerSR::h_group",
+ "EulerSR::p_group",
+ "EulerSR::rho_lr_group",
+ "EulerSR::S1_lr_group",
+ "EulerSR::S2_lr_group",
+ "EulerSR::S3_lr_group",
+ "EulerSR::tau_lr_group",
+ "EulerSR::v1_lr_group",
+ "EulerSR::v2_lr_group",
+ "EulerSR::v3_lr_group",
+ "EulerSR::W_group"};
GenericFD_AssertGroupStorage(cctkGH, "eulersr_cons_calc_intercell_conserved_1", 13, groups);
- GenericFD_LoopOverEverything(cctkGH, &eulersr_cons_calc_intercell_conserved_1_Body);
+ GenericFD_LoopOverEverything(cctkGH, eulersr_cons_calc_intercell_conserved_1_Body);
if (verbose > 1)
{
diff --git a/Examples/EulerSR/src/eulersr_cons_calc_intercell_conserved_2.cc b/Examples/EulerSR/src/eulersr_cons_calc_intercell_conserved_2.cc
index 83616ac..a40fee7 100644
--- a/Examples/EulerSR/src/eulersr_cons_calc_intercell_conserved_2.cc
+++ b/Examples/EulerSR/src/eulersr_cons_calc_intercell_conserved_2.cc
@@ -17,10 +17,10 @@
/* Define macros used in calculations */
#define INITVALUE (42)
-#define QAD(x) (SQR(SQR(x)))
-#define INV(x) ((1.0) / (x))
+#define INV(x) ((CCTK_REAL)1.0 / (x))
#define SQR(x) ((x) * (x))
-#define CUB(x) ((x) * (x) * (x))
+#define CUB(x) ((x) * SQR(x))
+#define QAD(x) (SQR(SQR(x)))
static void eulersr_cons_calc_intercell_conserved_2_Body(cGH const * restrict const cctkGH, int const dir, int const face, CCTK_REAL const normal[3], CCTK_REAL const tangentA[3], CCTK_REAL const tangentB[3], int const imin[3], int const imax[3], int const n_subblock_gfs, CCTK_REAL * restrict const subblock_gfs[])
{
@@ -28,8 +28,6 @@ static void eulersr_cons_calc_intercell_conserved_2_Body(cGH const * restrict co
DECLARE_CCTK_PARAMETERS;
- /* Declare finite differencing variables */
-
/* Include user-supplied include files */
/* Initialise finite differencing variables */
@@ -72,9 +70,9 @@ static void eulersr_cons_calc_intercell_conserved_2_Body(cGH const * restrict co
/* Loop over the grid points */
#pragma omp parallel
- CCTK_LOOP3 (eulersr_cons_calc_intercell_conserved_2,
+ CCTK_LOOP3(eulersr_cons_calc_intercell_conserved_2,
i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],
- cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
+ cctk_ash[0],cctk_ash[1],cctk_ash[2])
{
ptrdiff_t const index = di*i + dj*j + dk*k;
@@ -154,7 +152,7 @@ static void eulersr_cons_calc_intercell_conserved_2_Body(cGH const * restrict co
tauRight[index] = tauRightL;
W[index] = WL;
}
- CCTK_ENDLOOP3 (eulersr_cons_calc_intercell_conserved_2);
+ CCTK_ENDLOOP3(eulersr_cons_calc_intercell_conserved_2);
}
extern "C" void eulersr_cons_calc_intercell_conserved_2(CCTK_ARGUMENTS)
@@ -173,11 +171,24 @@ extern "C" void eulersr_cons_calc_intercell_conserved_2(CCTK_ARGUMENTS)
return;
}
- const char *groups[] = {"EulerSR::Den_lr_group","EulerSR::epsi_lr_group","EulerSR::h_group","EulerSR::p_group","EulerSR::rho_lr_group","EulerSR::S1_lr_group","EulerSR::S2_lr_group","EulerSR::S3_lr_group","EulerSR::tau_lr_group","EulerSR::v1_lr_group","EulerSR::v2_lr_group","EulerSR::v3_lr_group","EulerSR::W_group"};
+ const char *const groups[] = {
+ "EulerSR::Den_lr_group",
+ "EulerSR::epsi_lr_group",
+ "EulerSR::h_group",
+ "EulerSR::p_group",
+ "EulerSR::rho_lr_group",
+ "EulerSR::S1_lr_group",
+ "EulerSR::S2_lr_group",
+ "EulerSR::S3_lr_group",
+ "EulerSR::tau_lr_group",
+ "EulerSR::v1_lr_group",
+ "EulerSR::v2_lr_group",
+ "EulerSR::v3_lr_group",
+ "EulerSR::W_group"};
GenericFD_AssertGroupStorage(cctkGH, "eulersr_cons_calc_intercell_conserved_2", 13, groups);
- GenericFD_LoopOverEverything(cctkGH, &eulersr_cons_calc_intercell_conserved_2_Body);
+ GenericFD_LoopOverEverything(cctkGH, eulersr_cons_calc_intercell_conserved_2_Body);
if (verbose > 1)
{
diff --git a/Examples/EulerSR/src/eulersr_cons_calc_intercell_conserved_3.cc b/Examples/EulerSR/src/eulersr_cons_calc_intercell_conserved_3.cc
index 4cc9ef2..1ac3fae 100644
--- a/Examples/EulerSR/src/eulersr_cons_calc_intercell_conserved_3.cc
+++ b/Examples/EulerSR/src/eulersr_cons_calc_intercell_conserved_3.cc
@@ -17,10 +17,10 @@
/* Define macros used in calculations */
#define INITVALUE (42)
-#define QAD(x) (SQR(SQR(x)))
-#define INV(x) ((1.0) / (x))
+#define INV(x) ((CCTK_REAL)1.0 / (x))
#define SQR(x) ((x) * (x))
-#define CUB(x) ((x) * (x) * (x))
+#define CUB(x) ((x) * SQR(x))
+#define QAD(x) (SQR(SQR(x)))
static void eulersr_cons_calc_intercell_conserved_3_Body(cGH const * restrict const cctkGH, int const dir, int const face, CCTK_REAL const normal[3], CCTK_REAL const tangentA[3], CCTK_REAL const tangentB[3], int const imin[3], int const imax[3], int const n_subblock_gfs, CCTK_REAL * restrict const subblock_gfs[])
{
@@ -28,8 +28,6 @@ static void eulersr_cons_calc_intercell_conserved_3_Body(cGH const * restrict co
DECLARE_CCTK_PARAMETERS;
- /* Declare finite differencing variables */
-
/* Include user-supplied include files */
/* Initialise finite differencing variables */
@@ -72,9 +70,9 @@ static void eulersr_cons_calc_intercell_conserved_3_Body(cGH const * restrict co
/* Loop over the grid points */
#pragma omp parallel
- CCTK_LOOP3 (eulersr_cons_calc_intercell_conserved_3,
+ CCTK_LOOP3(eulersr_cons_calc_intercell_conserved_3,
i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],
- cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
+ cctk_ash[0],cctk_ash[1],cctk_ash[2])
{
ptrdiff_t const index = di*i + dj*j + dk*k;
@@ -154,7 +152,7 @@ static void eulersr_cons_calc_intercell_conserved_3_Body(cGH const * restrict co
tauRight[index] = tauRightL;
W[index] = WL;
}
- CCTK_ENDLOOP3 (eulersr_cons_calc_intercell_conserved_3);
+ CCTK_ENDLOOP3(eulersr_cons_calc_intercell_conserved_3);
}
extern "C" void eulersr_cons_calc_intercell_conserved_3(CCTK_ARGUMENTS)
@@ -173,11 +171,24 @@ extern "C" void eulersr_cons_calc_intercell_conserved_3(CCTK_ARGUMENTS)
return;
}
- const char *groups[] = {"EulerSR::Den_lr_group","EulerSR::epsi_lr_group","EulerSR::h_group","EulerSR::p_group","EulerSR::rho_lr_group","EulerSR::S1_lr_group","EulerSR::S2_lr_group","EulerSR::S3_lr_group","EulerSR::tau_lr_group","EulerSR::v1_lr_group","EulerSR::v2_lr_group","EulerSR::v3_lr_group","EulerSR::W_group"};
+ const char *const groups[] = {
+ "EulerSR::Den_lr_group",
+ "EulerSR::epsi_lr_group",
+ "EulerSR::h_group",
+ "EulerSR::p_group",
+ "EulerSR::rho_lr_group",
+ "EulerSR::S1_lr_group",
+ "EulerSR::S2_lr_group",
+ "EulerSR::S3_lr_group",
+ "EulerSR::tau_lr_group",
+ "EulerSR::v1_lr_group",
+ "EulerSR::v2_lr_group",
+ "EulerSR::v3_lr_group",
+ "EulerSR::W_group"};
GenericFD_AssertGroupStorage(cctkGH, "eulersr_cons_calc_intercell_conserved_3", 13, groups);
- GenericFD_LoopOverEverything(cctkGH, &eulersr_cons_calc_intercell_conserved_3_Body);
+ GenericFD_LoopOverEverything(cctkGH, eulersr_cons_calc_intercell_conserved_3_Body);
if (verbose > 1)
{
diff --git a/Examples/EulerSR/src/eulersr_cons_calc_primitives.cc b/Examples/EulerSR/src/eulersr_cons_calc_primitives.cc
index b43f41a..8f58a2a 100644
--- a/Examples/EulerSR/src/eulersr_cons_calc_primitives.cc
+++ b/Examples/EulerSR/src/eulersr_cons_calc_primitives.cc
@@ -17,10 +17,10 @@
/* Define macros used in calculations */
#define INITVALUE (42)
-#define QAD(x) (SQR(SQR(x)))
-#define INV(x) ((1.0) / (x))
+#define INV(x) ((CCTK_REAL)1.0 / (x))
#define SQR(x) ((x) * (x))
-#define CUB(x) ((x) * (x) * (x))
+#define CUB(x) ((x) * SQR(x))
+#define QAD(x) (SQR(SQR(x)))
static void eulersr_cons_calc_primitives_Body(cGH const * restrict const cctkGH, int const dir, int const face, CCTK_REAL const normal[3], CCTK_REAL const tangentA[3], CCTK_REAL const tangentB[3], int const imin[3], int const imax[3], int const n_subblock_gfs, CCTK_REAL * restrict const subblock_gfs[])
{
@@ -28,8 +28,6 @@ static void eulersr_cons_calc_primitives_Body(cGH const * restrict const cctkGH,
DECLARE_CCTK_PARAMETERS;
- /* Declare finite differencing variables */
-
/* Include user-supplied include files */
/* Initialise finite differencing variables */
@@ -72,9 +70,9 @@ static void eulersr_cons_calc_primitives_Body(cGH const * restrict const cctkGH,
/* Loop over the grid points */
#pragma omp parallel
- CCTK_LOOP3 (eulersr_cons_calc_primitives,
+ CCTK_LOOP3(eulersr_cons_calc_primitives,
i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],
- cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
+ cctk_ash[0],cctk_ash[1],cctk_ash[2])
{
ptrdiff_t const index = di*i + dj*j + dk*k;
@@ -111,7 +109,7 @@ static void eulersr_cons_calc_primitives_Body(cGH const * restrict const cctkGH,
rhoL = DenL*INV(WL);
- hL = Z*INV(rhoL)*INV(SQR(WL));
+ hL = Z*INV(rhoL*SQR(WL));
epsiL = hL - (rhoL + pBar)*INV(rhoL);
@@ -136,7 +134,7 @@ static void eulersr_cons_calc_primitives_Body(cGH const * restrict const cctkGH,
rhoL = DenL*INV(WL);
- hL = Z*INV(rhoL)*INV(SQR(WL));
+ hL = Z*INV(rhoL*SQR(WL));
epsiL = hL - (rhoL + pBar)*INV(rhoL);
@@ -160,7 +158,7 @@ static void eulersr_cons_calc_primitives_Body(cGH const * restrict const cctkGH,
rhoL = DenL*INV(WL);
- hL = Z*INV(rhoL)*INV(SQR(WL));
+ hL = Z*INV(rhoL*SQR(WL));
epsiL = hL - (rhoL + pBar)*INV(rhoL);
@@ -184,7 +182,7 @@ static void eulersr_cons_calc_primitives_Body(cGH const * restrict const cctkGH,
rhoL = DenL*INV(WL);
- hL = Z*INV(rhoL)*INV(SQR(WL));
+ hL = Z*INV(rhoL*SQR(WL));
epsiL = hL - (rhoL + pBar)*INV(rhoL);
@@ -208,7 +206,7 @@ static void eulersr_cons_calc_primitives_Body(cGH const * restrict const cctkGH,
rhoL = DenL*INV(WL);
- hL = Z*INV(rhoL)*INV(SQR(WL));
+ hL = Z*INV(rhoL*SQR(WL));
epsiL = hL - (rhoL + pBar)*INV(rhoL);
@@ -224,11 +222,11 @@ static void eulersr_cons_calc_primitives_Body(cGH const * restrict const cctkGH,
pL = pBar;
- CCTK_REAL v1L = S1L*INV(hL)*INV(rhoL)*INV(SQR(WL));
+ CCTK_REAL v1L = S1L*INV(hL*rhoL*SQR(WL));
- CCTK_REAL v2L = S2L*INV(hL)*INV(rhoL)*INV(SQR(WL));
+ CCTK_REAL v2L = S2L*INV(hL*rhoL*SQR(WL));
- CCTK_REAL v3L = S3L*INV(hL)*INV(rhoL)*INV(SQR(WL));
+ CCTK_REAL v3L = S3L*INV(hL*rhoL*SQR(WL));
/* Copy local copies back to grid functions */
epsi[index] = epsiL;
@@ -240,7 +238,7 @@ static void eulersr_cons_calc_primitives_Body(cGH const * restrict const cctkGH,
v3[index] = v3L;
W[index] = WL;
}
- CCTK_ENDLOOP3 (eulersr_cons_calc_primitives);
+ CCTK_ENDLOOP3(eulersr_cons_calc_primitives);
}
extern "C" void eulersr_cons_calc_primitives(CCTK_ARGUMENTS)
@@ -259,11 +257,20 @@ extern "C" void eulersr_cons_calc_primitives(CCTK_ARGUMENTS)
return;
}
- const char *groups[] = {"EulerSR::Den_group","EulerSR::epsi_group","EulerSR::h_group","EulerSR::p_group","EulerSR::rho_group","EulerSR::S_group","EulerSR::tau_group","EulerSR::v_group","EulerSR::W_group"};
+ const char *const groups[] = {
+ "EulerSR::Den_group",
+ "EulerSR::epsi_group",
+ "EulerSR::h_group",
+ "EulerSR::p_group",
+ "EulerSR::rho_group",
+ "EulerSR::S_group",
+ "EulerSR::tau_group",
+ "EulerSR::v_group",
+ "EulerSR::W_group"};
GenericFD_AssertGroupStorage(cctkGH, "eulersr_cons_calc_primitives", 9, groups);
- GenericFD_LoopOverEverything(cctkGH, &eulersr_cons_calc_primitives_Body);
+ GenericFD_LoopOverEverything(cctkGH, eulersr_cons_calc_primitives_Body);
if (verbose > 1)
{
diff --git a/Examples/EulerSR/src/eulersr_cons_calc_reconstruct_1.cc b/Examples/EulerSR/src/eulersr_cons_calc_reconstruct_1.cc
index 347fb53..98c55bb 100644
--- a/Examples/EulerSR/src/eulersr_cons_calc_reconstruct_1.cc
+++ b/Examples/EulerSR/src/eulersr_cons_calc_reconstruct_1.cc
@@ -17,10 +17,10 @@
/* Define macros used in calculations */
#define INITVALUE (42)
-#define QAD(x) (SQR(SQR(x)))
-#define INV(x) ((1.0) / (x))
+#define INV(x) ((CCTK_REAL)1.0 / (x))
#define SQR(x) ((x) * (x))
-#define CUB(x) ((x) * (x) * (x))
+#define CUB(x) ((x) * SQR(x))
+#define QAD(x) (SQR(SQR(x)))
extern "C" void eulersr_cons_calc_reconstruct_1_SelectBCs(CCTK_ARGUMENTS)
{
@@ -52,8 +52,6 @@ static void eulersr_cons_calc_reconstruct_1_Body(cGH const * restrict const cctk
DECLARE_CCTK_PARAMETERS;
- /* Declare finite differencing variables */
-
/* Include user-supplied include files */
/* Initialise finite differencing variables */
@@ -96,9 +94,9 @@ static void eulersr_cons_calc_reconstruct_1_Body(cGH const * restrict const cctk
/* Loop over the grid points */
#pragma omp parallel
- CCTK_LOOP3 (eulersr_cons_calc_reconstruct_1,
+ CCTK_LOOP3(eulersr_cons_calc_reconstruct_1,
i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],
- cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
+ cctk_ash[0],cctk_ash[1],cctk_ash[2])
{
ptrdiff_t const index = di*i + dj*j + dk*k;
@@ -188,7 +186,7 @@ static void eulersr_cons_calc_reconstruct_1_Body(cGH const * restrict const cctk
v3Left[index] = v3LeftL;
v3Right[index] = v3RightL;
}
- CCTK_ENDLOOP3 (eulersr_cons_calc_reconstruct_1);
+ CCTK_ENDLOOP3(eulersr_cons_calc_reconstruct_1);
}
extern "C" void eulersr_cons_calc_reconstruct_1(CCTK_ARGUMENTS)
@@ -207,12 +205,20 @@ extern "C" void eulersr_cons_calc_reconstruct_1(CCTK_ARGUMENTS)
return;
}
- const char *groups[] = {"EulerSR::epsi_group","EulerSR::epsi_lr_group","EulerSR::rho_group","EulerSR::rho_lr_group","EulerSR::v1_lr_group","EulerSR::v2_lr_group","EulerSR::v3_lr_group","EulerSR::v_group"};
+ const char *const groups[] = {
+ "EulerSR::epsi_group",
+ "EulerSR::epsi_lr_group",
+ "EulerSR::rho_group",
+ "EulerSR::rho_lr_group",
+ "EulerSR::v1_lr_group",
+ "EulerSR::v2_lr_group",
+ "EulerSR::v3_lr_group",
+ "EulerSR::v_group"};
GenericFD_AssertGroupStorage(cctkGH, "eulersr_cons_calc_reconstruct_1", 8, groups);
GenericFD_EnsureStencilFits(cctkGH, "eulersr_cons_calc_reconstruct_1", 1, 1, 1);
- GenericFD_LoopOverInterior(cctkGH, &eulersr_cons_calc_reconstruct_1_Body);
+ GenericFD_LoopOverInterior(cctkGH, eulersr_cons_calc_reconstruct_1_Body);
if (verbose > 1)
{
diff --git a/Examples/EulerSR/src/eulersr_cons_calc_reconstruct_2.cc b/Examples/EulerSR/src/eulersr_cons_calc_reconstruct_2.cc
index 420741b..a0b8409 100644
--- a/Examples/EulerSR/src/eulersr_cons_calc_reconstruct_2.cc
+++ b/Examples/EulerSR/src/eulersr_cons_calc_reconstruct_2.cc
@@ -17,10 +17,10 @@
/* Define macros used in calculations */
#define INITVALUE (42)
-#define QAD(x) (SQR(SQR(x)))
-#define INV(x) ((1.0) / (x))
+#define INV(x) ((CCTK_REAL)1.0 / (x))
#define SQR(x) ((x) * (x))
-#define CUB(x) ((x) * (x) * (x))
+#define CUB(x) ((x) * SQR(x))
+#define QAD(x) (SQR(SQR(x)))
extern "C" void eulersr_cons_calc_reconstruct_2_SelectBCs(CCTK_ARGUMENTS)
{
@@ -52,8 +52,6 @@ static void eulersr_cons_calc_reconstruct_2_Body(cGH const * restrict const cctk
DECLARE_CCTK_PARAMETERS;
- /* Declare finite differencing variables */
-
/* Include user-supplied include files */
/* Initialise finite differencing variables */
@@ -96,9 +94,9 @@ static void eulersr_cons_calc_reconstruct_2_Body(cGH const * restrict const cctk
/* Loop over the grid points */
#pragma omp parallel
- CCTK_LOOP3 (eulersr_cons_calc_reconstruct_2,
+ CCTK_LOOP3(eulersr_cons_calc_reconstruct_2,
i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],
- cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
+ cctk_ash[0],cctk_ash[1],cctk_ash[2])
{
ptrdiff_t const index = di*i + dj*j + dk*k;
@@ -188,7 +186,7 @@ static void eulersr_cons_calc_reconstruct_2_Body(cGH const * restrict const cctk
v3Left[index] = v3LeftL;
v3Right[index] = v3RightL;
}
- CCTK_ENDLOOP3 (eulersr_cons_calc_reconstruct_2);
+ CCTK_ENDLOOP3(eulersr_cons_calc_reconstruct_2);
}
extern "C" void eulersr_cons_calc_reconstruct_2(CCTK_ARGUMENTS)
@@ -207,12 +205,20 @@ extern "C" void eulersr_cons_calc_reconstruct_2(CCTK_ARGUMENTS)
return;
}
- const char *groups[] = {"EulerSR::epsi_group","EulerSR::epsi_lr_group","EulerSR::rho_group","EulerSR::rho_lr_group","EulerSR::v1_lr_group","EulerSR::v2_lr_group","EulerSR::v3_lr_group","EulerSR::v_group"};
+ const char *const groups[] = {
+ "EulerSR::epsi_group",
+ "EulerSR::epsi_lr_group",
+ "EulerSR::rho_group",
+ "EulerSR::rho_lr_group",
+ "EulerSR::v1_lr_group",
+ "EulerSR::v2_lr_group",
+ "EulerSR::v3_lr_group",
+ "EulerSR::v_group"};
GenericFD_AssertGroupStorage(cctkGH, "eulersr_cons_calc_reconstruct_2", 8, groups);
GenericFD_EnsureStencilFits(cctkGH, "eulersr_cons_calc_reconstruct_2", 1, 1, 1);
- GenericFD_LoopOverInterior(cctkGH, &eulersr_cons_calc_reconstruct_2_Body);
+ GenericFD_LoopOverInterior(cctkGH, eulersr_cons_calc_reconstruct_2_Body);
if (verbose > 1)
{
diff --git a/Examples/EulerSR/src/eulersr_cons_calc_reconstruct_3.cc b/Examples/EulerSR/src/eulersr_cons_calc_reconstruct_3.cc
index d0d6b42..6536df9 100644
--- a/Examples/EulerSR/src/eulersr_cons_calc_reconstruct_3.cc
+++ b/Examples/EulerSR/src/eulersr_cons_calc_reconstruct_3.cc
@@ -17,10 +17,10 @@
/* Define macros used in calculations */
#define INITVALUE (42)
-#define QAD(x) (SQR(SQR(x)))
-#define INV(x) ((1.0) / (x))
+#define INV(x) ((CCTK_REAL)1.0 / (x))
#define SQR(x) ((x) * (x))
-#define CUB(x) ((x) * (x) * (x))
+#define CUB(x) ((x) * SQR(x))
+#define QAD(x) (SQR(SQR(x)))
extern "C" void eulersr_cons_calc_reconstruct_3_SelectBCs(CCTK_ARGUMENTS)
{
@@ -52,8 +52,6 @@ static void eulersr_cons_calc_reconstruct_3_Body(cGH const * restrict const cctk
DECLARE_CCTK_PARAMETERS;
- /* Declare finite differencing variables */
-
/* Include user-supplied include files */
/* Initialise finite differencing variables */
@@ -96,9 +94,9 @@ static void eulersr_cons_calc_reconstruct_3_Body(cGH const * restrict const cctk
/* Loop over the grid points */
#pragma omp parallel
- CCTK_LOOP3 (eulersr_cons_calc_reconstruct_3,
+ CCTK_LOOP3(eulersr_cons_calc_reconstruct_3,
i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],
- cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
+ cctk_ash[0],cctk_ash[1],cctk_ash[2])
{
ptrdiff_t const index = di*i + dj*j + dk*k;
@@ -188,7 +186,7 @@ static void eulersr_cons_calc_reconstruct_3_Body(cGH const * restrict const cctk
v3Left[index] = v3LeftL;
v3Right[index] = v3RightL;
}
- CCTK_ENDLOOP3 (eulersr_cons_calc_reconstruct_3);
+ CCTK_ENDLOOP3(eulersr_cons_calc_reconstruct_3);
}
extern "C" void eulersr_cons_calc_reconstruct_3(CCTK_ARGUMENTS)
@@ -207,12 +205,20 @@ extern "C" void eulersr_cons_calc_reconstruct_3(CCTK_ARGUMENTS)
return;
}
- const char *groups[] = {"EulerSR::epsi_group","EulerSR::epsi_lr_group","EulerSR::rho_group","EulerSR::rho_lr_group","EulerSR::v1_lr_group","EulerSR::v2_lr_group","EulerSR::v3_lr_group","EulerSR::v_group"};
+ const char *const groups[] = {
+ "EulerSR::epsi_group",
+ "EulerSR::epsi_lr_group",
+ "EulerSR::rho_group",
+ "EulerSR::rho_lr_group",
+ "EulerSR::v1_lr_group",
+ "EulerSR::v2_lr_group",
+ "EulerSR::v3_lr_group",
+ "EulerSR::v_group"};
GenericFD_AssertGroupStorage(cctkGH, "eulersr_cons_calc_reconstruct_3", 8, groups);
GenericFD_EnsureStencilFits(cctkGH, "eulersr_cons_calc_reconstruct_3", 1, 1, 1);
- GenericFD_LoopOverInterior(cctkGH, &eulersr_cons_calc_reconstruct_3_Body);
+ GenericFD_LoopOverInterior(cctkGH, eulersr_cons_calc_reconstruct_3_Body);
if (verbose > 1)
{
diff --git a/Examples/EulerSR/src/eulersr_cons_calc_rhs_1.cc b/Examples/EulerSR/src/eulersr_cons_calc_rhs_1.cc
index f5ca0d1..cfcf0cb 100644
--- a/Examples/EulerSR/src/eulersr_cons_calc_rhs_1.cc
+++ b/Examples/EulerSR/src/eulersr_cons_calc_rhs_1.cc
@@ -17,10 +17,10 @@
/* Define macros used in calculations */
#define INITVALUE (42)
-#define QAD(x) (SQR(SQR(x)))
-#define INV(x) ((1.0) / (x))
+#define INV(x) ((CCTK_REAL)1.0 / (x))
#define SQR(x) ((x) * (x))
-#define CUB(x) ((x) * (x) * (x))
+#define CUB(x) ((x) * SQR(x))
+#define QAD(x) (SQR(SQR(x)))
extern "C" void eulersr_cons_calc_rhs_1_SelectBCs(CCTK_ARGUMENTS)
{
@@ -46,8 +46,6 @@ static void eulersr_cons_calc_rhs_1_Body(cGH const * restrict const cctkGH, int
DECLARE_CCTK_PARAMETERS;
- /* Declare finite differencing variables */
-
/* Include user-supplied include files */
/* Initialise finite differencing variables */
@@ -90,9 +88,9 @@ static void eulersr_cons_calc_rhs_1_Body(cGH const * restrict const cctkGH, int
/* Loop over the grid points */
#pragma omp parallel
- CCTK_LOOP3 (eulersr_cons_calc_rhs_1,
+ CCTK_LOOP3(eulersr_cons_calc_rhs_1,
i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],
- cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
+ cctk_ash[0],cctk_ash[1],cctk_ash[2])
{
ptrdiff_t const index = di*i + dj*j + dk*k;
@@ -137,7 +135,7 @@ static void eulersr_cons_calc_rhs_1_Body(cGH const * restrict const cctkGH, int
S3rhs[index] = S3rhsL;
taurhs[index] = taurhsL;
}
- CCTK_ENDLOOP3 (eulersr_cons_calc_rhs_1);
+ CCTK_ENDLOOP3(eulersr_cons_calc_rhs_1);
}
extern "C" void eulersr_cons_calc_rhs_1(CCTK_ARGUMENTS)
@@ -156,12 +154,20 @@ extern "C" void eulersr_cons_calc_rhs_1(CCTK_ARGUMENTS)
return;
}
- const char *groups[] = {"EulerSR::Den_flux_group","EulerSR::Den_grouprhs","EulerSR::S1_flux_group","EulerSR::S2_flux_group","EulerSR::S3_flux_group","EulerSR::S_grouprhs","EulerSR::tau_flux_group","EulerSR::tau_grouprhs"};
+ const char *const groups[] = {
+ "EulerSR::Den_flux_group",
+ "EulerSR::Den_grouprhs",
+ "EulerSR::S1_flux_group",
+ "EulerSR::S2_flux_group",
+ "EulerSR::S3_flux_group",
+ "EulerSR::S_grouprhs",
+ "EulerSR::tau_flux_group",
+ "EulerSR::tau_grouprhs"};
GenericFD_AssertGroupStorage(cctkGH, "eulersr_cons_calc_rhs_1", 8, groups);
GenericFD_EnsureStencilFits(cctkGH, "eulersr_cons_calc_rhs_1", 1, 1, 1);
- GenericFD_LoopOverInterior(cctkGH, &eulersr_cons_calc_rhs_1_Body);
+ GenericFD_LoopOverInterior(cctkGH, eulersr_cons_calc_rhs_1_Body);
if (verbose > 1)
{
diff --git a/Examples/EulerSR/src/eulersr_cons_calc_rhs_2.cc b/Examples/EulerSR/src/eulersr_cons_calc_rhs_2.cc
index 33d6d0e..e5ca803 100644
--- a/Examples/EulerSR/src/eulersr_cons_calc_rhs_2.cc
+++ b/Examples/EulerSR/src/eulersr_cons_calc_rhs_2.cc
@@ -17,10 +17,10 @@
/* Define macros used in calculations */
#define INITVALUE (42)
-#define QAD(x) (SQR(SQR(x)))
-#define INV(x) ((1.0) / (x))
+#define INV(x) ((CCTK_REAL)1.0 / (x))
#define SQR(x) ((x) * (x))
-#define CUB(x) ((x) * (x) * (x))
+#define CUB(x) ((x) * SQR(x))
+#define QAD(x) (SQR(SQR(x)))
extern "C" void eulersr_cons_calc_rhs_2_SelectBCs(CCTK_ARGUMENTS)
{
@@ -46,8 +46,6 @@ static void eulersr_cons_calc_rhs_2_Body(cGH const * restrict const cctkGH, int
DECLARE_CCTK_PARAMETERS;
- /* Declare finite differencing variables */
-
/* Include user-supplied include files */
/* Initialise finite differencing variables */
@@ -90,9 +88,9 @@ static void eulersr_cons_calc_rhs_2_Body(cGH const * restrict const cctkGH, int
/* Loop over the grid points */
#pragma omp parallel
- CCTK_LOOP3 (eulersr_cons_calc_rhs_2,
+ CCTK_LOOP3(eulersr_cons_calc_rhs_2,
i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],
- cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
+ cctk_ash[0],cctk_ash[1],cctk_ash[2])
{
ptrdiff_t const index = di*i + dj*j + dk*k;
@@ -137,7 +135,7 @@ static void eulersr_cons_calc_rhs_2_Body(cGH const * restrict const cctkGH, int
S3rhs[index] = S3rhsL;
taurhs[index] = taurhsL;
}
- CCTK_ENDLOOP3 (eulersr_cons_calc_rhs_2);
+ CCTK_ENDLOOP3(eulersr_cons_calc_rhs_2);
}
extern "C" void eulersr_cons_calc_rhs_2(CCTK_ARGUMENTS)
@@ -156,12 +154,20 @@ extern "C" void eulersr_cons_calc_rhs_2(CCTK_ARGUMENTS)
return;
}
- const char *groups[] = {"EulerSR::Den_flux_group","EulerSR::Den_grouprhs","EulerSR::S1_flux_group","EulerSR::S2_flux_group","EulerSR::S3_flux_group","EulerSR::S_grouprhs","EulerSR::tau_flux_group","EulerSR::tau_grouprhs"};
+ const char *const groups[] = {
+ "EulerSR::Den_flux_group",
+ "EulerSR::Den_grouprhs",
+ "EulerSR::S1_flux_group",
+ "EulerSR::S2_flux_group",
+ "EulerSR::S3_flux_group",
+ "EulerSR::S_grouprhs",
+ "EulerSR::tau_flux_group",
+ "EulerSR::tau_grouprhs"};
GenericFD_AssertGroupStorage(cctkGH, "eulersr_cons_calc_rhs_2", 8, groups);
GenericFD_EnsureStencilFits(cctkGH, "eulersr_cons_calc_rhs_2", 1, 1, 1);
- GenericFD_LoopOverInterior(cctkGH, &eulersr_cons_calc_rhs_2_Body);
+ GenericFD_LoopOverInterior(cctkGH, eulersr_cons_calc_rhs_2_Body);
if (verbose > 1)
{
diff --git a/Examples/EulerSR/src/eulersr_cons_calc_rhs_3.cc b/Examples/EulerSR/src/eulersr_cons_calc_rhs_3.cc
index 6a288fe..b494cdc 100644
--- a/Examples/EulerSR/src/eulersr_cons_calc_rhs_3.cc
+++ b/Examples/EulerSR/src/eulersr_cons_calc_rhs_3.cc
@@ -17,10 +17,10 @@
/* Define macros used in calculations */
#define INITVALUE (42)
-#define QAD(x) (SQR(SQR(x)))
-#define INV(x) ((1.0) / (x))
+#define INV(x) ((CCTK_REAL)1.0 / (x))
#define SQR(x) ((x) * (x))
-#define CUB(x) ((x) * (x) * (x))
+#define CUB(x) ((x) * SQR(x))
+#define QAD(x) (SQR(SQR(x)))
extern "C" void eulersr_cons_calc_rhs_3_SelectBCs(CCTK_ARGUMENTS)
{
@@ -46,8 +46,6 @@ static void eulersr_cons_calc_rhs_3_Body(cGH const * restrict const cctkGH, int
DECLARE_CCTK_PARAMETERS;
- /* Declare finite differencing variables */
-
/* Include user-supplied include files */
/* Initialise finite differencing variables */
@@ -90,9 +88,9 @@ static void eulersr_cons_calc_rhs_3_Body(cGH const * restrict const cctkGH, int
/* Loop over the grid points */
#pragma omp parallel
- CCTK_LOOP3 (eulersr_cons_calc_rhs_3,
+ CCTK_LOOP3(eulersr_cons_calc_rhs_3,
i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],
- cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
+ cctk_ash[0],cctk_ash[1],cctk_ash[2])
{
ptrdiff_t const index = di*i + dj*j + dk*k;
@@ -137,7 +135,7 @@ static void eulersr_cons_calc_rhs_3_Body(cGH const * restrict const cctkGH, int
S3rhs[index] = S3rhsL;
taurhs[index] = taurhsL;
}
- CCTK_ENDLOOP3 (eulersr_cons_calc_rhs_3);
+ CCTK_ENDLOOP3(eulersr_cons_calc_rhs_3);
}
extern "C" void eulersr_cons_calc_rhs_3(CCTK_ARGUMENTS)
@@ -156,12 +154,20 @@ extern "C" void eulersr_cons_calc_rhs_3(CCTK_ARGUMENTS)
return;
}
- const char *groups[] = {"EulerSR::Den_flux_group","EulerSR::Den_grouprhs","EulerSR::S1_flux_group","EulerSR::S2_flux_group","EulerSR::S3_flux_group","EulerSR::S_grouprhs","EulerSR::tau_flux_group","EulerSR::tau_grouprhs"};
+ const char *const groups[] = {
+ "EulerSR::Den_flux_group",
+ "EulerSR::Den_grouprhs",
+ "EulerSR::S1_flux_group",
+ "EulerSR::S2_flux_group",
+ "EulerSR::S3_flux_group",
+ "EulerSR::S_grouprhs",
+ "EulerSR::tau_flux_group",
+ "EulerSR::tau_grouprhs"};
GenericFD_AssertGroupStorage(cctkGH, "eulersr_cons_calc_rhs_3", 8, groups);
GenericFD_EnsureStencilFits(cctkGH, "eulersr_cons_calc_rhs_3", 1, 1, 1);
- GenericFD_LoopOverInterior(cctkGH, &eulersr_cons_calc_rhs_3_Body);
+ GenericFD_LoopOverInterior(cctkGH, eulersr_cons_calc_rhs_3_Body);
if (verbose > 1)
{
diff --git a/Examples/EulerSR/src/eulersr_cons_calc_zero_rhs.cc b/Examples/EulerSR/src/eulersr_cons_calc_zero_rhs.cc
index 6a93d61..382e07c 100644
--- a/Examples/EulerSR/src/eulersr_cons_calc_zero_rhs.cc
+++ b/Examples/EulerSR/src/eulersr_cons_calc_zero_rhs.cc
@@ -17,10 +17,10 @@
/* Define macros used in calculations */
#define INITVALUE (42)
-#define QAD(x) (SQR(SQR(x)))
-#define INV(x) ((1.0) / (x))
+#define INV(x) ((CCTK_REAL)1.0 / (x))
#define SQR(x) ((x) * (x))
-#define CUB(x) ((x) * (x) * (x))
+#define CUB(x) ((x) * SQR(x))
+#define QAD(x) (SQR(SQR(x)))
static void eulersr_cons_calc_zero_rhs_Body(cGH const * restrict const cctkGH, int const dir, int const face, CCTK_REAL const normal[3], CCTK_REAL const tangentA[3], CCTK_REAL const tangentB[3], int const imin[3], int const imax[3], int const n_subblock_gfs, CCTK_REAL * restrict const subblock_gfs[])
{
@@ -28,8 +28,6 @@ static void eulersr_cons_calc_zero_rhs_Body(cGH const * restrict const cctkGH, i
DECLARE_CCTK_PARAMETERS;
- /* Declare finite differencing variables */
-
/* Include user-supplied include files */
/* Initialise finite differencing variables */
@@ -72,9 +70,9 @@ static void eulersr_cons_calc_zero_rhs_Body(cGH const * restrict const cctkGH, i
/* Loop over the grid points */
#pragma omp parallel
- CCTK_LOOP3 (eulersr_cons_calc_zero_rhs,
+ CCTK_LOOP3(eulersr_cons_calc_zero_rhs,
i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],
- cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
+ cctk_ash[0],cctk_ash[1],cctk_ash[2])
{
ptrdiff_t const index = di*i + dj*j + dk*k;
@@ -124,7 +122,7 @@ static void eulersr_cons_calc_zero_rhs_Body(cGH const * restrict const cctkGH, i
S3rhs[index] = S3rhsL;
taurhs[index] = taurhsL;
}
- CCTK_ENDLOOP3 (eulersr_cons_calc_zero_rhs);
+ CCTK_ENDLOOP3(eulersr_cons_calc_zero_rhs);
}
extern "C" void eulersr_cons_calc_zero_rhs(CCTK_ARGUMENTS)
@@ -143,11 +141,14 @@ extern "C" void eulersr_cons_calc_zero_rhs(CCTK_ARGUMENTS)
return;
}
- const char *groups[] = {"EulerSR::Den_grouprhs","EulerSR::S_grouprhs","EulerSR::tau_grouprhs"};
+ const char *const groups[] = {
+ "EulerSR::Den_grouprhs",
+ "EulerSR::S_grouprhs",
+ "EulerSR::tau_grouprhs"};
GenericFD_AssertGroupStorage(cctkGH, "eulersr_cons_calc_zero_rhs", 3, groups);
- GenericFD_LoopOverEverything(cctkGH, &eulersr_cons_calc_zero_rhs_Body);
+ GenericFD_LoopOverEverything(cctkGH, eulersr_cons_calc_zero_rhs_Body);
if (verbose > 1)
{
diff --git a/Examples/EulerSR/src/eulersr_initial_shock.cc b/Examples/EulerSR/src/eulersr_initial_shock.cc
index 73eb475..80a8705 100644
--- a/Examples/EulerSR/src/eulersr_initial_shock.cc
+++ b/Examples/EulerSR/src/eulersr_initial_shock.cc
@@ -17,10 +17,10 @@
/* Define macros used in calculations */
#define INITVALUE (42)
-#define QAD(x) (SQR(SQR(x)))
-#define INV(x) ((1.0) / (x))
+#define INV(x) ((CCTK_REAL)1.0 / (x))
#define SQR(x) ((x) * (x))
-#define CUB(x) ((x) * (x) * (x))
+#define CUB(x) ((x) * SQR(x))
+#define QAD(x) (SQR(SQR(x)))
static void eulersr_initial_shock_Body(cGH const * restrict const cctkGH, int const dir, int const face, CCTK_REAL const normal[3], CCTK_REAL const tangentA[3], CCTK_REAL const tangentB[3], int const imin[3], int const imax[3], int const n_subblock_gfs, CCTK_REAL * restrict const subblock_gfs[])
{
@@ -28,8 +28,6 @@ static void eulersr_initial_shock_Body(cGH const * restrict const cctkGH, int co
DECLARE_CCTK_PARAMETERS;
- /* Declare finite differencing variables */
-
/* Include user-supplied include files */
/* Initialise finite differencing variables */
@@ -72,9 +70,9 @@ static void eulersr_initial_shock_Body(cGH const * restrict const cctkGH, int co
/* Loop over the grid points */
#pragma omp parallel
- CCTK_LOOP3 (eulersr_initial_shock,
+ CCTK_LOOP3(eulersr_initial_shock,
i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],
- cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
+ cctk_ash[0],cctk_ash[1],cctk_ash[2])
{
ptrdiff_t const index = di*i + dj*j + dk*k;
@@ -112,7 +110,7 @@ static void eulersr_initial_shock_Body(cGH const * restrict const cctkGH, int co
v2[index] = v2L;
v3[index] = v3L;
}
- CCTK_ENDLOOP3 (eulersr_initial_shock);
+ CCTK_ENDLOOP3(eulersr_initial_shock);
}
extern "C" void eulersr_initial_shock(CCTK_ARGUMENTS)
@@ -131,11 +129,15 @@ extern "C" void eulersr_initial_shock(CCTK_ARGUMENTS)
return;
}
- const char *groups[] = {"EulerSR::epsi_group","grid::coordinates","EulerSR::rho_group","EulerSR::v_group"};
+ const char *const groups[] = {
+ "EulerSR::epsi_group",
+ "grid::coordinates",
+ "EulerSR::rho_group",
+ "EulerSR::v_group"};
GenericFD_AssertGroupStorage(cctkGH, "eulersr_initial_shock", 4, groups);
- GenericFD_LoopOverEverything(cctkGH, &eulersr_initial_shock_Body);
+ GenericFD_LoopOverEverything(cctkGH, eulersr_initial_shock_Body);
if (verbose > 1)
{
diff --git a/Examples/EulerSR/src/make.code.defn b/Examples/EulerSR/src/make.code.defn
index ec747ad..9641a96 100644
--- a/Examples/EulerSR/src/make.code.defn
+++ b/Examples/EulerSR/src/make.code.defn
@@ -1,3 +1,3 @@
# File produced by Kranc
-SRCS = Startup.cc RegisterMoL.cc RegisterSymmetries.cc eulersr_initial_shock.cc eulersr_cons_calc_zero_rhs.cc eulersr_cons_calc_conserved.cc eulersr_cons_calc_primitives.cc eulersr_cons_calc_reconstruct_1.cc eulersr_cons_calc_intercell_conserved_1.cc eulersr_cons_calc_flux_1.cc eulersr_cons_calc_rhs_1.cc eulersr_cons_calc_reconstruct_2.cc eulersr_cons_calc_intercell_conserved_2.cc eulersr_cons_calc_flux_2.cc eulersr_cons_calc_rhs_2.cc eulersr_cons_calc_reconstruct_3.cc eulersr_cons_calc_intercell_conserved_3.cc eulersr_cons_calc_flux_3.cc eulersr_cons_calc_rhs_3.cc Boundaries.cc
+SRCS = Startup.cc RegisterSymmetries.cc RegisterMoL.cc eulersr_initial_shock.cc eulersr_cons_calc_zero_rhs.cc eulersr_cons_calc_conserved.cc eulersr_cons_calc_primitives.cc eulersr_cons_calc_reconstruct_1.cc eulersr_cons_calc_intercell_conserved_1.cc eulersr_cons_calc_flux_1.cc eulersr_cons_calc_rhs_1.cc eulersr_cons_calc_reconstruct_2.cc eulersr_cons_calc_intercell_conserved_2.cc eulersr_cons_calc_flux_2.cc eulersr_cons_calc_rhs_2.cc eulersr_cons_calc_reconstruct_3.cc eulersr_cons_calc_intercell_conserved_3.cc eulersr_cons_calc_flux_3.cc eulersr_cons_calc_rhs_3.cc Boundaries.cc