diff options
Diffstat (limited to 'Examples/EulerSR/src/eulersr_cons_calc_flux_2.cc')
| -rw-r--r-- | Examples/EulerSR/src/eulersr_cons_calc_flux_2.cc | 31 |
1 files changed, 21 insertions, 10 deletions
diff --git a/Examples/EulerSR/src/eulersr_cons_calc_flux_2.cc b/Examples/EulerSR/src/eulersr_cons_calc_flux_2.cc index fb8553c..9c264a5 100644 --- a/Examples/EulerSR/src/eulersr_cons_calc_flux_2.cc +++ b/Examples/EulerSR/src/eulersr_cons_calc_flux_2.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_flux_2_SelectBCs(CCTK_ARGUMENTS) { @@ -52,8 +52,6 @@ static void eulersr_cons_calc_flux_2_Body(cGH const * restrict const cctkGH, int 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_flux_2_Body(cGH const * restrict const cctkGH, int /* Loop over the grid points */ #pragma omp parallel - CCTK_LOOP3 (eulersr_cons_calc_flux_2, + CCTK_LOOP3(eulersr_cons_calc_flux_2, 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; @@ -181,7 +179,7 @@ static void eulersr_cons_calc_flux_2_Body(cGH const * restrict const cctkGH, int S3Flux[index] = S3FluxL; tauFlux[index] = tauFluxL; } - CCTK_ENDLOOP3 (eulersr_cons_calc_flux_2); + CCTK_ENDLOOP3(eulersr_cons_calc_flux_2); } extern "C" void eulersr_cons_calc_flux_2(CCTK_ARGUMENTS) @@ -200,12 +198,25 @@ extern "C" void eulersr_cons_calc_flux_2(CCTK_ARGUMENTS) return; } - const char *groups[] = {"EulerSR::Den_flux_group","EulerSR::Den_lr_group","EulerSR::epsi_lr_group","EulerSR::rho_lr_group","EulerSR::S1_flux_group","EulerSR::S1_lr_group","EulerSR::S2_flux_group","EulerSR::S2_lr_group","EulerSR::S3_flux_group","EulerSR::S3_lr_group","EulerSR::tau_flux_group","EulerSR::tau_lr_group","EulerSR::v2_lr_group"}; + const char *const groups[] = { + "EulerSR::Den_flux_group", + "EulerSR::Den_lr_group", + "EulerSR::epsi_lr_group", + "EulerSR::rho_lr_group", + "EulerSR::S1_flux_group", + "EulerSR::S1_lr_group", + "EulerSR::S2_flux_group", + "EulerSR::S2_lr_group", + "EulerSR::S3_flux_group", + "EulerSR::S3_lr_group", + "EulerSR::tau_flux_group", + "EulerSR::tau_lr_group", + "EulerSR::v2_lr_group"}; GenericFD_AssertGroupStorage(cctkGH, "eulersr_cons_calc_flux_2", 13, groups); GenericFD_EnsureStencilFits(cctkGH, "eulersr_cons_calc_flux_2", 1, 1, 1); - GenericFD_LoopOverInterior(cctkGH, &eulersr_cons_calc_flux_2_Body); + GenericFD_LoopOverInterior(cctkGH, eulersr_cons_calc_flux_2_Body); if (verbose > 1) { |