diff options
Diffstat (limited to 'Examples/EulerAuto/src/eulerauto_cons_calc_flux_3.cc')
| -rw-r--r-- | Examples/EulerAuto/src/eulerauto_cons_calc_flux_3.cc | 33 |
1 files changed, 23 insertions, 10 deletions
diff --git a/Examples/EulerAuto/src/eulerauto_cons_calc_flux_3.cc b/Examples/EulerAuto/src/eulerauto_cons_calc_flux_3.cc index 140cd47..752fec3 100644 --- a/Examples/EulerAuto/src/eulerauto_cons_calc_flux_3.cc +++ b/Examples/EulerAuto/src/eulerauto_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 eulerauto_cons_calc_flux_3_SelectBCs(CCTK_ARGUMENTS) { @@ -52,8 +52,6 @@ static void eulerauto_cons_calc_flux_3_Body(cGH const * restrict const cctkGH, i 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_flux_3_Body(cGH const * restrict const cctkGH, i /* Loop over the grid points */ #pragma omp parallel - CCTK_LOOP3 (eulerauto_cons_calc_flux_3, + CCTK_LOOP3(eulerauto_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; @@ -187,7 +185,7 @@ static void eulerauto_cons_calc_flux_3_Body(cGH const * restrict const cctkGH, i S2Flux[index] = S2FluxL; S3Flux[index] = S3FluxL; } - CCTK_ENDLOOP3 (eulerauto_cons_calc_flux_3); + CCTK_ENDLOOP3(eulerauto_cons_calc_flux_3); } extern "C" void eulerauto_cons_calc_flux_3(CCTK_ARGUMENTS) @@ -206,12 +204,27 @@ extern "C" void eulerauto_cons_calc_flux_3(CCTK_ARGUMENTS) return; } - const char *groups[] = {"EulerAuto::Den_flux_group","EulerAuto::Den_lr_group","EulerAuto::En_flux_group","EulerAuto::En_lr_group","EulerAuto::p_lr_group","EulerAuto::rho_lr_group","EulerAuto::S1_flux_group","EulerAuto::S1_lr_group","EulerAuto::S2_flux_group","EulerAuto::S2_lr_group","EulerAuto::S3_flux_group","EulerAuto::S3_lr_group","EulerAuto::v1_lr_group","EulerAuto::v2_lr_group","EulerAuto::v3_lr_group"}; + const char *const groups[] = { + "EulerAuto::Den_flux_group", + "EulerAuto::Den_lr_group", + "EulerAuto::En_flux_group", + "EulerAuto::En_lr_group", + "EulerAuto::p_lr_group", + "EulerAuto::rho_lr_group", + "EulerAuto::S1_flux_group", + "EulerAuto::S1_lr_group", + "EulerAuto::S2_flux_group", + "EulerAuto::S2_lr_group", + "EulerAuto::S3_flux_group", + "EulerAuto::S3_lr_group", + "EulerAuto::v1_lr_group", + "EulerAuto::v2_lr_group", + "EulerAuto::v3_lr_group"}; GenericFD_AssertGroupStorage(cctkGH, "eulerauto_cons_calc_flux_3", 15, groups); GenericFD_EnsureStencilFits(cctkGH, "eulerauto_cons_calc_flux_3", 1, 1, 1); - GenericFD_LoopOverInterior(cctkGH, &eulerauto_cons_calc_flux_3_Body); + GenericFD_LoopOverInterior(cctkGH, eulerauto_cons_calc_flux_3_Body); if (verbose > 1) { |