aboutsummaryrefslogtreecommitdiff
path: root/ML_ADM/src/ML_ADM_Minkowski.c
diff options
context:
space:
mode:
Diffstat (limited to 'ML_ADM/src/ML_ADM_Minkowski.c')
-rw-r--r--ML_ADM/src/ML_ADM_Minkowski.c122
1 files changed, 60 insertions, 62 deletions
diff --git a/ML_ADM/src/ML_ADM_Minkowski.c b/ML_ADM/src/ML_ADM_Minkowski.c
index 4420395..ace3b38 100644
--- a/ML_ADM/src/ML_ADM_Minkowski.c
+++ b/ML_ADM/src/ML_ADM_Minkowski.c
@@ -20,29 +20,24 @@
#define CUB(x) ((x) * (x) * (x))
#define QAD(x) ((x) * (x) * (x) * (x))
-void ML_ADM_Minkowski_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_INT const face, CCTK_REAL const normal[3], CCTK_REAL const tangentA[3], CCTK_REAL const tangentB[3], CCTK_INT const min[3], CCTK_INT const max[3], CCTK_INT const n_subblock_gfs, CCTK_REAL * const subblock_gfs[])
+void ML_ADM_Minkowski_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 min[3], int const max[3], int const n_subblock_gfs, CCTK_REAL * restrict const subblock_gfs[])
{
DECLARE_CCTK_ARGUMENTS;
DECLARE_CCTK_PARAMETERS;
/* Declare finite differencing variables */
- CCTK_REAL dx = INITVALUE, dy = INITVALUE, dz = INITVALUE;
- CCTK_REAL dxi = INITVALUE, dyi = INITVALUE, dzi = INITVALUE;
- CCTK_REAL khalf = INITVALUE, kthird = INITVALUE, ktwothird = INITVALUE, kfourthird = INITVALUE, keightthird = INITVALUE;
- CCTK_REAL hdxi = INITVALUE, hdyi = INITVALUE, hdzi = INITVALUE;
-
/* Declare predefined quantities */
- CCTK_REAL p1o12dx = INITVALUE;
- CCTK_REAL p1o12dy = INITVALUE;
- CCTK_REAL p1o12dz = INITVALUE;
- CCTK_REAL p1o144dxdy = INITVALUE;
- CCTK_REAL p1o144dxdz = INITVALUE;
- CCTK_REAL p1o144dydz = INITVALUE;
- CCTK_REAL pm1o12dx2 = INITVALUE;
- CCTK_REAL pm1o12dy2 = INITVALUE;
- CCTK_REAL pm1o12dz2 = INITVALUE;
+ // CCTK_REAL p1o12dx = INITVALUE;
+ // CCTK_REAL p1o12dy = INITVALUE;
+ // CCTK_REAL p1o12dz = INITVALUE;
+ // CCTK_REAL p1o144dxdy = INITVALUE;
+ // CCTK_REAL p1o144dxdz = INITVALUE;
+ // CCTK_REAL p1o144dydz = INITVALUE;
+ // CCTK_REAL pm1o12dx2 = INITVALUE;
+ // CCTK_REAL pm1o12dy2 = INITVALUE;
+ // CCTK_REAL pm1o12dz2 = INITVALUE;
if (verbose > 1)
{
@@ -57,31 +52,34 @@ void ML_ADM_Minkowski_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_IN
/* Include user-supplied include files */
/* Initialise finite differencing variables */
- dx = CCTK_DELTA_SPACE(0);
- dy = CCTK_DELTA_SPACE(1);
- dz = CCTK_DELTA_SPACE(2);
- dxi = 1.0 / dx;
- dyi = 1.0 / dy;
- dzi = 1.0 / dz;
- khalf = 0.5;
- kthird = 1/3.0;
- ktwothird = 2.0/3.0;
- kfourthird = 4.0/3.0;
- keightthird = 8.0/3.0;
- hdxi = 0.5 * dxi;
- hdyi = 0.5 * dyi;
- hdzi = 0.5 * dzi;
+ CCTK_REAL const dx = CCTK_DELTA_SPACE(0);
+ CCTK_REAL const dy = CCTK_DELTA_SPACE(1);
+ CCTK_REAL const dz = CCTK_DELTA_SPACE(2);
+ int const di = 1;
+ int const dj = CCTK_GFINDEX3D(cctkGH,0,1,0) - CCTK_GFINDEX3D(cctkGH,0,0,0);
+ int const dk = CCTK_GFINDEX3D(cctkGH,0,0,1) - CCTK_GFINDEX3D(cctkGH,0,0,0);
+ CCTK_REAL const dxi = 1.0 / dx;
+ CCTK_REAL const dyi = 1.0 / dy;
+ CCTK_REAL const dzi = 1.0 / dz;
+ CCTK_REAL const khalf = 0.5;
+ CCTK_REAL const kthird = 1/3.0;
+ CCTK_REAL const ktwothird = 2.0/3.0;
+ CCTK_REAL const kfourthird = 4.0/3.0;
+ CCTK_REAL const keightthird = 8.0/3.0;
+ CCTK_REAL const hdxi = 0.5 * dxi;
+ CCTK_REAL const hdyi = 0.5 * dyi;
+ CCTK_REAL const hdzi = 0.5 * dzi;
/* Initialize predefined quantities */
- p1o12dx = INV(dx)/12.;
- p1o12dy = INV(dy)/12.;
- p1o12dz = INV(dz)/12.;
- p1o144dxdy = (INV(dx)*INV(dy))/144.;
- p1o144dxdz = (INV(dx)*INV(dz))/144.;
- p1o144dydz = (INV(dy)*INV(dz))/144.;
- pm1o12dx2 = -pow(dx,-2)/12.;
- pm1o12dy2 = -pow(dy,-2)/12.;
- pm1o12dz2 = -pow(dz,-2)/12.;
+ CCTK_REAL const p1o12dx = INV(dx)/12.;
+ CCTK_REAL const p1o12dy = INV(dy)/12.;
+ CCTK_REAL const p1o12dz = INV(dz)/12.;
+ CCTK_REAL const p1o144dxdy = (INV(dx)*INV(dy))/144.;
+ CCTK_REAL const p1o144dxdz = (INV(dx)*INV(dz))/144.;
+ CCTK_REAL const p1o144dydz = (INV(dy)*INV(dz))/144.;
+ CCTK_REAL const pm1o12dx2 = -pow(dx,-2)/12.;
+ CCTK_REAL const pm1o12dy2 = -pow(dy,-2)/12.;
+ CCTK_REAL const pm1o12dz2 = -pow(dz,-2)/12.;
/* Loop over the grid points */
#pragma omp parallel
@@ -89,18 +87,18 @@ void ML_ADM_Minkowski_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_IN
i,j,k, min[0],min[1],min[2], max[0],max[1],max[2],
cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
{
- int index = INITVALUE;
- int subblock_index = INITVALUE;
- index = CCTK_GFINDEX3D(cctkGH,i,j,k);
- subblock_index = i - min[0] + (max[0] - min[0]) * (j - min[1] + (max[1]-min[1]) * (k - min[2]));
+ // int index = INITVALUE;
+ // int subblock_index = INITVALUE;
+ int const index = CCTK_GFINDEX3D(cctkGH,i,j,k);
+ int const subblock_index = i - min[0] + (max[0] - min[0]) * (j - min[1] + (max[1]-min[1]) * (k - min[2]));
/* Declare shorthands */
/* Declare local copies of grid functions */
- CCTK_REAL alphaL = INITVALUE;
- CCTK_REAL beta1L = INITVALUE, beta2L = INITVALUE, beta3L = INITVALUE;
- CCTK_REAL g11L = INITVALUE, g12L = INITVALUE, g13L = INITVALUE, g22L = INITVALUE, g23L = INITVALUE, g33L = INITVALUE;
- CCTK_REAL K11L = INITVALUE, K12L = INITVALUE, K13L = INITVALUE, K22L = INITVALUE, K23L = INITVALUE, K33L = INITVALUE;
+ // CCTK_REAL alphaL = INITVALUE;
+ // CCTK_REAL beta1L = INITVALUE, beta2L = INITVALUE, beta3L = INITVALUE;
+ // CCTK_REAL g11L = INITVALUE, g12L = INITVALUE, g13L = INITVALUE, g22L = INITVALUE, g23L = INITVALUE, g33L = INITVALUE;
+ // CCTK_REAL K11L = INITVALUE, K12L = INITVALUE, K13L = INITVALUE, K22L = INITVALUE, K23L = INITVALUE, K33L = INITVALUE;
/* Declare precomputed derivatives*/
/* Declare derivatives */
@@ -116,37 +114,37 @@ void ML_ADM_Minkowski_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_IN
/* Precompute derivatives (old style) */
/* Calculate temporaries and grid functions */
- g11L = 1;
+ CCTK_REAL const g11L = 1;
- g12L = 0;
+ CCTK_REAL const g12L = 0;
- g13L = 0;
+ CCTK_REAL const g13L = 0;
- g22L = 1;
+ CCTK_REAL const g22L = 1;
- g23L = 0;
+ CCTK_REAL const g23L = 0;
- g33L = 1;
+ CCTK_REAL const g33L = 1;
- K11L = 0;
+ CCTK_REAL const K11L = 0;
- K12L = 0;
+ CCTK_REAL const K12L = 0;
- K13L = 0;
+ CCTK_REAL const K13L = 0;
- K22L = 0;
+ CCTK_REAL const K22L = 0;
- K23L = 0;
+ CCTK_REAL const K23L = 0;
- K33L = 0;
+ CCTK_REAL const K33L = 0;
- alphaL = 1;
+ CCTK_REAL const alphaL = 1;
- beta1L = 0;
+ CCTK_REAL const beta1L = 0;
- beta2L = 0;
+ CCTK_REAL const beta2L = 0;
- beta3L = 0;
+ CCTK_REAL const beta3L = 0;
/* Copy local copies back to grid functions */