diff options
Diffstat (limited to 'ML_ADMQuantities/src/ML_ADMQuantities.cc')
| -rw-r--r-- | ML_ADMQuantities/src/ML_ADMQuantities.cc | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/ML_ADMQuantities/src/ML_ADMQuantities.cc b/ML_ADMQuantities/src/ML_ADMQuantities.cc index 301cf82..4bf679f 100644 --- a/ML_ADMQuantities/src/ML_ADMQuantities.cc +++ b/ML_ADMQuantities/src/ML_ADMQuantities.cc @@ -43,8 +43,6 @@ static void ML_ADMQuantities_Body(cGH const * restrict const cctkGH, int const d DECLARE_CCTK_PARAMETERS; - /* Declare finite differencing variables */ - /* Include user-supplied include files */ /* Initialise finite differencing variables */ @@ -75,9 +73,9 @@ static void ML_ADMQuantities_Body(cGH const * restrict const cctkGH, int const d CCTK_REAL const p1o12dx = 0.0833333333333333333333333333333*INV(dx); CCTK_REAL const p1o12dy = 0.0833333333333333333333333333333*INV(dy); CCTK_REAL const p1o12dz = 0.0833333333333333333333333333333*INV(dz); - CCTK_REAL const p1o144dxdy = 0.00694444444444444444444444444444*INV(dx)*INV(dy); - CCTK_REAL const p1o144dxdz = 0.00694444444444444444444444444444*INV(dx)*INV(dz); - CCTK_REAL const p1o144dydz = 0.00694444444444444444444444444444*INV(dy)*INV(dz); + CCTK_REAL const p1o144dxdy = 0.00694444444444444444444444444444*INV(dx*dy); + CCTK_REAL const p1o144dxdz = 0.00694444444444444444444444444444*INV(dx*dz); + CCTK_REAL const p1o144dydz = 0.00694444444444444444444444444444*INV(dy*dz); CCTK_REAL const p1odx = INV(dx); CCTK_REAL const p1ody = INV(dy); CCTK_REAL const p1odz = INV(dz); @@ -95,7 +93,7 @@ static void ML_ADMQuantities_Body(cGH const * restrict const cctkGH, int const d /* Loop over the grid points */ #pragma omp parallel - CCTK_LOOP3 (ML_ADMQuantities, + CCTK_LOOP3(ML_ADMQuantities, i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2], cctk_lsh[0],cctk_lsh[1],cctk_lsh[2]) { @@ -653,7 +651,7 @@ static void ML_ADMQuantities_Body(cGH const * restrict const cctkGH, int const d Jadm3[index] = Jadm3L; Madm[index] = MadmL; } - CCTK_ENDLOOP3 (ML_ADMQuantities); + CCTK_ENDLOOP3(ML_ADMQuantities); } extern "C" void ML_ADMQuantities(CCTK_ARGUMENTS) @@ -672,12 +670,23 @@ extern "C" void ML_ADMQuantities(CCTK_ARGUMENTS) 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::ML_Jadm","ML_ADMQuantities::ML_Madm"}; + const char *const 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::ML_Jadm", + "ML_ADMQuantities::ML_Madm"}; GenericFD_AssertGroupStorage(cctkGH, "ML_ADMQuantities", 11, groups); GenericFD_EnsureStencilFits(cctkGH, "ML_ADMQuantities", 2, 2, 2); - GenericFD_LoopOverInterior(cctkGH, &ML_ADMQuantities_Body); + GenericFD_LoopOverInterior(cctkGH, ML_ADMQuantities_Body); if (verbose > 1) { |