diff options
Diffstat (limited to 'ML_WaveToy/src/WT_Energy.cc')
| -rw-r--r-- | ML_WaveToy/src/WT_Energy.cc | 76 |
1 files changed, 38 insertions, 38 deletions
diff --git a/ML_WaveToy/src/WT_Energy.cc b/ML_WaveToy/src/WT_Energy.cc index f8b9e2e..ae69558 100644 --- a/ML_WaveToy/src/WT_Energy.cc +++ b/ML_WaveToy/src/WT_Energy.cc @@ -48,39 +48,39 @@ static void WT_Energy_Body(cGH const * restrict const cctkGH, int const dir, int /* Include user-supplied include files */ /* Initialise finite differencing variables */ - ptrdiff_t const di CCTK_ATTRIBUTE_UNUSED = 1; - ptrdiff_t const dj CCTK_ATTRIBUTE_UNUSED = CCTK_GFINDEX3D(cctkGH,0,1,0) - CCTK_GFINDEX3D(cctkGH,0,0,0); - ptrdiff_t const dk CCTK_ATTRIBUTE_UNUSED = CCTK_GFINDEX3D(cctkGH,0,0,1) - CCTK_GFINDEX3D(cctkGH,0,0,0); - ptrdiff_t const cdi CCTK_ATTRIBUTE_UNUSED = sizeof(CCTK_REAL) * di; - ptrdiff_t const cdj CCTK_ATTRIBUTE_UNUSED = sizeof(CCTK_REAL) * dj; - ptrdiff_t const cdk CCTK_ATTRIBUTE_UNUSED = sizeof(CCTK_REAL) * dk; - CCTK_REAL_VEC const dx CCTK_ATTRIBUTE_UNUSED = ToReal(CCTK_DELTA_SPACE(0)); - CCTK_REAL_VEC const dy CCTK_ATTRIBUTE_UNUSED = ToReal(CCTK_DELTA_SPACE(1)); - CCTK_REAL_VEC const dz CCTK_ATTRIBUTE_UNUSED = ToReal(CCTK_DELTA_SPACE(2)); - CCTK_REAL_VEC const dt CCTK_ATTRIBUTE_UNUSED = ToReal(CCTK_DELTA_TIME); - CCTK_REAL_VEC const t CCTK_ATTRIBUTE_UNUSED = ToReal(cctk_time); - CCTK_REAL_VEC const dxi CCTK_ATTRIBUTE_UNUSED = INV(dx); - CCTK_REAL_VEC const dyi CCTK_ATTRIBUTE_UNUSED = INV(dy); - CCTK_REAL_VEC const dzi CCTK_ATTRIBUTE_UNUSED = INV(dz); - CCTK_REAL_VEC const khalf CCTK_ATTRIBUTE_UNUSED = ToReal(0.5); - CCTK_REAL_VEC const kthird CCTK_ATTRIBUTE_UNUSED = ToReal(1.0/3.0); - CCTK_REAL_VEC const ktwothird CCTK_ATTRIBUTE_UNUSED = ToReal(2.0/3.0); - CCTK_REAL_VEC const kfourthird CCTK_ATTRIBUTE_UNUSED = ToReal(4.0/3.0); - CCTK_REAL_VEC const keightthird CCTK_ATTRIBUTE_UNUSED = ToReal(8.0/3.0); - CCTK_REAL_VEC const hdxi CCTK_ATTRIBUTE_UNUSED = kmul(ToReal(0.5), dxi); - CCTK_REAL_VEC const hdyi CCTK_ATTRIBUTE_UNUSED = kmul(ToReal(0.5), dyi); - CCTK_REAL_VEC const hdzi CCTK_ATTRIBUTE_UNUSED = kmul(ToReal(0.5), dzi); + ptrdiff_t /*const*/ di CCTK_ATTRIBUTE_UNUSED = 1; + ptrdiff_t /*const*/ dj CCTK_ATTRIBUTE_UNUSED = CCTK_GFINDEX3D(cctkGH,0,1,0) - CCTK_GFINDEX3D(cctkGH,0,0,0); + ptrdiff_t /*const*/ dk CCTK_ATTRIBUTE_UNUSED = CCTK_GFINDEX3D(cctkGH,0,0,1) - CCTK_GFINDEX3D(cctkGH,0,0,0); + ptrdiff_t /*const*/ cdi CCTK_ATTRIBUTE_UNUSED = sizeof(CCTK_REAL) * di; + ptrdiff_t /*const*/ cdj CCTK_ATTRIBUTE_UNUSED = sizeof(CCTK_REAL) * dj; + ptrdiff_t /*const*/ cdk CCTK_ATTRIBUTE_UNUSED = sizeof(CCTK_REAL) * dk; + CCTK_REAL_VEC /*const*/ dx CCTK_ATTRIBUTE_UNUSED = ToReal(CCTK_DELTA_SPACE(0)); + CCTK_REAL_VEC /*const*/ dy CCTK_ATTRIBUTE_UNUSED = ToReal(CCTK_DELTA_SPACE(1)); + CCTK_REAL_VEC /*const*/ dz CCTK_ATTRIBUTE_UNUSED = ToReal(CCTK_DELTA_SPACE(2)); + CCTK_REAL_VEC /*const*/ dt CCTK_ATTRIBUTE_UNUSED = ToReal(CCTK_DELTA_TIME); + CCTK_REAL_VEC /*const*/ t CCTK_ATTRIBUTE_UNUSED = ToReal(cctk_time); + CCTK_REAL_VEC /*const*/ dxi CCTK_ATTRIBUTE_UNUSED = INV(dx); + CCTK_REAL_VEC /*const*/ dyi CCTK_ATTRIBUTE_UNUSED = INV(dy); + CCTK_REAL_VEC /*const*/ dzi CCTK_ATTRIBUTE_UNUSED = INV(dz); + CCTK_REAL_VEC /*const*/ khalf CCTK_ATTRIBUTE_UNUSED = ToReal(0.5); + CCTK_REAL_VEC /*const*/ kthird CCTK_ATTRIBUTE_UNUSED = ToReal(1.0/3.0); + CCTK_REAL_VEC /*const*/ ktwothird CCTK_ATTRIBUTE_UNUSED = ToReal(2.0/3.0); + CCTK_REAL_VEC /*const*/ kfourthird CCTK_ATTRIBUTE_UNUSED = ToReal(4.0/3.0); + CCTK_REAL_VEC /*const*/ keightthird CCTK_ATTRIBUTE_UNUSED = ToReal(8.0/3.0); + CCTK_REAL_VEC /*const*/ hdxi CCTK_ATTRIBUTE_UNUSED = kmul(ToReal(0.5), dxi); + CCTK_REAL_VEC /*const*/ hdyi CCTK_ATTRIBUTE_UNUSED = kmul(ToReal(0.5), dyi); + CCTK_REAL_VEC /*const*/ hdzi CCTK_ATTRIBUTE_UNUSED = kmul(ToReal(0.5), dzi); /* Initialize predefined quantities */ - CCTK_REAL_VEC const p1o12dx CCTK_ATTRIBUTE_UNUSED = kdiv(ToReal(0.0833333333333333333333333333333),dx); - CCTK_REAL_VEC const p1o12dy CCTK_ATTRIBUTE_UNUSED = kdiv(ToReal(0.0833333333333333333333333333333),dy); - CCTK_REAL_VEC const p1o12dz CCTK_ATTRIBUTE_UNUSED = kdiv(ToReal(0.0833333333333333333333333333333),dz); - CCTK_REAL_VEC const p1o144dxdy CCTK_ATTRIBUTE_UNUSED = kdiv(ToReal(0.00694444444444444444444444444444),kmul(dy,dx)); - CCTK_REAL_VEC const p1o144dxdz CCTK_ATTRIBUTE_UNUSED = kdiv(ToReal(0.00694444444444444444444444444444),kmul(dz,dx)); - CCTK_REAL_VEC const p1o144dydz CCTK_ATTRIBUTE_UNUSED = kdiv(ToReal(0.00694444444444444444444444444444),kmul(dz,dy)); - CCTK_REAL_VEC const pm1o12dx2 CCTK_ATTRIBUTE_UNUSED = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dx,dx)); - CCTK_REAL_VEC const pm1o12dy2 CCTK_ATTRIBUTE_UNUSED = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dy,dy)); - CCTK_REAL_VEC const pm1o12dz2 CCTK_ATTRIBUTE_UNUSED = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dz,dz)); + CCTK_REAL_VEC /*const*/ p1o12dx CCTK_ATTRIBUTE_UNUSED = kdiv(ToReal(0.0833333333333333333333333333333),dx); + CCTK_REAL_VEC /*const*/ p1o12dy CCTK_ATTRIBUTE_UNUSED = kdiv(ToReal(0.0833333333333333333333333333333),dy); + CCTK_REAL_VEC /*const*/ p1o12dz CCTK_ATTRIBUTE_UNUSED = kdiv(ToReal(0.0833333333333333333333333333333),dz); + CCTK_REAL_VEC /*const*/ p1o144dxdy CCTK_ATTRIBUTE_UNUSED = kdiv(ToReal(0.00694444444444444444444444444444),kmul(dy,dx)); + CCTK_REAL_VEC /*const*/ p1o144dxdz CCTK_ATTRIBUTE_UNUSED = kdiv(ToReal(0.00694444444444444444444444444444),kmul(dz,dx)); + CCTK_REAL_VEC /*const*/ p1o144dydz CCTK_ATTRIBUTE_UNUSED = kdiv(ToReal(0.00694444444444444444444444444444),kmul(dz,dy)); + CCTK_REAL_VEC /*const*/ pm1o12dx2 CCTK_ATTRIBUTE_UNUSED = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dx,dx)); + CCTK_REAL_VEC /*const*/ pm1o12dy2 CCTK_ATTRIBUTE_UNUSED = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dy,dy)); + CCTK_REAL_VEC /*const*/ pm1o12dz2 CCTK_ATTRIBUTE_UNUSED = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dz,dz)); /* Assign local copies of arrays functions */ @@ -92,12 +92,12 @@ static void WT_Energy_Body(cGH const * restrict const cctkGH, int const dir, int /* Loop over the grid points */ #pragma omp parallel - LC_LOOP3VEC(WT_Energy, + CCTK_LOOP3STR(WT_Energy, i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2], cctk_ash[0],cctk_ash[1],cctk_ash[2], - CCTK_REAL_VEC_SIZE) + imin,imax, CCTK_REAL_VEC_SIZE) { - ptrdiff_t const index CCTK_ATTRIBUTE_UNUSED = di*i + dj*j + dk*k; + ptrdiff_t /*const*/ index CCTK_ATTRIBUTE_UNUSED = di*i + dj*j + dk*k; /* Assign local copies of grid functions */ @@ -108,9 +108,9 @@ static void WT_Energy_Body(cGH const * restrict const cctkGH, int const dir, int /* Include user supplied include files */ /* Precompute derivatives */ - CCTK_REAL_VEC const PDstandardNth1u CCTK_ATTRIBUTE_UNUSED = PDstandardNth1(&u[index]); - CCTK_REAL_VEC const PDstandardNth2u CCTK_ATTRIBUTE_UNUSED = PDstandardNth2(&u[index]); - CCTK_REAL_VEC const PDstandardNth3u CCTK_ATTRIBUTE_UNUSED = PDstandardNth3(&u[index]); + CCTK_REAL_VEC /*const*/ PDstandardNth1u CCTK_ATTRIBUTE_UNUSED = PDstandardNth1(&u[index]); + CCTK_REAL_VEC /*const*/ PDstandardNth2u CCTK_ATTRIBUTE_UNUSED = PDstandardNth2(&u[index]); + CCTK_REAL_VEC /*const*/ PDstandardNth3u CCTK_ATTRIBUTE_UNUSED = PDstandardNth3(&u[index]); /* Calculate temporaries and grid functions */ CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED epsL = @@ -120,7 +120,7 @@ static void WT_Energy_Body(cGH const * restrict const cctkGH, int const dir, int vec_store_partial_prepare(i,lc_imin,lc_imax); vec_store_nta_partial(eps[index],epsL); } - LC_ENDLOOP3VEC(WT_Energy); + CCTK_ENDLOOP3STR(WT_Energy); } extern "C" void WT_Energy(CCTK_ARGUMENTS) |