diff options
| author | Erik Schnetter <schnetter@gmail.com> | 2012-07-03 21:32:38 -0400 |
|---|---|---|
| committer | Erik Schnetter <schnetter@gmail.com> | 2012-07-03 21:32:38 -0400 |
| commit | 9301a1b665598cafd094b7a653419de4cef77640 (patch) | |
| tree | 59cd3810abd7afbc8071e50d002ce5be03c90ac8 /ML_ADMConstraints | |
| parent | 42a4051247ff477c8973f985d68a0ccecd4e0aa8 (diff) | |
Introduce cctk_ash, retire cctk_lssh
Introduce cctk_ash, describing the process-local array shape that has
been allocated. This may be larger than cctk_lsh, the process-local
shape that should be used.
Retire cctk_lssh and related infrastructure to handle staggered grid
functions.
Diffstat (limited to 'ML_ADMConstraints')
| -rw-r--r-- | ML_ADMConstraints/src/ML_ADMConstraints.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ML_ADMConstraints/src/ML_ADMConstraints.cc b/ML_ADMConstraints/src/ML_ADMConstraints.cc index 1a89aa7..ed98b4f 100644 --- a/ML_ADMConstraints/src/ML_ADMConstraints.cc +++ b/ML_ADMConstraints/src/ML_ADMConstraints.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 ML_ADMConstraints_SelectBCs(CCTK_ARGUMENTS) { @@ -137,7 +137,7 @@ static void ML_ADMConstraints_Body(cGH const * restrict const cctkGH, int const #pragma omp parallel CCTK_LOOP3(ML_ADMConstraints, 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; |