diff options
Diffstat (limited to 'Examples/Burgers/src/burgers_initial_sine.cc')
| -rw-r--r-- | Examples/Burgers/src/burgers_initial_sine.cc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/Examples/Burgers/src/burgers_initial_sine.cc b/Examples/Burgers/src/burgers_initial_sine.cc index d6aa092..0e5daaa 100644 --- a/Examples/Burgers/src/burgers_initial_sine.cc +++ b/Examples/Burgers/src/burgers_initial_sine.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 burgers_initial_sine_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 burgers_initial_sine_Body(cGH const * restrict const cctkGH, int con DECLARE_CCTK_PARAMETERS; - /* Declare finite differencing variables */ - /* Include user-supplied include files */ /* Initialise finite differencing variables */ @@ -72,9 +70,9 @@ static void burgers_initial_sine_Body(cGH const * restrict const cctkGH, int con /* Loop over the grid points */ #pragma omp parallel - CCTK_LOOP3 (burgers_initial_sine, + CCTK_LOOP3(burgers_initial_sine, 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; @@ -88,12 +86,12 @@ static void burgers_initial_sine_Body(cGH const * restrict const cctkGH, int con /* Precompute derivatives */ /* Calculate temporaries and grid functions */ - CCTK_REAL uL = 1 + Sin(2*xL*Pi)*ToReal(amp); + CCTK_REAL uL = 1 + sin(2*xL*Pi)*ToReal(amp); /* Copy local copies back to grid functions */ u[index] = uL; } - CCTK_ENDLOOP3 (burgers_initial_sine); + CCTK_ENDLOOP3(burgers_initial_sine); } extern "C" void burgers_initial_sine(CCTK_ARGUMENTS) @@ -112,11 +110,13 @@ extern "C" void burgers_initial_sine(CCTK_ARGUMENTS) return; } - const char *groups[] = {"grid::coordinates","Burgers::u_group"}; + const char *const groups[] = { + "grid::coordinates", + "Burgers::u_group"}; GenericFD_AssertGroupStorage(cctkGH, "burgers_initial_sine", 2, groups); - GenericFD_LoopOverEverything(cctkGH, &burgers_initial_sine_Body); + GenericFD_LoopOverEverything(cctkGH, burgers_initial_sine_Body); if (verbose > 1) { |