diff options
Diffstat (limited to 'Examples/EulerAuto/src/eulerauto_cons_calc_reconstruct_1.cc')
| -rw-r--r-- | Examples/EulerAuto/src/eulerauto_cons_calc_reconstruct_1.cc | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/Examples/EulerAuto/src/eulerauto_cons_calc_reconstruct_1.cc b/Examples/EulerAuto/src/eulerauto_cons_calc_reconstruct_1.cc index be96c9f..f0dbe5f 100644 --- a/Examples/EulerAuto/src/eulerauto_cons_calc_reconstruct_1.cc +++ b/Examples/EulerAuto/src/eulerauto_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 eulerauto_cons_calc_reconstruct_1_SelectBCs(CCTK_ARGUMENTS) { @@ -52,8 +52,6 @@ static void eulerauto_cons_calc_reconstruct_1_Body(cGH const * restrict const cc DECLARE_CCTK_PARAMETERS; - /* Declare finite differencing variables */ - /* Include user-supplied include files */ /* Initialise finite differencing variables */ @@ -96,9 +94,9 @@ static void eulerauto_cons_calc_reconstruct_1_Body(cGH const * restrict const cc /* Loop over the grid points */ #pragma omp parallel - CCTK_LOOP3 (eulerauto_cons_calc_reconstruct_1, + CCTK_LOOP3(eulerauto_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 eulerauto_cons_calc_reconstruct_1_Body(cGH const * restrict const cc v3Left[index] = v3LeftL; v3Right[index] = v3RightL; } - CCTK_ENDLOOP3 (eulerauto_cons_calc_reconstruct_1); + CCTK_ENDLOOP3(eulerauto_cons_calc_reconstruct_1); } extern "C" void eulerauto_cons_calc_reconstruct_1(CCTK_ARGUMENTS) @@ -207,12 +205,20 @@ extern "C" void eulerauto_cons_calc_reconstruct_1(CCTK_ARGUMENTS) return; } - const char *groups[] = {"EulerAuto::p_group","EulerAuto::p_lr_group","EulerAuto::rho_group","EulerAuto::rho_lr_group","EulerAuto::v1_lr_group","EulerAuto::v2_lr_group","EulerAuto::v3_lr_group","EulerAuto::v_group"}; + const char *const groups[] = { + "EulerAuto::p_group", + "EulerAuto::p_lr_group", + "EulerAuto::rho_group", + "EulerAuto::rho_lr_group", + "EulerAuto::v1_lr_group", + "EulerAuto::v2_lr_group", + "EulerAuto::v3_lr_group", + "EulerAuto::v_group"}; GenericFD_AssertGroupStorage(cctkGH, "eulerauto_cons_calc_reconstruct_1", 8, groups); GenericFD_EnsureStencilFits(cctkGH, "eulerauto_cons_calc_reconstruct_1", 1, 1, 1); - GenericFD_LoopOverInterior(cctkGH, &eulerauto_cons_calc_reconstruct_1_Body); + GenericFD_LoopOverInterior(cctkGH, eulerauto_cons_calc_reconstruct_1_Body); if (verbose > 1) { |