diff options
Diffstat (limited to 'ML_ADMQuantities_MP/src/ML_ADMQuantities_MP.cc')
| -rw-r--r-- | ML_ADMQuantities_MP/src/ML_ADMQuantities_MP.cc | 49 |
1 files changed, 32 insertions, 17 deletions
diff --git a/ML_ADMQuantities_MP/src/ML_ADMQuantities_MP.cc b/ML_ADMQuantities_MP/src/ML_ADMQuantities_MP.cc index bbe04b9..7ae000d 100644 --- a/ML_ADMQuantities_MP/src/ML_ADMQuantities_MP.cc +++ b/ML_ADMQuantities_MP/src/ML_ADMQuantities_MP.cc @@ -36,7 +36,7 @@ extern "C" void ML_ADMQuantities_MP_SelectBCs(CCTK_ARGUMENTS) return; } -static void ML_ADMQuantities_MP_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_ADMQuantities_MP_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; @@ -44,21 +44,6 @@ static void ML_ADMQuantities_MP_Body(cGH const * restrict const cctkGH, int cons /* Declare finite differencing variables */ - if (verbose > 1) - { - CCTK_VInfo(CCTK_THORNSTRING,"Entering ML_ADMQuantities_MP_Body"); - } - - if (cctk_iteration % ML_ADMQuantities_MP_calc_every != ML_ADMQuantities_MP_calc_offset) - { - return; - } - - const char *groups[] = {"grid::coordinates","Grid::coordinates","ML_BSSN::ML_curv","ML_BSSN::ML_Gamma","ML_BSSN::ML_lapse","ML_BSSN::ML_log_confac","ML_BSSN::ML_metric","ML_BSSN::ML_shift","ML_BSSN::ML_trace_curv","ML_ADMQuantities_MP::ML_Jadm","ML_ADMQuantities_MP::ML_Madm"}; - GenericFD_AssertGroupStorage(cctkGH, "ML_ADMQuantities_MP", 11, groups); - - GenericFD_EnsureStencilFits(cctkGH, "ML_ADMQuantities_MP", 2, 2, 2); - /* Include user-supplied include files */ /* Initialise finite differencing variables */ @@ -72,6 +57,7 @@ static void ML_ADMQuantities_MP_Body(cGH const * restrict const cctkGH, int cons CCTK_REAL const dy = ToReal(CCTK_DELTA_SPACE(1)); CCTK_REAL const dz = ToReal(CCTK_DELTA_SPACE(2)); CCTK_REAL const dt = ToReal(CCTK_DELTA_TIME); + CCTK_REAL const t = ToReal(cctk_time); CCTK_REAL const dxi = INV(dx); CCTK_REAL const dyi = INV(dy); CCTK_REAL const dzi = INV(dz); @@ -143,10 +129,18 @@ static void ML_ADMQuantities_MP_Body(cGH const * restrict const cctkGH, int cons 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_LOOP3 (ML_ADMQuantities_MP, - 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]) { ptrdiff_t const index = di*i + dj*j + dk*k; @@ -1506,5 +1500,26 @@ extern "C" void ML_ADMQuantities_MP(CCTK_ARGUMENTS) DECLARE_CCTK_ARGUMENTS; DECLARE_CCTK_PARAMETERS; + + if (verbose > 1) + { + CCTK_VInfo(CCTK_THORNSTRING,"Entering ML_ADMQuantities_MP_Body"); + } + + if (cctk_iteration % ML_ADMQuantities_MP_calc_every != ML_ADMQuantities_MP_calc_offset) + { + return; + } + + const char *groups[] = {"grid::coordinates","Grid::coordinates","ML_BSSN::ML_curv","ML_BSSN::ML_Gamma","ML_BSSN::ML_lapse","ML_BSSN::ML_log_confac","ML_BSSN::ML_metric","ML_BSSN::ML_shift","ML_BSSN::ML_trace_curv","ML_ADMQuantities_MP::ML_Jadm","ML_ADMQuantities_MP::ML_Madm"}; + GenericFD_AssertGroupStorage(cctkGH, "ML_ADMQuantities_MP", 11, groups); + + GenericFD_EnsureStencilFits(cctkGH, "ML_ADMQuantities_MP", 2, 2, 2); + GenericFD_LoopOverInterior(cctkGH, &ML_ADMQuantities_MP_Body); + + if (verbose > 1) + { + CCTK_VInfo(CCTK_THORNSTRING,"Leaving ML_ADMQuantities_MP_Body"); + } } |