diff options
Diffstat (limited to 'ML_BSSN/src/ML_BSSN_RHS1.cc')
| -rw-r--r-- | ML_BSSN/src/ML_BSSN_RHS1.cc | 97 |
1 files changed, 55 insertions, 42 deletions
diff --git a/ML_BSSN/src/ML_BSSN_RHS1.cc b/ML_BSSN/src/ML_BSSN_RHS1.cc index e5b7817..9e64eab 100644 --- a/ML_BSSN/src/ML_BSSN_RHS1.cc +++ b/ML_BSSN/src/ML_BSSN_RHS1.cc @@ -55,7 +55,7 @@ extern "C" void ML_BSSN_RHS1_SelectBCs(CCTK_ARGUMENTS) return; } -static void ML_BSSN_RHS1_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[]) +static void ML_BSSN_RHS1_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[]) { DECLARE_CCTK_ARGUMENTS; DECLARE_CCTK_PARAMETERS; @@ -63,38 +63,6 @@ static void ML_BSSN_RHS1_Body(cGH const * restrict const cctkGH, int const dir, /* Declare finite differencing variables */ - if (verbose > 1) - { - CCTK_VInfo(CCTK_THORNSTRING,"Entering ML_BSSN_RHS1_Body"); - } - - if (cctk_iteration % ML_BSSN_RHS1_calc_every != ML_BSSN_RHS1_calc_offset) - { - return; - } - - const char *groups[] = {"grid::coordinates","Grid::coordinates","ML_BSSN::ML_curv","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_RHS1", 19, groups); - - switch(fdOrder) - { - case 2: - GenericFD_EnsureStencilFits(cctkGH, "ML_BSSN_RHS1", 1, 1, 1); - break; - - case 4: - GenericFD_EnsureStencilFits(cctkGH, "ML_BSSN_RHS1", 2, 2, 2); - break; - - case 6: - GenericFD_EnsureStencilFits(cctkGH, "ML_BSSN_RHS1", 3, 3, 3); - break; - - case 8: - GenericFD_EnsureStencilFits(cctkGH, "ML_BSSN_RHS1", 4, 4, 4); - break; - } - /* Include user-supplied include files */ /* Initialise finite differencing variables */ @@ -108,6 +76,7 @@ static void ML_BSSN_RHS1_Body(cGH const * restrict const cctkGH, int const dir, CCTK_REAL_VEC const dy = ToReal(CCTK_DELTA_SPACE(1)); CCTK_REAL_VEC const dz = ToReal(CCTK_DELTA_SPACE(2)); CCTK_REAL_VEC const dt = ToReal(CCTK_DELTA_TIME); + CCTK_REAL_VEC const t = ToReal(cctk_time); CCTK_REAL_VEC const dxi = INV(dx); CCTK_REAL_VEC const dyi = INV(dy); CCTK_REAL_VEC const dzi = INV(dz); @@ -245,10 +214,18 @@ static void ML_BSSN_RHS1_Body(cGH const * restrict const cctkGH, int const dir, CCTK_REAL const *restrict const dJ323 = use_jacobian ? jacobian_derivative_ptrs[16] : 0; CCTK_REAL const *restrict const dJ333 = use_jacobian ? jacobian_derivative_ptrs[17] : 0; + /* Assign local copies of arrays functions */ + + + + /* Calculate temporaries and arrays functions */ + + /* Copy local copies back to grid functions */ + /* Loop over the grid points */ #pragma omp parallel LC_LOOP3VEC (ML_BSSN_RHS1, - i,j,k, min[0],min[1],min[2], max[0],max[1],max[2], + 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) { @@ -665,6 +642,12 @@ static void ML_BSSN_RHS1_Body(cGH const * restrict const cctkGH, int const dir, } /* Calculate temporaries and grid functions */ + ptrdiff_t dir1 = Sign(beta1L); + + ptrdiff_t dir2 = Sign(beta2L); + + ptrdiff_t dir3 = Sign(beta3L); + CCTK_REAL_VEC JacPDstandardNth11alpha; CCTK_REAL_VEC JacPDstandardNth11beta1; CCTK_REAL_VEC JacPDstandardNth11beta2; @@ -1103,12 +1086,6 @@ static void ML_BSSN_RHS1_Body(cGH const * restrict const cctkGH, int const dir, JacPDstandardNth32beta3 = PDstandardNth23beta3; } - ptrdiff_t dir1 = Sign(beta1L); - - ptrdiff_t dir2 = Sign(beta2L); - - ptrdiff_t dir3 = Sign(beta3L); - CCTK_REAL_VEC detgt = ToReal(1); CCTK_REAL_VEC gtu11 = kmul(INV(detgt),kmsub(gt22L,gt33L,SQR(gt23L))); @@ -1463,8 +1440,6 @@ static void ML_BSSN_RHS1_Body(cGH const * restrict const cctkGH, int const dir, vec_store_nta_partial_lo(Xt3rhs[index],Xt3rhsL,elt_count); break; } - - /* Copy local copies back to grid functions */ vec_store_nta(alpharhs[index],alpharhsL); vec_store_nta(Arhs[index],ArhsL); vec_store_nta(B1rhs[index],B1rhsL); @@ -1493,5 +1468,43 @@ extern "C" void ML_BSSN_RHS1(CCTK_ARGUMENTS) DECLARE_CCTK_ARGUMENTS; DECLARE_CCTK_PARAMETERS; + + if (verbose > 1) + { + CCTK_VInfo(CCTK_THORNSTRING,"Entering ML_BSSN_RHS1_Body"); + } + + if (cctk_iteration % ML_BSSN_RHS1_calc_every != ML_BSSN_RHS1_calc_offset) + { + return; + } + + const char *groups[] = {"grid::coordinates","Grid::coordinates","ML_BSSN::ML_curv","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_RHS1", 19, groups); + + switch(fdOrder) + { + case 2: + GenericFD_EnsureStencilFits(cctkGH, "ML_BSSN_RHS1", 1, 1, 1); + break; + + case 4: + GenericFD_EnsureStencilFits(cctkGH, "ML_BSSN_RHS1", 2, 2, 2); + break; + + case 6: + GenericFD_EnsureStencilFits(cctkGH, "ML_BSSN_RHS1", 3, 3, 3); + break; + + case 8: + GenericFD_EnsureStencilFits(cctkGH, "ML_BSSN_RHS1", 4, 4, 4); + break; + } + GenericFD_LoopOverInterior(cctkGH, &ML_BSSN_RHS1_Body); + + if (verbose > 1) + { + CCTK_VInfo(CCTK_THORNSTRING,"Leaving ML_BSSN_RHS1_Body"); + } } |