Skip to content

Commit

Permalink
[pre-commit.ci] auto fixes from pre-commit.com hooks
Browse files Browse the repository at this point in the history
for more information, see https://pre-commit.ci
  • Loading branch information
pre-commit-ci[bot] committed Jul 3, 2024
1 parent b7d6aea commit 42fcbb0
Show file tree
Hide file tree
Showing 6 changed files with 38 additions and 56 deletions.
6 changes: 2 additions & 4 deletions src/reconstruction/plm_cuda.h
Original file line number Diff line number Diff line change
Expand Up @@ -279,13 +279,11 @@ auto __device__ __inline__ PLM_Reconstruction(Real *dev_conserved, int const xid

// Limit the variables that aren't transformed by the characteristic projection
#ifdef DE
del_m.gas_energy = Van_Leer_Limiter(del_L.gas_energy, del_R.gas_energy,
del_C.gas_energy, del_G.gas_energy);
del_m.gas_energy = Van_Leer_Limiter(del_L.gas_energy, del_R.gas_energy, del_C.gas_energy, del_G.gas_energy);
#endif // DE
#ifdef SCALAR
for (int i = 0; i < NSCALARS; i++) {
del_m.scalar[i] = Van_Leer_Limiter(del_L.scalar[i], del_R.scalar[i],
del_C.scalar[i], del_G.scalar[i]);
del_m.scalar[i] = Van_Leer_Limiter(del_L.scalar[i], del_R.scalar[i], del_C.scalar[i], del_G.scalar[i]);
}
#endif // SCALAR
#else // PLMP
Expand Down
48 changes: 20 additions & 28 deletions src/reconstruction/ppmc_cuda.cu
Original file line number Diff line number Diff line change
Expand Up @@ -126,13 +126,13 @@ __global__ void PPMC_CTU(Real *dev_conserved, Real *dev_bounds_L, Real *dev_boun

// Limit the variables that aren't transformed by the characteristic projection
#ifdef DE
del_m_im1.gas_energy = reconstruction::Van_Leer_Limiter(
del_L.gas_energy, del_R.gas_energy, del_C.gas_energy, del_G.gas_energy);
del_m_im1.gas_energy =
reconstruction::Van_Leer_Limiter(del_L.gas_energy, del_R.gas_energy, del_C.gas_energy, del_G.gas_energy);
#endif // DE
#ifdef SCALAR
for (int i = 0; i < NSCALARS; i++) {
del_m_im1.scalar[i] = reconstruction::Van_Leer_Limiter(del_L.scalar[i], del_R.scalar[i],
del_C.scalar[i], del_G.scalar[i]);
del_m_im1.scalar[i] =
reconstruction::Van_Leer_Limiter(del_L.scalar[i], del_R.scalar[i], del_C.scalar[i], del_G.scalar[i]);
}
#endif // SCALAR

Expand Down Expand Up @@ -179,13 +179,13 @@ __global__ void PPMC_CTU(Real *dev_conserved, Real *dev_bounds_L, Real *dev_boun

// Limit the variables that aren't transformed by the characteristic projection
#ifdef DE
del_m_i.gas_energy = reconstruction::Van_Leer_Limiter(del_L.gas_energy, del_R.gas_energy,
del_C.gas_energy, del_G.gas_energy);
del_m_i.gas_energy =
reconstruction::Van_Leer_Limiter(del_L.gas_energy, del_R.gas_energy, del_C.gas_energy, del_G.gas_energy);
#endif // DE
#ifdef SCALAR
for (int i = 0; i < NSCALARS; i++) {
del_m_i.scalar[i] = reconstruction::Van_Leer_Limiter(del_L.scalar[i], del_R.scalar[i],
del_C.scalar[i], del_G.scalar[i]);
del_m_i.scalar[i] =
reconstruction::Van_Leer_Limiter(del_L.scalar[i], del_R.scalar[i], del_C.scalar[i], del_G.scalar[i]);
}
#endif // SCALAR

Expand Down Expand Up @@ -233,13 +233,13 @@ __global__ void PPMC_CTU(Real *dev_conserved, Real *dev_bounds_L, Real *dev_boun

// Limit the variables that aren't transformed by the characteristic projection
#ifdef DE
del_m_ip1.gas_energy = reconstruction::Van_Leer_Limiter(
del_L.gas_energy, del_R.gas_energy, del_C.gas_energy, del_G.gas_energy);
del_m_ip1.gas_energy =
reconstruction::Van_Leer_Limiter(del_L.gas_energy, del_R.gas_energy, del_C.gas_energy, del_G.gas_energy);
#endif // DE
#ifdef SCALAR
for (int i = 0; i < NSCALARS; i++) {
del_m_ip1.scalar[i] = reconstruction::Van_Leer_Limiter(del_L.scalar[i], del_R.scalar[i],
del_C.scalar[i], del_G.scalar[i]);
del_m_ip1.scalar[i] =
reconstruction::Van_Leer_Limiter(del_L.scalar[i], del_R.scalar[i], del_C.scalar[i], del_G.scalar[i]);
}
#endif // SCALAR

Expand Down Expand Up @@ -274,16 +274,14 @@ __global__ void PPMC_CTU(Real *dev_conserved, Real *dev_bounds_L, Real *dev_boun

#ifdef DE
del_m_i.gas_energy = interface_L_iph.gas_energy - interface_R_imh.gas_energy;
Real const ge_6 = 6.0 * (cell_i.gas_energy -
0.5 * (interface_R_imh.gas_energy + interface_L_iph.gas_energy));
Real const ge_6 = 6.0 * (cell_i.gas_energy - 0.5 * (interface_R_imh.gas_energy + interface_L_iph.gas_energy));
#endif // DE

#ifdef SCALAR
Real scalar_6[NSCALARS];
for (int i = 0; i < NSCALARS; i++) {
del_m_i.scalar[i] = interface_L_iph.scalar[i] - interface_R_imh.scalar[i];
scalar_6[i] = 6.0 * (cell_i.scalar[i] -
0.5 * (interface_R_imh.scalar[i] + interface_L_iph.scalar[i]));
scalar_6[i] = 6.0 * (cell_i.scalar[i] - 0.5 * (interface_R_imh.scalar[i] + interface_L_iph.scalar[i]));
}
#endif // SCALAR

Expand Down Expand Up @@ -354,12 +352,10 @@ __global__ void PPMC_CTU(Real *dev_conserved, Real *dev_bounds_L, Real *dev_boun
for (int i = 0; i < NSCALARS; i++) {
interface_L_iph.scalar[i] =
interface_L_iph.scalar[i] -
lambda_max * (0.5 * dtodx) *
(del_m_i.scalar[i] - (1.0 - (2.0 / 3.0) * lambda_max * dtodx) * scalar_6[i]);
lambda_max * (0.5 * dtodx) * (del_m_i.scalar[i] - (1.0 - (2.0 / 3.0) * lambda_max * dtodx) * scalar_6[i]);
interface_R_imh.scalar[i] =
interface_R_imh.scalar[i] -
lambda_min * (0.5 * dtodx) *
(del_m_i.scalar[i] + (1.0 + (2.0 / 3.0) * lambda_min * dtodx) * scalar_6[i]);
lambda_min * (0.5 * dtodx) * (del_m_i.scalar[i] + (1.0 + (2.0 / 3.0) * lambda_min * dtodx) * scalar_6[i]);
}
#endif // SCALAR

Expand Down Expand Up @@ -680,17 +676,13 @@ __global__ __launch_bounds__(TPB) void PPMC_VL(Real *dev_conserved, Real *dev_bo

// Compute the interfaces for the variables that don't have characteristics
#ifdef DE
reconstruction::PPM_Single_Variable(cell_im2.gas_energy, cell_im1.gas_energy,
cell_i.gas_energy, cell_ip1.gas_energy,
cell_ip2.gas_energy, interface_L_iph.gas_energy,
interface_R_imh.gas_energy);
reconstruction::PPM_Single_Variable(cell_im2.gas_energy, cell_im1.gas_energy, cell_i.gas_energy, cell_ip1.gas_energy,
cell_ip2.gas_energy, interface_L_iph.gas_energy, interface_R_imh.gas_energy);
#endif // DE
#ifdef SCALAR
for (int i = 0; i < NSCALARS; i++) {
reconstruction::PPM_Single_Variable(cell_im2.scalar[i], cell_im1.scalar[i],
cell_i.scalar[i], cell_ip1.scalar[i],
cell_ip2.scalar[i], interface_L_iph.scalar[i],
interface_R_imh.scalar[i]);
reconstruction::PPM_Single_Variable(cell_im2.scalar[i], cell_im1.scalar[i], cell_i.scalar[i], cell_ip1.scalar[i],
cell_ip2.scalar[i], interface_L_iph.scalar[i], interface_R_imh.scalar[i]);
}
#endif // SCALAR

Expand Down
23 changes: 9 additions & 14 deletions src/reconstruction/reconstruction_internals.h
Original file line number Diff line number Diff line change
Expand Up @@ -650,13 +650,11 @@ hydro_utilities::Primitive __device__ __host__ __inline__ Van_Leer_Limiter(hydro
#endif // MHD

#ifdef DE
del_m.gas_energy = Van_Leer_Limiter(del_L.gas_energy, del_R.gas_energy,
del_C.gas_energy, del_G.gas_energy);
del_m.gas_energy = Van_Leer_Limiter(del_L.gas_energy, del_R.gas_energy, del_C.gas_energy, del_G.gas_energy);
#endif // DE
#ifdef SCALAR
for (int i = 0; i < NSCALARS; i++) {
del_m.scalar[i] = Van_Leer_Limiter(del_L.scalar[i], del_R.scalar[i],
del_C.scalar[i], del_G.scalar[i]);
del_m.scalar[i] = Van_Leer_Limiter(del_L.scalar[i], del_R.scalar[i], del_C.scalar[i], del_G.scalar[i]);
}
#endif // SCALAR

Expand Down Expand Up @@ -727,13 +725,13 @@ void __device__ __host__ __inline__ Monotonize_Parabolic_Interface(hydro_utiliti
#endif // MHD

#ifdef DE
Monotonize(cell_i.gas_energy, cell_im1.gas_energy, cell_ip1.gas_energy,
interface_L_iph.gas_energy, interface_R_imh.gas_energy);
Monotonize(cell_i.gas_energy, cell_im1.gas_energy, cell_ip1.gas_energy, interface_L_iph.gas_energy,
interface_R_imh.gas_energy);
#endif // DE
#ifdef SCALAR
for (int i = 0; i < NSCALARS; i++) {
Monotonize(cell_i.scalar[i], cell_im1.scalar[i], cell_ip1.scalar[i],
interface_L_iph.scalar[i], interface_R_imh.scalar[i]);
Monotonize(cell_i.scalar[i], cell_im1.scalar[i], cell_ip1.scalar[i], interface_L_iph.scalar[i],
interface_R_imh.scalar[i]);
}
#endif // SCALAR
}
Expand Down Expand Up @@ -817,13 +815,11 @@ hydro_utilities::Primitive __device__ __host__ __inline__ Calc_Interface_Parabol
#endif // MHD

#ifdef DE
output.gas_energy = interface(cell_i.gas_energy, cell_im1.gas_energy,
slopes_i.gas_energy, slopes_im1.gas_energy);
output.gas_energy = interface(cell_i.gas_energy, cell_im1.gas_energy, slopes_i.gas_energy, slopes_im1.gas_energy);
#endif // DE
#ifdef SCALAR
for (int i = 0; i < NSCALARS; i++) {
output.scalar[i] = interface(cell_i.scalar[i], cell_im1.scalar[i],
slopes_i.scalar[i], slopes_im1.scalar[i]);
output.scalar[i] = interface(cell_i.scalar[i], cell_im1.scalar[i], slopes_i.scalar[i], slopes_im1.scalar[i]);
}
#endif // SCALAR

Expand Down Expand Up @@ -1025,8 +1021,7 @@ void __device__ __host__ __inline__ Write_Data(hydro_utilities::Primitive const
#endif // DE
#ifdef SCALAR
for (int i = 0; i < NSCALARS; i++) {
dev_interface[(grid_enum::scalar + i) * n_cells + id] =
interface_state.density * interface_state.scalar[i];
dev_interface[(grid_enum::scalar + i) * n_cells + id] = interface_state.density * interface_state.scalar[i];
}
#endif // SCALAR
}
Expand Down
8 changes: 3 additions & 5 deletions src/riemann_solvers/hll_cuda.cu
Original file line number Diff line number Diff line change
Expand Up @@ -254,14 +254,12 @@ __global__ void Calculate_HLL_Fluxes_CUDA(Real const *dev_conserved, Real const
((Sr * f_mz_l) - (Sl * f_mz_r) + Sl * Sr * (right_state.momentum.z() - left_state.momentum.z())) / (Sr - Sl);
f_E = ((Sr * f_E_l) - (Sl * f_E_r) + Sl * Sr * (right_state.energy - left_state.energy)) / (Sr - Sl);
#ifdef DE
Real f_ge = ((Sr * f_ge_l) - (Sl * f_ge_r) +
Sl * Sr * (right_state.gas_energy - left_state.gas_energy)) /
(Sr - Sl);
Real f_ge =
((Sr * f_ge_l) - (Sl * f_ge_r) + Sl * Sr * (right_state.gas_energy - left_state.gas_energy)) / (Sr - Sl);
#endif
#ifdef SCALAR
for (int i = 0; i < NSCALARS; i++) {
f_sc[i] = ((Sr * f_sc_l[i]) - (Sl * f_sc_r[i]) +
Sl * Sr * (right_state.scalar[i] - left_state.scalar[i])) /
f_sc[i] = ((Sr * f_sc_l[i]) - (Sl * f_sc_r[i]) + Sl * Sr * (right_state.scalar[i] - left_state.scalar[i])) /
(Sr - Sl);
}
#endif
Expand Down
6 changes: 3 additions & 3 deletions src/riemann_solvers/hllc_cuda.cu
Original file line number Diff line number Diff line change
Expand Up @@ -307,9 +307,9 @@ __global__ void Calculate_HLLC_Fluxes_CUDA(Real const *dev_conserved, Real const
f_E = 0.5 * (f_E_l + f_E_r + (Sr - fabs(Sm)) * Ers + (Sl + fabs(Sm)) * Els - Sl * left_state.energy -
Sr * right_state.energy);
#ifdef DE
Real f_ge = 0.5 * (f_ge_l + f_ge_r + (Sr - fabs(Sm)) * gers + (Sl + fabs(Sm)) * gels -
Sl * left_state.gas_energy * left_state.density -
Sr * right_state.gas_energy * right_state.density);
Real f_ge =
0.5 * (f_ge_l + f_ge_r + (Sr - fabs(Sm)) * gers + (Sl + fabs(Sm)) * gels -
Sl * left_state.gas_energy * left_state.density - Sr * right_state.gas_energy * right_state.density);
#endif
#ifdef SCALAR
for (int i = 0; i < NSCALARS; i++) {
Expand Down
3 changes: 1 addition & 2 deletions src/utils/hydro_utilities_tests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -425,8 +425,7 @@ TEST(tALLConserved2Primitive, CorrectInputExpectCorrectOutput)
testing_utilities::Check_Results(fiducial_data.magnetic.z(), test_data.magnetic.z(), "magnetic.z");
#endif // MHD
#ifdef DE
testing_utilities::Check_Results(fiducial_data.gas_energy, test_data.gas_energy,
"gas_energy");
testing_utilities::Check_Results(fiducial_data.gas_energy, test_data.gas_energy, "gas_energy");
#endif // DE
}

Expand Down

0 comments on commit 42fcbb0

Please sign in to comment.