diff options
Diffstat (limited to 'Examples/EulerAuto/src/eulerauto_cons_calc_primitives.cc')
| -rw-r--r-- | Examples/EulerAuto/src/eulerauto_cons_calc_primitives.cc | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/Examples/EulerAuto/src/eulerauto_cons_calc_primitives.cc b/Examples/EulerAuto/src/eulerauto_cons_calc_primitives.cc index 1b16069..b2cafeb 100644 --- a/Examples/EulerAuto/src/eulerauto_cons_calc_primitives.cc +++ b/Examples/EulerAuto/src/eulerauto_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 eulerauto_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 eulerauto_cons_calc_primitives_Body(cGH const * restrict const cctkG DECLARE_CCTK_PARAMETERS; - /* Declare finite differencing variables */ - /* Include user-supplied include files */ /* Initialise finite differencing variables */ @@ -72,9 +70,9 @@ static void eulerauto_cons_calc_primitives_Body(cGH const * restrict const cctkG /* Loop over the grid points */ #pragma omp parallel - CCTK_LOOP3 (eulerauto_cons_calc_primitives, + CCTK_LOOP3(eulerauto_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; @@ -110,7 +108,7 @@ static void eulerauto_cons_calc_primitives_Body(cGH const * restrict const cctkG v2[index] = v2L; v3[index] = v3L; } - CCTK_ENDLOOP3 (eulerauto_cons_calc_primitives); + CCTK_ENDLOOP3(eulerauto_cons_calc_primitives); } extern "C" void eulerauto_cons_calc_primitives(CCTK_ARGUMENTS) @@ -129,11 +127,17 @@ extern "C" void eulerauto_cons_calc_primitives(CCTK_ARGUMENTS) return; } - const char *groups[] = {"EulerAuto::Den_group","EulerAuto::En_group","EulerAuto::p_group","EulerAuto::rho_group","EulerAuto::S_group","EulerAuto::v_group"}; + const char *const groups[] = { + "EulerAuto::Den_group", + "EulerAuto::En_group", + "EulerAuto::p_group", + "EulerAuto::rho_group", + "EulerAuto::S_group", + "EulerAuto::v_group"}; GenericFD_AssertGroupStorage(cctkGH, "eulerauto_cons_calc_primitives", 6, groups); - GenericFD_LoopOverEverything(cctkGH, &eulerauto_cons_calc_primitives_Body); + GenericFD_LoopOverEverything(cctkGH, eulerauto_cons_calc_primitives_Body); if (verbose > 1) { |