aboutsummaryrefslogtreecommitdiff
path: root/ML_WaveToy_CL/src/WT_CL_Standing.cc
diff options
context:
space:
mode:
Diffstat (limited to 'ML_WaveToy_CL/src/WT_CL_Standing.cc')
-rw-r--r--ML_WaveToy_CL/src/WT_CL_Standing.cc30
1 files changed, 17 insertions, 13 deletions
diff --git a/ML_WaveToy_CL/src/WT_CL_Standing.cc b/ML_WaveToy_CL/src/WT_CL_Standing.cc
index 5c477e1..dc487d9 100644
--- a/ML_WaveToy_CL/src/WT_CL_Standing.cc
+++ b/ML_WaveToy_CL/src/WT_CL_Standing.cc
@@ -19,10 +19,14 @@
/* Define macros used in calculations */
#define INITVALUE (42)
-#define QAD(x) (SQR(SQR(x)))
+#define ScalarINV(x) ((CCTK_REAL)1.0 / (x))
+#define ScalarSQR(x) ((x) * (x))
+#define ScalarCUB(x) ((x) * ScalarSQR(x))
+#define ScalarQAD(x) (ScalarSQR(ScalarSQR(x)))
#define INV(x) (kdiv(ToReal(1.0),x))
#define SQR(x) (kmul(x,x))
#define CUB(x) (kmul(x,SQR(x)))
+#define QAD(x) (SQR(SQR(x)))
static void WT_CL_Standing_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[])
{
@@ -58,15 +62,15 @@ static void WT_CL_Standing_Body(cGH const * restrict const cctkGH, int const dir
"CCTK_REAL_VEC const hdzi = kmul(ToReal(0.5), dzi);\n"
"\n"
"/* Initialize predefined quantities */\n"
- "CCTK_REAL_VEC const p1o12dx = kmul(INV(dx),ToReal(0.0833333333333333333333333333333));\n"
- "CCTK_REAL_VEC const p1o12dy = kmul(INV(dy),ToReal(0.0833333333333333333333333333333));\n"
- "CCTK_REAL_VEC const p1o12dz = kmul(INV(dz),ToReal(0.0833333333333333333333333333333));\n"
- "CCTK_REAL_VEC const p1o144dxdy = kmul(INV(kmul(dx,dy)),ToReal(0.00694444444444444444444444444444));\n"
- "CCTK_REAL_VEC const p1o144dxdz = kmul(INV(kmul(dx,dz)),ToReal(0.00694444444444444444444444444444));\n"
- "CCTK_REAL_VEC const p1o144dydz = kmul(INV(kmul(dy,dz)),ToReal(0.00694444444444444444444444444444));\n"
- "CCTK_REAL_VEC const pm1o12dx2 = kmul(INV(SQR(dx)),ToReal(-0.0833333333333333333333333333333));\n"
- "CCTK_REAL_VEC const pm1o12dy2 = kmul(INV(SQR(dy)),ToReal(-0.0833333333333333333333333333333));\n"
- "CCTK_REAL_VEC const pm1o12dz2 = kmul(INV(SQR(dz)),ToReal(-0.0833333333333333333333333333333));\n"
+ "CCTK_REAL_VEC const p1o12dx = kdiv(ToReal(0.0833333333333333333333333333333),dx);\n"
+ "CCTK_REAL_VEC const p1o12dy = kdiv(ToReal(0.0833333333333333333333333333333),dy);\n"
+ "CCTK_REAL_VEC const p1o12dz = kdiv(ToReal(0.0833333333333333333333333333333),dz);\n"
+ "CCTK_REAL_VEC const p1o144dxdy = kdiv(ToReal(0.00694444444444444444444444444444),kmul(dy,dx));\n"
+ "CCTK_REAL_VEC const p1o144dxdz = kdiv(ToReal(0.00694444444444444444444444444444),kmul(dz,dx));\n"
+ "CCTK_REAL_VEC const p1o144dydz = kdiv(ToReal(0.00694444444444444444444444444444),kmul(dz,dy));\n"
+ "CCTK_REAL_VEC const pm1o12dx2 = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dx,dx));\n"
+ "CCTK_REAL_VEC const pm1o12dy2 = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dy,dy));\n"
+ "CCTK_REAL_VEC const pm1o12dz2 = kdiv(ToReal(-0.0833333333333333333333333333333),kmul(dz,dz));\n"
"\n"
"/* Assign local copies of arrays functions */\n"
"\n"
@@ -80,7 +84,7 @@ static void WT_CL_Standing_Body(cGH const * restrict const cctkGH, int const dir
"#pragma omp parallel\n"
"LC_LOOP3VEC(WT_CL_Standing,\n"
" i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],\n"
- " cctk_lsh[0],cctk_lsh[1],cctk_lsh[2],\n"
+ " cctk_ash[0],cctk_ash[1],cctk_ash[2],\n"
" CCTK_REAL_VEC_SIZE)\n"
"{\n"
" ptrdiff_t const index = di*i + dj*j + dk*k;\n"
@@ -97,9 +101,9 @@ static void WT_CL_Standing_Body(cGH const * restrict const cctkGH, int const dir
" /* Precompute derivatives */\n"
" \n"
" /* Calculate temporaries and grid functions */\n"
- " CCTK_REAL_VEC k = kmul(INV(ToReal(width)),ToReal(Pi));\n"
+ " CCTK_REAL_VEC k = ToReal(Pi*ScalarINV(width));\n"
" \n"
- " CCTK_REAL_VEC omega = ksqrt(kmul(SQR(k),ToReal(3)));\n"
+ " CCTK_REAL_VEC omega = ksqrt(kmul(kmul(k,k),ToReal(3)));\n"
" \n"
" CCTK_REAL_VEC uL = \n"
" kmul(kcos(kmul(xL,k)),kmul(kcos(kmul(yL,k)),kmul(kcos(kmul(zL,k)),kmul(kcos(kmul(omega,t)),ToReal(amplitude)))));\n"