diff options
Diffstat (limited to 'ML_hydro/src/hydro_con2prim.cc')
| -rw-r--r-- | ML_hydro/src/hydro_con2prim.cc | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/ML_hydro/src/hydro_con2prim.cc b/ML_hydro/src/hydro_con2prim.cc index f9e9188..716321d 100644 --- a/ML_hydro/src/hydro_con2prim.cc +++ b/ML_hydro/src/hydro_con2prim.cc @@ -12,6 +12,7 @@ #include "cctk_Parameters.h" #include "GenericFD.h" #include "Differencing.h" +#include "cctk_Loop.h" #include "loopcontrol.h" /* Define macros used in calculations */ @@ -27,8 +28,6 @@ static void hydro_con2prim_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 */ @@ -59,9 +58,9 @@ static void hydro_con2prim_Body(cGH const * restrict const cctkGH, int const dir CCTK_REAL const p1o2dx = 0.5*INV(dx); CCTK_REAL const p1o2dy = 0.5*INV(dy); CCTK_REAL const p1o2dz = 0.5*INV(dz); - CCTK_REAL const p1o4dxdy = 0.25*INV(dx)*INV(dy); - CCTK_REAL const p1o4dxdz = 0.25*INV(dx)*INV(dz); - CCTK_REAL const p1o4dydz = 0.25*INV(dy)*INV(dz); + CCTK_REAL const p1o4dxdy = 0.25*INV(dx*dy); + CCTK_REAL const p1o4dxdz = 0.25*INV(dx*dz); + CCTK_REAL const p1o4dydz = 0.25*INV(dy*dz); CCTK_REAL const p1odx2 = INV(SQR(dx)); CCTK_REAL const p1ody2 = INV(SQR(dy)); CCTK_REAL const p1odz2 = INV(SQR(dz)); @@ -76,7 +75,7 @@ static void hydro_con2prim_Body(cGH const * restrict const cctkGH, int const dir /* Loop over the grid points */ #pragma omp parallel - LC_LOOP3 (hydro_con2prim, + CCTK_LOOP3(hydro_con2prim, i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2], cctk_lsh[0],cctk_lsh[1],cctk_lsh[2]) { @@ -110,8 +109,8 @@ static void hydro_con2prim_Body(cGH const * restrict const cctkGH, int const dir vel3L = mom3L*INV(massL); - epsL = 0.5*INV(massL)*(2*eneL - massL*(SQR(vel1L) + SQR(vel2L) + - SQR(vel3L))); + epsL = 0.5*INV(massL)*(2*eneL - massL*(SQR(vel1L) + + SQR(vel2L) + SQR(vel3L))); CCTK_REAL pressL = epsL*rhoL*ToReal(Gamma); @@ -123,7 +122,7 @@ static void hydro_con2prim_Body(cGH const * restrict const cctkGH, int const dir vel2[index] = vel2L; vel3[index] = vel3L; } - LC_ENDLOOP3 (hydro_con2prim); + CCTK_ENDLOOP3(hydro_con2prim); } extern "C" void hydro_con2prim(CCTK_ARGUMENTS) @@ -142,11 +141,19 @@ extern "C" void hydro_con2prim(CCTK_ARGUMENTS) return; } - const char *groups[] = {"ML_hydro::ene_group","ML_hydro::eps_group","ML_hydro::mass_group","ML_hydro::mom_group","ML_hydro::press_group","ML_hydro::rho_group","ML_hydro::vel_group","ML_hydro::vol_group"}; + const char *const groups[] = { + "ML_hydro::ene_group", + "ML_hydro::eps_group", + "ML_hydro::mass_group", + "ML_hydro::mom_group", + "ML_hydro::press_group", + "ML_hydro::rho_group", + "ML_hydro::vel_group", + "ML_hydro::vol_group"}; GenericFD_AssertGroupStorage(cctkGH, "hydro_con2prim", 8, groups); - GenericFD_LoopOverEverything(cctkGH, &hydro_con2prim_Body); + GenericFD_LoopOverEverything(cctkGH, hydro_con2prim_Body); if (verbose > 1) { |