diff options
Diffstat (limited to 'ML_ADM/src/ML_ADM_convertFromADMBase.cc')
| -rw-r--r-- | ML_ADM/src/ML_ADM_convertFromADMBase.cc | 148 |
1 files changed, 42 insertions, 106 deletions
diff --git a/ML_ADM/src/ML_ADM_convertFromADMBase.cc b/ML_ADM/src/ML_ADM_convertFromADMBase.cc index ccf06b3..7ba54c9 100644 --- a/ML_ADM/src/ML_ADM_convertFromADMBase.cc +++ b/ML_ADM/src/ML_ADM_convertFromADMBase.cc @@ -29,8 +29,6 @@ static void ML_ADM_convertFromADMBase_Body(cGH const * restrict const cctkGH, in DECLARE_CCTK_PARAMETERS; - /* Declare finite differencing variables */ - /* Include user-supplied include files */ /* Initialise finite differencing variables */ @@ -61,30 +59,30 @@ static void ML_ADM_convertFromADMBase_Body(cGH const * restrict const cctkGH, in CCTK_REAL_VEC const p1o12dx = kmul(INV(dx),ToReal(0.0833333333333333333333333333333)); CCTK_REAL_VEC const p1o12dy = kmul(INV(dy),ToReal(0.0833333333333333333333333333333)); CCTK_REAL_VEC const p1o12dz = kmul(INV(dz),ToReal(0.0833333333333333333333333333333)); - CCTK_REAL_VEC const p1o144dxdy = kmul(INV(dx),kmul(INV(dy),ToReal(0.00694444444444444444444444444444))); - CCTK_REAL_VEC const p1o144dxdz = kmul(INV(dx),kmul(INV(dz),ToReal(0.00694444444444444444444444444444))); - CCTK_REAL_VEC const p1o144dydz = kmul(INV(dy),kmul(INV(dz),ToReal(0.00694444444444444444444444444444))); + CCTK_REAL_VEC const p1o144dxdy = kmul(INV(kmul(dx,dy)),ToReal(0.00694444444444444444444444444444)); + CCTK_REAL_VEC const p1o144dxdz = kmul(INV(kmul(dx,dz)),ToReal(0.00694444444444444444444444444444)); + CCTK_REAL_VEC const p1o144dydz = kmul(INV(kmul(dy,dz)),ToReal(0.00694444444444444444444444444444)); CCTK_REAL_VEC const p1o180dx2 = kmul(INV(SQR(dx)),ToReal(0.00555555555555555555555555555556)); CCTK_REAL_VEC const p1o180dy2 = kmul(INV(SQR(dy)),ToReal(0.00555555555555555555555555555556)); CCTK_REAL_VEC const p1o180dz2 = kmul(INV(SQR(dz)),ToReal(0.00555555555555555555555555555556)); CCTK_REAL_VEC const p1o2dx = kmul(INV(dx),ToReal(0.5)); CCTK_REAL_VEC const p1o2dy = kmul(INV(dy),ToReal(0.5)); CCTK_REAL_VEC const p1o2dz = kmul(INV(dz),ToReal(0.5)); - CCTK_REAL_VEC const p1o3600dxdy = kmul(INV(dx),kmul(INV(dy),ToReal(0.000277777777777777777777777777778))); - CCTK_REAL_VEC const p1o3600dxdz = kmul(INV(dx),kmul(INV(dz),ToReal(0.000277777777777777777777777777778))); - CCTK_REAL_VEC const p1o3600dydz = kmul(INV(dy),kmul(INV(dz),ToReal(0.000277777777777777777777777777778))); - CCTK_REAL_VEC const p1o4dxdy = kmul(INV(dx),kmul(INV(dy),ToReal(0.25))); - CCTK_REAL_VEC const p1o4dxdz = kmul(INV(dx),kmul(INV(dz),ToReal(0.25))); - CCTK_REAL_VEC const p1o4dydz = kmul(INV(dy),kmul(INV(dz),ToReal(0.25))); + CCTK_REAL_VEC const p1o3600dxdy = kmul(INV(kmul(dx,dy)),ToReal(0.000277777777777777777777777777778)); + CCTK_REAL_VEC const p1o3600dxdz = kmul(INV(kmul(dx,dz)),ToReal(0.000277777777777777777777777777778)); + CCTK_REAL_VEC const p1o3600dydz = kmul(INV(kmul(dy,dz)),ToReal(0.000277777777777777777777777777778)); + CCTK_REAL_VEC const p1o4dxdy = kmul(INV(kmul(dx,dy)),ToReal(0.25)); + CCTK_REAL_VEC const p1o4dxdz = kmul(INV(kmul(dx,dz)),ToReal(0.25)); + CCTK_REAL_VEC const p1o4dydz = kmul(INV(kmul(dy,dz)),ToReal(0.25)); CCTK_REAL_VEC const p1o5040dx2 = kmul(INV(SQR(dx)),ToReal(0.000198412698412698412698412698413)); CCTK_REAL_VEC const p1o5040dy2 = kmul(INV(SQR(dy)),ToReal(0.000198412698412698412698412698413)); CCTK_REAL_VEC const p1o5040dz2 = kmul(INV(SQR(dz)),ToReal(0.000198412698412698412698412698413)); CCTK_REAL_VEC const p1o60dx = kmul(INV(dx),ToReal(0.0166666666666666666666666666667)); CCTK_REAL_VEC const p1o60dy = kmul(INV(dy),ToReal(0.0166666666666666666666666666667)); CCTK_REAL_VEC const p1o60dz = kmul(INV(dz),ToReal(0.0166666666666666666666666666667)); - CCTK_REAL_VEC const p1o705600dxdy = kmul(INV(dx),kmul(INV(dy),ToReal(1.41723356009070294784580498866e-6))); - CCTK_REAL_VEC const p1o705600dxdz = kmul(INV(dx),kmul(INV(dz),ToReal(1.41723356009070294784580498866e-6))); - CCTK_REAL_VEC const p1o705600dydz = kmul(INV(dy),kmul(INV(dz),ToReal(1.41723356009070294784580498866e-6))); + CCTK_REAL_VEC const p1o705600dxdy = kmul(INV(kmul(dx,dy)),ToReal(1.41723356009070294784580498866e-6)); + CCTK_REAL_VEC const p1o705600dxdz = kmul(INV(kmul(dx,dz)),ToReal(1.41723356009070294784580498866e-6)); + CCTK_REAL_VEC const p1o705600dydz = kmul(INV(kmul(dy,dz)),ToReal(1.41723356009070294784580498866e-6)); CCTK_REAL_VEC const p1o840dx = kmul(INV(dx),ToReal(0.00119047619047619047619047619048)); CCTK_REAL_VEC const p1o840dy = kmul(INV(dy),ToReal(0.00119047619047619047619047619048)); CCTK_REAL_VEC const p1o840dz = kmul(INV(dz),ToReal(0.00119047619047619047619047619048)); @@ -150,7 +148,7 @@ static void ML_ADM_convertFromADMBase_Body(cGH const * restrict const cctkGH, in /* Loop over the grid points */ #pragma omp parallel - LC_LOOP3VEC (ML_ADM_convertFromADMBase, + LC_LOOP3VEC(ML_ADM_convertFromADMBase, 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_REAL_VEC_SIZE) @@ -230,96 +228,26 @@ static void ML_ADM_convertFromADMBase_Body(cGH const * restrict const cctkGH, in CCTK_REAL_VEC beta3L = betazL; - /* If necessary, store only partial vectors after the first iteration */ - - if (CCTK_REAL_VEC_SIZE > 2 && CCTK_BUILTIN_EXPECT(i < lc_imin && i+CCTK_REAL_VEC_SIZE > lc_imax, 0)) - { - ptrdiff_t const elt_count_lo = lc_imin-i; - ptrdiff_t const elt_count_hi = lc_imax-i; - vec_store_nta_partial_mid(alpha[index],alphaL,elt_count_lo,elt_count_hi); - vec_store_nta_partial_mid(beta1[index],beta1L,elt_count_lo,elt_count_hi); - vec_store_nta_partial_mid(beta2[index],beta2L,elt_count_lo,elt_count_hi); - vec_store_nta_partial_mid(beta3[index],beta3L,elt_count_lo,elt_count_hi); - vec_store_nta_partial_mid(g11[index],g11L,elt_count_lo,elt_count_hi); - vec_store_nta_partial_mid(g12[index],g12L,elt_count_lo,elt_count_hi); - vec_store_nta_partial_mid(g13[index],g13L,elt_count_lo,elt_count_hi); - vec_store_nta_partial_mid(g22[index],g22L,elt_count_lo,elt_count_hi); - vec_store_nta_partial_mid(g23[index],g23L,elt_count_lo,elt_count_hi); - vec_store_nta_partial_mid(g33[index],g33L,elt_count_lo,elt_count_hi); - vec_store_nta_partial_mid(K11[index],K11L,elt_count_lo,elt_count_hi); - vec_store_nta_partial_mid(K12[index],K12L,elt_count_lo,elt_count_hi); - vec_store_nta_partial_mid(K13[index],K13L,elt_count_lo,elt_count_hi); - vec_store_nta_partial_mid(K22[index],K22L,elt_count_lo,elt_count_hi); - vec_store_nta_partial_mid(K23[index],K23L,elt_count_lo,elt_count_hi); - vec_store_nta_partial_mid(K33[index],K33L,elt_count_lo,elt_count_hi); - break; - } - - /* If necessary, store only partial vectors after the first iteration */ - - if (CCTK_REAL_VEC_SIZE > 1 && CCTK_BUILTIN_EXPECT(i < lc_imin, 0)) - { - ptrdiff_t const elt_count = lc_imin-i; - vec_store_nta_partial_hi(alpha[index],alphaL,elt_count); - vec_store_nta_partial_hi(beta1[index],beta1L,elt_count); - vec_store_nta_partial_hi(beta2[index],beta2L,elt_count); - vec_store_nta_partial_hi(beta3[index],beta3L,elt_count); - vec_store_nta_partial_hi(g11[index],g11L,elt_count); - vec_store_nta_partial_hi(g12[index],g12L,elt_count); - vec_store_nta_partial_hi(g13[index],g13L,elt_count); - vec_store_nta_partial_hi(g22[index],g22L,elt_count); - vec_store_nta_partial_hi(g23[index],g23L,elt_count); - vec_store_nta_partial_hi(g33[index],g33L,elt_count); - vec_store_nta_partial_hi(K11[index],K11L,elt_count); - vec_store_nta_partial_hi(K12[index],K12L,elt_count); - vec_store_nta_partial_hi(K13[index],K13L,elt_count); - vec_store_nta_partial_hi(K22[index],K22L,elt_count); - vec_store_nta_partial_hi(K23[index],K23L,elt_count); - vec_store_nta_partial_hi(K33[index],K33L,elt_count); - continue; - } - - /* If necessary, store only partial vectors after the last iteration */ - - if (CCTK_REAL_VEC_SIZE > 1 && CCTK_BUILTIN_EXPECT(i+CCTK_REAL_VEC_SIZE > lc_imax, 0)) - { - ptrdiff_t const elt_count = lc_imax-i; - vec_store_nta_partial_lo(alpha[index],alphaL,elt_count); - vec_store_nta_partial_lo(beta1[index],beta1L,elt_count); - vec_store_nta_partial_lo(beta2[index],beta2L,elt_count); - vec_store_nta_partial_lo(beta3[index],beta3L,elt_count); - vec_store_nta_partial_lo(g11[index],g11L,elt_count); - vec_store_nta_partial_lo(g12[index],g12L,elt_count); - vec_store_nta_partial_lo(g13[index],g13L,elt_count); - vec_store_nta_partial_lo(g22[index],g22L,elt_count); - vec_store_nta_partial_lo(g23[index],g23L,elt_count); - vec_store_nta_partial_lo(g33[index],g33L,elt_count); - vec_store_nta_partial_lo(K11[index],K11L,elt_count); - vec_store_nta_partial_lo(K12[index],K12L,elt_count); - vec_store_nta_partial_lo(K13[index],K13L,elt_count); - vec_store_nta_partial_lo(K22[index],K22L,elt_count); - vec_store_nta_partial_lo(K23[index],K23L,elt_count); - vec_store_nta_partial_lo(K33[index],K33L,elt_count); - break; - } - vec_store_nta(alpha[index],alphaL); - vec_store_nta(beta1[index],beta1L); - vec_store_nta(beta2[index],beta2L); - vec_store_nta(beta3[index],beta3L); - vec_store_nta(g11[index],g11L); - vec_store_nta(g12[index],g12L); - vec_store_nta(g13[index],g13L); - vec_store_nta(g22[index],g22L); - vec_store_nta(g23[index],g23L); - vec_store_nta(g33[index],g33L); - vec_store_nta(K11[index],K11L); - vec_store_nta(K12[index],K12L); - vec_store_nta(K13[index],K13L); - vec_store_nta(K22[index],K22L); - vec_store_nta(K23[index],K23L); - vec_store_nta(K33[index],K33L); + /* Copy local copies back to grid functions */ + vec_store_partial_prepare(i,lc_imin,lc_imax); + vec_store_nta_partial(alpha[index],alphaL); + vec_store_nta_partial(beta1[index],beta1L); + vec_store_nta_partial(beta2[index],beta2L); + vec_store_nta_partial(beta3[index],beta3L); + vec_store_nta_partial(g11[index],g11L); + vec_store_nta_partial(g12[index],g12L); + vec_store_nta_partial(g13[index],g13L); + vec_store_nta_partial(g22[index],g22L); + vec_store_nta_partial(g23[index],g23L); + vec_store_nta_partial(g33[index],g33L); + vec_store_nta_partial(K11[index],K11L); + vec_store_nta_partial(K12[index],K12L); + vec_store_nta_partial(K13[index],K13L); + vec_store_nta_partial(K22[index],K22L); + vec_store_nta_partial(K23[index],K23L); + vec_store_nta_partial(K33[index],K33L); } - LC_ENDLOOP3VEC (ML_ADM_convertFromADMBase); + LC_ENDLOOP3VEC(ML_ADM_convertFromADMBase); } extern "C" void ML_ADM_convertFromADMBase(CCTK_ARGUMENTS) @@ -338,7 +266,15 @@ extern "C" void ML_ADM_convertFromADMBase(CCTK_ARGUMENTS) return; } - const char *groups[] = {"ADMBase::curv","ADMBase::lapse","ADMBase::metric","ADMBase::shift","ML_ADM::ML_curv","ML_ADM::ML_lapse","ML_ADM::ML_metric","ML_ADM::ML_shift"}; + const char *const groups[] = { + "ADMBase::curv", + "ADMBase::lapse", + "ADMBase::metric", + "ADMBase::shift", + "ML_ADM::ML_curv", + "ML_ADM::ML_lapse", + "ML_ADM::ML_metric", + "ML_ADM::ML_shift"}; GenericFD_AssertGroupStorage(cctkGH, "ML_ADM_convertFromADMBase", 8, groups); switch(fdOrder) @@ -356,7 +292,7 @@ extern "C" void ML_ADM_convertFromADMBase(CCTK_ARGUMENTS) break; } - GenericFD_LoopOverEverything(cctkGH, &ML_ADM_convertFromADMBase_Body); + GenericFD_LoopOverEverything(cctkGH, ML_ADM_convertFromADMBase_Body); if (verbose > 1) { |