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