diff options
Diffstat (limited to 'Examples/EulerSR/src/eulersr_initial_shock.cc')
-rw-r--r-- | Examples/EulerSR/src/eulersr_initial_shock.cc | 22 |
1 files changed, 12 insertions, 10 deletions
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) { |