diff options
Diffstat (limited to 'Examples/Wave/src/wave_boundary.cc')
| -rw-r--r-- | Examples/Wave/src/wave_boundary.cc | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/Examples/Wave/src/wave_boundary.cc b/Examples/Wave/src/wave_boundary.cc index 2ec1e2c..3ff86ec 100644 --- a/Examples/Wave/src/wave_boundary.cc +++ b/Examples/Wave/src/wave_boundary.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 wave_boundary_SelectBCs(CCTK_ARGUMENTS) { @@ -40,8 +40,6 @@ static void wave_boundary_Body(cGH const * restrict const cctkGH, int const dir, DECLARE_CCTK_PARAMETERS; - /* Declare finite differencing variables */ - /* Include user-supplied include files */ /* Initialise finite differencing variables */ @@ -69,25 +67,24 @@ static void wave_boundary_Body(cGH const * restrict const cctkGH, int const dir, CCTK_REAL const hdzi = 0.5 * dzi; /* Initialize predefined quantities */ - CCTK_REAL const p1o1 = 1; CCTK_REAL const p1o12dx = 0.0833333333333333333333333333333*INV(dx); CCTK_REAL const p1o12dy = 0.0833333333333333333333333333333*INV(dy); CCTK_REAL const p1o12dz = 0.0833333333333333333333333333333*INV(dz); - CCTK_REAL const p1o144dxdy = 0.00694444444444444444444444444444*INV(dx)*INV(dy); - CCTK_REAL const p1o144dxdz = 0.00694444444444444444444444444444*INV(dx)*INV(dz); - CCTK_REAL const p1o144dydz = 0.00694444444444444444444444444444*INV(dy)*INV(dz); + CCTK_REAL const p1o144dxdy = 0.00694444444444444444444444444444*INV(dx*dy); + CCTK_REAL const p1o144dxdz = 0.00694444444444444444444444444444*INV(dx*dz); + CCTK_REAL const p1o144dydz = 0.00694444444444444444444444444444*INV(dy*dz); CCTK_REAL const p1o2dx = 0.5*INV(dx); CCTK_REAL const p1o2dy = 0.5*INV(dy); CCTK_REAL const p1o2dz = 0.5*INV(dz); CCTK_REAL const p1o4dx2 = 0.25*INV(SQR(dx)); - CCTK_REAL const p1o4dxdy = 0.25*INV(dx)*INV(dy); - CCTK_REAL const p1o4dxdz = 0.25*INV(dx)*INV(dz); + CCTK_REAL const p1o4dxdy = 0.25*INV(dx*dy); + CCTK_REAL const p1o4dxdz = 0.25*INV(dx*dz); CCTK_REAL const p1o4dy2 = 0.25*INV(SQR(dy)); - CCTK_REAL const p1o4dydz = 0.25*INV(dy)*INV(dz); + CCTK_REAL const p1o4dydz = 0.25*INV(dy*dz); CCTK_REAL const p1o4dz2 = 0.25*INV(SQR(dz)); CCTK_REAL const p1odx = INV(dx); CCTK_REAL const p1odx2 = INV(SQR(dx)); - CCTK_REAL const p1odxdydz = INV(dx)*INV(dy)*INV(dz); + CCTK_REAL const p1odxdydz = INV(dx*dy*dz); CCTK_REAL const p1ody = INV(dy); CCTK_REAL const p1ody2 = INV(SQR(dy)); CCTK_REAL const p1odz = INV(dz); @@ -109,9 +106,9 @@ static void wave_boundary_Body(cGH const * restrict const cctkGH, int const dir, /* Loop over the grid points */ #pragma omp parallel - CCTK_LOOP3 (wave_boundary, + CCTK_LOOP3(wave_boundary, 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; @@ -145,11 +142,11 @@ static void wave_boundary_Body(cGH const * restrict const cctkGH, int const dir, CCTK_REAL norm3 = -(zL*INV(rL)); - ptrdiff_t dir1 = Sign(norm1); + ptrdiff_t dir1 = isgn(norm1); - ptrdiff_t dir2 = Sign(norm2); + ptrdiff_t dir2 = isgn(norm2); - ptrdiff_t dir3 = Sign(norm3); + ptrdiff_t dir3 = isgn(norm3); CCTK_REAL phirhsL = PDonesided2nd1(&phi[index])*norm1 + PDonesided2nd2(&phi[index])*norm2 + @@ -163,7 +160,7 @@ static void wave_boundary_Body(cGH const * restrict const cctkGH, int const dir, phirhs[index] = phirhsL; pirhs[index] = pirhsL; } - CCTK_ENDLOOP3 (wave_boundary); + CCTK_ENDLOOP3(wave_boundary); } extern "C" void wave_boundary(CCTK_ARGUMENTS) @@ -182,7 +179,10 @@ extern "C" void wave_boundary(CCTK_ARGUMENTS) return; } - const char *groups[] = {"Wave::evolved","Wave::evolvedrhs","grid::coordinates"}; + const char *const groups[] = { + "Wave::evolved", + "Wave::evolvedrhs", + "grid::coordinates"}; GenericFD_AssertGroupStorage(cctkGH, "wave_boundary", 3, groups); switch(fdOrder) @@ -196,7 +196,7 @@ extern "C" void wave_boundary(CCTK_ARGUMENTS) break; } - GenericFD_LoopOverBoundary(cctkGH, &wave_boundary_Body); + GenericFD_LoopOverBoundary(cctkGH, wave_boundary_Body); if (verbose > 1) { |