diff options
Diffstat (limited to 'ML_BSSN/src/ML_BSSN_Advect.cc')
| -rw-r--r-- | ML_BSSN/src/ML_BSSN_Advect.cc | 203 |
1 files changed, 61 insertions, 142 deletions
diff --git a/ML_BSSN/src/ML_BSSN_Advect.cc b/ML_BSSN/src/ML_BSSN_Advect.cc index 9dffd24..2543f21 100644 --- a/ML_BSSN/src/ML_BSSN_Advect.cc +++ b/ML_BSSN/src/ML_BSSN_Advect.cc @@ -65,8 +65,6 @@ static void ML_BSSN_Advect_Body(cGH const * restrict const cctkGH, int const dir DECLARE_CCTK_PARAMETERS; - /* Declare finite differencing variables */ - /* Include user-supplied include files */ /* Initialise finite differencing variables */ @@ -103,9 +101,9 @@ static void ML_BSSN_Advect_Body(cGH const * restrict const cctkGH, int const dir 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 p1o1680dx = kmul(INV(dx),ToReal(0.000595238095238095238095238095238)); CCTK_REAL_VEC const p1o1680dy = kmul(INV(dy),ToReal(0.000595238095238095238095238095238)); CCTK_REAL_VEC const p1o1680dz = kmul(INV(dz),ToReal(0.000595238095238095238095238095238)); @@ -124,14 +122,14 @@ static void ML_BSSN_Advect_Body(cGH const * restrict const cctkGH, int const dir 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 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 p1o4dx = kmul(INV(dx),ToReal(0.25)); - 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 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 p1o4dy = kmul(INV(dy),ToReal(0.25)); - CCTK_REAL_VEC const p1o4dydz = kmul(INV(dy),kmul(INV(dz),ToReal(0.25))); + CCTK_REAL_VEC const p1o4dydz = kmul(INV(kmul(dy,dz)),ToReal(0.25)); CCTK_REAL_VEC const p1o4dz = kmul(INV(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)); @@ -145,9 +143,9 @@ static void ML_BSSN_Advect_Body(cGH const * restrict const cctkGH, int const dir CCTK_REAL_VEC const p1o64dx = kmul(INV(dx),ToReal(0.015625)); CCTK_REAL_VEC const p1o64dy = kmul(INV(dy),ToReal(0.015625)); CCTK_REAL_VEC const p1o64dz = kmul(INV(dz),ToReal(0.015625)); - 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)); @@ -228,7 +226,7 @@ static void ML_BSSN_Advect_Body(cGH const * restrict const cctkGH, int const dir /* Loop over the grid points */ #pragma omp parallel - LC_LOOP3VEC (ML_BSSN_Advect, + LC_LOOP3VEC(ML_BSSN_Advect, 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) @@ -2061,132 +2059,35 @@ static void ML_BSSN_Advect_Body(cGH const * restrict const cctkGH, int const dir B3rhsL = kmadd(kmsub(kmadd(beta1L,JacPDupwindNthAnti1B3,kmadd(beta2L,JacPDupwindNthAnti2B3,kmadd(beta3L,JacPDupwindNthAnti3B3,kmadd(JacPDupwindNthSymm1B3,kfabs(beta1L),kmadd(JacPDupwindNthSymm2B3,kfabs(beta2L),kmul(JacPDupwindNthSymm3B3,kfabs(beta3L))))))),ToReal(ShiftAdvectionCoeff),kmul(kmadd(beta1L,JacPDupwindNthAnti1Xt3,kmadd(beta2L,JacPDupwindNthAnti2Xt3,kmadd(beta3L,JacPDupwindNthAnti3Xt3,kmadd(JacPDupwindNthSymm1Xt3,kfabs(beta1L),kmadd(JacPDupwindNthSymm2Xt3,kfabs(beta2L),kmul(JacPDupwindNthSymm3Xt3,kfabs(beta3L))))))),kadd(ToReal(-1),ToReal(ShiftAdvectionCoeff)))),ToReal(ShiftBCoeff),B3rhsL); - /* 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(alpharhs[index],alpharhsL,elt_count_lo,elt_count_hi); - vec_store_nta_partial_mid(Arhs[index],ArhsL,elt_count_lo,elt_count_hi); - vec_store_nta_partial_mid(At11rhs[index],At11rhsL,elt_count_lo,elt_count_hi); - vec_store_nta_partial_mid(At12rhs[index],At12rhsL,elt_count_lo,elt_count_hi); - vec_store_nta_partial_mid(At13rhs[index],At13rhsL,elt_count_lo,elt_count_hi); - vec_store_nta_partial_mid(At22rhs[index],At22rhsL,elt_count_lo,elt_count_hi); - vec_store_nta_partial_mid(At23rhs[index],At23rhsL,elt_count_lo,elt_count_hi); - vec_store_nta_partial_mid(At33rhs[index],At33rhsL,elt_count_lo,elt_count_hi); - vec_store_nta_partial_mid(B1rhs[index],B1rhsL,elt_count_lo,elt_count_hi); - vec_store_nta_partial_mid(B2rhs[index],B2rhsL,elt_count_lo,elt_count_hi); - vec_store_nta_partial_mid(B3rhs[index],B3rhsL,elt_count_lo,elt_count_hi); - vec_store_nta_partial_mid(beta1rhs[index],beta1rhsL,elt_count_lo,elt_count_hi); - vec_store_nta_partial_mid(beta2rhs[index],beta2rhsL,elt_count_lo,elt_count_hi); - vec_store_nta_partial_mid(beta3rhs[index],beta3rhsL,elt_count_lo,elt_count_hi); - vec_store_nta_partial_mid(gt11rhs[index],gt11rhsL,elt_count_lo,elt_count_hi); - vec_store_nta_partial_mid(gt12rhs[index],gt12rhsL,elt_count_lo,elt_count_hi); - vec_store_nta_partial_mid(gt13rhs[index],gt13rhsL,elt_count_lo,elt_count_hi); - vec_store_nta_partial_mid(gt22rhs[index],gt22rhsL,elt_count_lo,elt_count_hi); - vec_store_nta_partial_mid(gt23rhs[index],gt23rhsL,elt_count_lo,elt_count_hi); - vec_store_nta_partial_mid(gt33rhs[index],gt33rhsL,elt_count_lo,elt_count_hi); - vec_store_nta_partial_mid(phirhs[index],phirhsL,elt_count_lo,elt_count_hi); - vec_store_nta_partial_mid(trKrhs[index],trKrhsL,elt_count_lo,elt_count_hi); - vec_store_nta_partial_mid(Xt1rhs[index],Xt1rhsL,elt_count_lo,elt_count_hi); - vec_store_nta_partial_mid(Xt2rhs[index],Xt2rhsL,elt_count_lo,elt_count_hi); - vec_store_nta_partial_mid(Xt3rhs[index],Xt3rhsL,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(alpharhs[index],alpharhsL,elt_count); - vec_store_nta_partial_hi(Arhs[index],ArhsL,elt_count); - vec_store_nta_partial_hi(At11rhs[index],At11rhsL,elt_count); - vec_store_nta_partial_hi(At12rhs[index],At12rhsL,elt_count); - vec_store_nta_partial_hi(At13rhs[index],At13rhsL,elt_count); - vec_store_nta_partial_hi(At22rhs[index],At22rhsL,elt_count); - vec_store_nta_partial_hi(At23rhs[index],At23rhsL,elt_count); - vec_store_nta_partial_hi(At33rhs[index],At33rhsL,elt_count); - vec_store_nta_partial_hi(B1rhs[index],B1rhsL,elt_count); - vec_store_nta_partial_hi(B2rhs[index],B2rhsL,elt_count); - vec_store_nta_partial_hi(B3rhs[index],B3rhsL,elt_count); - vec_store_nta_partial_hi(beta1rhs[index],beta1rhsL,elt_count); - vec_store_nta_partial_hi(beta2rhs[index],beta2rhsL,elt_count); - vec_store_nta_partial_hi(beta3rhs[index],beta3rhsL,elt_count); - vec_store_nta_partial_hi(gt11rhs[index],gt11rhsL,elt_count); - vec_store_nta_partial_hi(gt12rhs[index],gt12rhsL,elt_count); - vec_store_nta_partial_hi(gt13rhs[index],gt13rhsL,elt_count); - vec_store_nta_partial_hi(gt22rhs[index],gt22rhsL,elt_count); - vec_store_nta_partial_hi(gt23rhs[index],gt23rhsL,elt_count); - vec_store_nta_partial_hi(gt33rhs[index],gt33rhsL,elt_count); - vec_store_nta_partial_hi(phirhs[index],phirhsL,elt_count); - vec_store_nta_partial_hi(trKrhs[index],trKrhsL,elt_count); - vec_store_nta_partial_hi(Xt1rhs[index],Xt1rhsL,elt_count); - vec_store_nta_partial_hi(Xt2rhs[index],Xt2rhsL,elt_count); - vec_store_nta_partial_hi(Xt3rhs[index],Xt3rhsL,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(alpharhs[index],alpharhsL,elt_count); - vec_store_nta_partial_lo(Arhs[index],ArhsL,elt_count); - vec_store_nta_partial_lo(At11rhs[index],At11rhsL,elt_count); - vec_store_nta_partial_lo(At12rhs[index],At12rhsL,elt_count); - vec_store_nta_partial_lo(At13rhs[index],At13rhsL,elt_count); - vec_store_nta_partial_lo(At22rhs[index],At22rhsL,elt_count); - vec_store_nta_partial_lo(At23rhs[index],At23rhsL,elt_count); - vec_store_nta_partial_lo(At33rhs[index],At33rhsL,elt_count); - vec_store_nta_partial_lo(B1rhs[index],B1rhsL,elt_count); - vec_store_nta_partial_lo(B2rhs[index],B2rhsL,elt_count); - vec_store_nta_partial_lo(B3rhs[index],B3rhsL,elt_count); - vec_store_nta_partial_lo(beta1rhs[index],beta1rhsL,elt_count); - vec_store_nta_partial_lo(beta2rhs[index],beta2rhsL,elt_count); - vec_store_nta_partial_lo(beta3rhs[index],beta3rhsL,elt_count); - vec_store_nta_partial_lo(gt11rhs[index],gt11rhsL,elt_count); - vec_store_nta_partial_lo(gt12rhs[index],gt12rhsL,elt_count); - vec_store_nta_partial_lo(gt13rhs[index],gt13rhsL,elt_count); - vec_store_nta_partial_lo(gt22rhs[index],gt22rhsL,elt_count); - vec_store_nta_partial_lo(gt23rhs[index],gt23rhsL,elt_count); - vec_store_nta_partial_lo(gt33rhs[index],gt33rhsL,elt_count); - vec_store_nta_partial_lo(phirhs[index],phirhsL,elt_count); - vec_store_nta_partial_lo(trKrhs[index],trKrhsL,elt_count); - vec_store_nta_partial_lo(Xt1rhs[index],Xt1rhsL,elt_count); - vec_store_nta_partial_lo(Xt2rhs[index],Xt2rhsL,elt_count); - vec_store_nta_partial_lo(Xt3rhs[index],Xt3rhsL,elt_count); - break; - } - vec_store_nta(alpharhs[index],alpharhsL); - vec_store_nta(Arhs[index],ArhsL); - vec_store_nta(At11rhs[index],At11rhsL); - vec_store_nta(At12rhs[index],At12rhsL); - vec_store_nta(At13rhs[index],At13rhsL); - vec_store_nta(At22rhs[index],At22rhsL); - vec_store_nta(At23rhs[index],At23rhsL); - vec_store_nta(At33rhs[index],At33rhsL); - vec_store_nta(B1rhs[index],B1rhsL); - vec_store_nta(B2rhs[index],B2rhsL); - vec_store_nta(B3rhs[index],B3rhsL); - vec_store_nta(beta1rhs[index],beta1rhsL); - vec_store_nta(beta2rhs[index],beta2rhsL); - vec_store_nta(beta3rhs[index],beta3rhsL); - vec_store_nta(gt11rhs[index],gt11rhsL); - vec_store_nta(gt12rhs[index],gt12rhsL); - vec_store_nta(gt13rhs[index],gt13rhsL); - vec_store_nta(gt22rhs[index],gt22rhsL); - vec_store_nta(gt23rhs[index],gt23rhsL); - vec_store_nta(gt33rhs[index],gt33rhsL); - vec_store_nta(phirhs[index],phirhsL); - vec_store_nta(trKrhs[index],trKrhsL); - vec_store_nta(Xt1rhs[index],Xt1rhsL); - vec_store_nta(Xt2rhs[index],Xt2rhsL); - vec_store_nta(Xt3rhs[index],Xt3rhsL); + /* Copy local copies back to grid functions */ + vec_store_partial_prepare(i,lc_imin,lc_imax); + vec_store_nta_partial(alpharhs[index],alpharhsL); + vec_store_nta_partial(Arhs[index],ArhsL); + vec_store_nta_partial(At11rhs[index],At11rhsL); + vec_store_nta_partial(At12rhs[index],At12rhsL); + vec_store_nta_partial(At13rhs[index],At13rhsL); + vec_store_nta_partial(At22rhs[index],At22rhsL); + vec_store_nta_partial(At23rhs[index],At23rhsL); + vec_store_nta_partial(At33rhs[index],At33rhsL); + vec_store_nta_partial(B1rhs[index],B1rhsL); + vec_store_nta_partial(B2rhs[index],B2rhsL); + vec_store_nta_partial(B3rhs[index],B3rhsL); + vec_store_nta_partial(beta1rhs[index],beta1rhsL); + vec_store_nta_partial(beta2rhs[index],beta2rhsL); + vec_store_nta_partial(beta3rhs[index],beta3rhsL); + vec_store_nta_partial(gt11rhs[index],gt11rhsL); + vec_store_nta_partial(gt12rhs[index],gt12rhsL); + vec_store_nta_partial(gt13rhs[index],gt13rhsL); + vec_store_nta_partial(gt22rhs[index],gt22rhsL); + vec_store_nta_partial(gt23rhs[index],gt23rhsL); + vec_store_nta_partial(gt33rhs[index],gt33rhsL); + vec_store_nta_partial(phirhs[index],phirhsL); + vec_store_nta_partial(trKrhs[index],trKrhsL); + vec_store_nta_partial(Xt1rhs[index],Xt1rhsL); + vec_store_nta_partial(Xt2rhs[index],Xt2rhsL); + vec_store_nta_partial(Xt3rhs[index],Xt3rhsL); } - LC_ENDLOOP3VEC (ML_BSSN_Advect); + LC_ENDLOOP3VEC(ML_BSSN_Advect); } extern "C" void ML_BSSN_Advect(CCTK_ARGUMENTS) @@ -2205,7 +2106,25 @@ extern "C" void ML_BSSN_Advect(CCTK_ARGUMENTS) return; } - const char *groups[] = {"ML_BSSN::ML_curv","ML_BSSN::ML_curvrhs","ML_BSSN::ML_dtlapse","ML_BSSN::ML_dtlapserhs","ML_BSSN::ML_dtshift","ML_BSSN::ML_dtshiftrhs","ML_BSSN::ML_Gamma","ML_BSSN::ML_Gammarhs","ML_BSSN::ML_lapse","ML_BSSN::ML_lapserhs","ML_BSSN::ML_log_confac","ML_BSSN::ML_log_confacrhs","ML_BSSN::ML_metric","ML_BSSN::ML_metricrhs","ML_BSSN::ML_shift","ML_BSSN::ML_shiftrhs","ML_BSSN::ML_trace_curv","ML_BSSN::ML_trace_curvrhs"}; + const char *const groups[] = { + "ML_BSSN::ML_curv", + "ML_BSSN::ML_curvrhs", + "ML_BSSN::ML_dtlapse", + "ML_BSSN::ML_dtlapserhs", + "ML_BSSN::ML_dtshift", + "ML_BSSN::ML_dtshiftrhs", + "ML_BSSN::ML_Gamma", + "ML_BSSN::ML_Gammarhs", + "ML_BSSN::ML_lapse", + "ML_BSSN::ML_lapserhs", + "ML_BSSN::ML_log_confac", + "ML_BSSN::ML_log_confacrhs", + "ML_BSSN::ML_metric", + "ML_BSSN::ML_metricrhs", + "ML_BSSN::ML_shift", + "ML_BSSN::ML_shiftrhs", + "ML_BSSN::ML_trace_curv", + "ML_BSSN::ML_trace_curvrhs"}; GenericFD_AssertGroupStorage(cctkGH, "ML_BSSN_Advect", 18, groups); switch(fdOrder) @@ -2227,7 +2146,7 @@ extern "C" void ML_BSSN_Advect(CCTK_ARGUMENTS) break; } - GenericFD_LoopOverInterior(cctkGH, &ML_BSSN_Advect_Body); + GenericFD_LoopOverInterior(cctkGH, ML_BSSN_Advect_Body); if (verbose > 1) { |