Skip to content

Commit dffd4c4

Browse files
chongchonghechongchonghe
committed
style: apply pre-commit fixes
1 parent 9d8c592 commit dffd4c4

10 files changed

Lines changed: 56 additions & 59 deletions

File tree

‎src/hydro/NSCBC_inflow.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ AMREX_GPU_DEVICE AMREX_FORCE_INLINE void setInflowX1LowerLowOrder(const amrex::I
198198
Q_im1[2] = v_t;
199199
Q_im1[3] = w_t;
200200
Q_im1[4] = ::quokka::EOS<problem_t>::ComputePressure(rho, Eint, massScalars); // prescribe temperature
201-
Q_im1[5] = Eint; // prescribe temperature
201+
Q_im1[5] = Eint; // prescribe temperature
202202
for (int i = 0; i < HydroSystem<problem_t>::nscalars_; ++i) {
203203
Q_im1[6 + i] = s_t[i]; // prescribe passive scalars
204204
}

‎src/hydro/hydro_system.hpp‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -870,18 +870,19 @@ void HydroSystem<problem_t>::ComputeFlatteningCoefficients(amrex::MultiFab const
870870
// compute (rho e) (gamma - 1)
871871
amrex::GpuArray<Real, nmscalars_> massScalars_plus2 = RadSystem<problem_t>::ComputeMassScalars(primVar, i + 2, j, k);
872872
Pplus2 = ::quokka::EOS<problem_t>::ComputePressure(primVar(i + 2, j, k, primDensity_index),
873-
primVar(i + 2, j, k, primDensity_index) * Pplus2, massScalars_plus2);
873+
primVar(i + 2, j, k, primDensity_index) * Pplus2, massScalars_plus2);
874874
amrex::GpuArray<Real, nmscalars_> massScalars_plus1 = RadSystem<problem_t>::ComputeMassScalars(primVar, i + 1, j, k);
875875
Pplus1 = ::quokka::EOS<problem_t>::ComputePressure(primVar(i + 1, j, k, primDensity_index),
876-
primVar(i + 1, j, k, primDensity_index) * Pplus1, massScalars_plus1);
876+
primVar(i + 1, j, k, primDensity_index) * Pplus1, massScalars_plus1);
877877
amrex::GpuArray<Real, nmscalars_> massScalars = RadSystem<problem_t>::ComputeMassScalars(primVar, i, j, k);
878-
P = ::quokka::EOS<problem_t>::ComputePressure(primVar(i, j, k, primDensity_index), primVar(i, j, k, primDensity_index) * P, massScalars);
878+
P = ::quokka::EOS<problem_t>::ComputePressure(primVar(i, j, k, primDensity_index), primVar(i, j, k, primDensity_index) * P,
879+
massScalars);
879880
amrex::GpuArray<Real, nmscalars_> massScalars_minus1 = RadSystem<problem_t>::ComputeMassScalars(primVar, i - 1, j, k);
880881
Pminus1 = ::quokka::EOS<problem_t>::ComputePressure(primVar(i - 1, j, k, primDensity_index),
881-
primVar(i - 1, j, k, primDensity_index) * Pminus1, massScalars_minus1);
882+
primVar(i - 1, j, k, primDensity_index) * Pminus1, massScalars_minus1);
882883
amrex::GpuArray<Real, nmscalars_> massScalars_minus2 = RadSystem<problem_t>::ComputeMassScalars(primVar, i - 2, j, k);
883884
Pminus2 = ::quokka::EOS<problem_t>::ComputePressure(primVar(i - 2, j, k, primDensity_index),
884-
primVar(i - 2, j, k, primDensity_index) * Pminus2, massScalars_minus2);
885+
primVar(i - 2, j, k, primDensity_index) * Pminus2, massScalars_minus2);
885886
}
886887

887888
if constexpr (is_eos_isothermal()) {

‎src/problems/FCQuantities/testFCQuantities.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ template <> struct Physics_Traits<FCQuantities> : DefaultPhysicsTraits {
4343
static constexpr bool is_mhd_enabled = true;
4444
};
4545

46-
constexpr double rho0 = 1.0; // background density
46+
constexpr double rho0 = 1.0; // background density
4747
constexpr double P0 = 1.0 / ::quokka::EOS_Traits<FCQuantities>::gamma; // background pressure
48-
constexpr double v0 = 0.; // background velocity
49-
constexpr double amp = 1.0e-6; // perturbation amplitude
48+
constexpr double v0 = 0.; // background velocity
49+
constexpr double amp = 1.0e-6; // perturbation amplitude
5050

5151
AMREX_GPU_DEVICE void computeWaveSolution(int i, int j, int k, amrex::Array4<amrex::Real> const &state, amrex::GpuArray<amrex::Real, AMREX_SPACEDIM> const &dx,
5252
amrex::GpuArray<amrex::Real, AMREX_SPACEDIM> const &prob_lo)

‎src/problems/HydroContact/testHydroContact.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,8 @@ template <> void QuokkaSimulation<ContactProblem>::setInitialConditionsOnGrid(qu
7777
state_cc(i, j, k, HydroSystem<ContactProblem>::x1Momentum_index) = rho * vx;
7878
state_cc(i, j, k, HydroSystem<ContactProblem>::x2Momentum_index) = 0.;
7979
state_cc(i, j, k, HydroSystem<ContactProblem>::x3Momentum_index) = 0.;
80-
state_cc(i, j, k, HydroSystem<ContactProblem>::energy_index) = ::quokka::EOS<ContactProblem>::ComputeEintFromPres(rho, P) + 0.5 * rho * (vx * vx);
80+
state_cc(i, j, k, HydroSystem<ContactProblem>::energy_index) =
81+
::quokka::EOS<ContactProblem>::ComputeEintFromPres(rho, P) + 0.5 * rho * (vx * vx);
8182
state_cc(i, j, k, HydroSystem<ContactProblem>::internalEnergy_index) = ::quokka::EOS<ContactProblem>::ComputeEintFromPres(rho, P);
8283
});
8384
}

‎src/problems/HydroWaveConvergence/testHydroWaveConvergence.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ template <> struct Physics_Traits<WaveProblem> : DefaultPhysicsTraits {
3434
static constexpr bool is_hydro_enabled = true;
3535
};
3636

37-
constexpr double rho0 = 1.0; // background density
37+
constexpr double rho0 = 1.0; // background density
3838
constexpr double P0 = 1.0 / ::quokka::EOS_Traits<WaveProblem>::gamma; // background pressure
39-
constexpr double v0 = 0.; // background velocity
40-
constexpr double amp = 1.0e-6; // perturbation amplitude
39+
constexpr double v0 = 0.; // background velocity
40+
constexpr double amp = 1.0e-6; // perturbation amplitude
4141

4242
AMREX_GPU_DEVICE void computeWaveSolution(int i, int j, int k, amrex::Array4<amrex::Real> const &state, amrex::GpuArray<amrex::Real, AMREX_SPACEDIM> const &dx,
4343
amrex::GpuArray<amrex::Real, AMREX_SPACEDIM> const &prob_lo)

‎src/problems/RadMarshak/testRadMarshak.cpp‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -73,25 +73,24 @@ template <> AMREX_GPU_HOST_DEVICE auto RadSystem<SuOlsonProblem>::ComputeFluxMea
7373

7474
[[maybe_unused]] static constexpr int nmscalars_ = Physics_Traits<SuOlsonProblem>::numMassScalars;
7575
template <>
76-
AMREX_GPU_HOST_DEVICE auto
77-
::quokka::EOS<SuOlsonProblem>::ComputeTgasFromEint([[maybe_unused]] const double rho, const double Egas,
78-
[[maybe_unused]] quokka::optional<amrex::GpuArray<amrex::Real, nmscalars_>> const &massScalars) -> double
76+
AMREX_GPU_HOST_DEVICE auto ::quokka::EOS<SuOlsonProblem>::ComputeTgasFromEint(
77+
[[maybe_unused]] const double rho, const double Egas, [[maybe_unused]] quokka::optional<amrex::GpuArray<amrex::Real, nmscalars_>> const &massScalars)
78+
-> double
7979
{
8080
return std::pow(4.0 * Egas / alpha_SuOlson, 1. / 4.);
8181
}
8282

8383
template <>
84-
AMREX_GPU_HOST_DEVICE auto
85-
::quokka::EOS<SuOlsonProblem>::ComputeEintFromTgas([[maybe_unused]] const double rho, const double Tgas,
86-
[[maybe_unused]] quokka::optional<amrex::GpuArray<amrex::Real, nmscalars_>> const &massScalars) -> double
84+
AMREX_GPU_HOST_DEVICE auto ::quokka::EOS<SuOlsonProblem>::ComputeEintFromTgas(
85+
[[maybe_unused]] const double rho, const double Tgas, [[maybe_unused]] quokka::optional<amrex::GpuArray<amrex::Real, nmscalars_>> const &massScalars)
86+
-> double
8787
{
8888
return (alpha_SuOlson / 4.0) * std::pow(Tgas, 4);
8989
}
9090

9191
template <>
92-
AMREX_GPU_HOST_DEVICE auto
93-
::quokka::EOS<SuOlsonProblem>::ComputeEintTempDerivative(const double /*rho*/, const double Tgas,
94-
quokka::optional<amrex::GpuArray<amrex::Real, nmscalars_>> const & /*massScalars*/) -> double
92+
AMREX_GPU_HOST_DEVICE auto ::quokka::EOS<SuOlsonProblem>::ComputeEintTempDerivative(
93+
const double /*rho*/, const double Tgas, quokka::optional<amrex::GpuArray<amrex::Real, nmscalars_>> const & /*massScalars*/) -> double
9594
{
9695
// This is also known as the heat capacity, i.e.
9796
// \del E_g / \del T = \rho c_v,

‎src/problems/RadMarshakCGS/testRadMarshakCGS.cpp‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -69,25 +69,24 @@ template <> AMREX_GPU_HOST_DEVICE auto RadSystem<SuOlsonProblemCgs>::ComputeFlux
6969

7070
[[maybe_unused]] static constexpr int nmscalars_ = Physics_Traits<SuOlsonProblemCgs>::numMassScalars;
7171
template <>
72-
AMREX_GPU_HOST_DEVICE auto
73-
::quokka::EOS<SuOlsonProblemCgs>::ComputeTgasFromEint([[maybe_unused]] const double rho, const double Egas,
74-
[[maybe_unused]] quokka::optional<amrex::GpuArray<amrex::Real, nmscalars_>> const &massScalars) -> double
72+
AMREX_GPU_HOST_DEVICE auto ::quokka::EOS<SuOlsonProblemCgs>::ComputeTgasFromEint(
73+
[[maybe_unused]] const double rho, const double Egas, [[maybe_unused]] quokka::optional<amrex::GpuArray<amrex::Real, nmscalars_>> const &massScalars)
74+
-> double
7575
{
7676
return std::pow(4.0 * Egas / alpha_SuOlson, 1. / 4.);
7777
}
7878

7979
template <>
80-
AMREX_GPU_HOST_DEVICE auto
81-
::quokka::EOS<SuOlsonProblemCgs>::ComputeEintFromTgas([[maybe_unused]] const double rho, const double Tgas,
82-
[[maybe_unused]] quokka::optional<amrex::GpuArray<amrex::Real, nmscalars_>> const &massScalars) -> double
80+
AMREX_GPU_HOST_DEVICE auto ::quokka::EOS<SuOlsonProblemCgs>::ComputeEintFromTgas(
81+
[[maybe_unused]] const double rho, const double Tgas, [[maybe_unused]] quokka::optional<amrex::GpuArray<amrex::Real, nmscalars_>> const &massScalars)
82+
-> double
8383
{
8484
return (alpha_SuOlson / 4.0) * std::pow(Tgas, 4);
8585
}
8686

8787
template <>
88-
AMREX_GPU_HOST_DEVICE auto
89-
::quokka::EOS<SuOlsonProblemCgs>::ComputeEintTempDerivative(const double /*rho*/, const double Tgas,
90-
quokka::optional<amrex::GpuArray<amrex::Real, nmscalars_>> const & /*massScalars*/) -> double
88+
AMREX_GPU_HOST_DEVICE auto ::quokka::EOS<SuOlsonProblemCgs>::ComputeEintTempDerivative(
89+
const double /*rho*/, const double Tgas, quokka::optional<amrex::GpuArray<amrex::Real, nmscalars_>> const & /*massScalars*/) -> double
9190
{
9291
// This is also known as the heat capacity, i.e.
9392
// \del E_g / \del T = \rho c_v,

‎src/problems/RadMatterCoupling/testRadMatterCoupling.cpp‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -63,25 +63,24 @@ template <> AMREX_GPU_HOST_DEVICE auto RadSystem<CouplingProblem>::ComputeFluxMe
6363

6464
[[maybe_unused]] static constexpr int nmscalars_ = Physics_Traits<CouplingProblem>::numMassScalars;
6565
template <>
66-
AMREX_GPU_HOST_DEVICE auto
67-
::quokka::EOS<CouplingProblem>::ComputeTgasFromEint([[maybe_unused]] const double rho, const double Egas,
68-
[[maybe_unused]] quokka::optional<amrex::GpuArray<amrex::Real, nmscalars_>> const &massScalars) -> double
66+
AMREX_GPU_HOST_DEVICE auto ::quokka::EOS<CouplingProblem>::ComputeTgasFromEint(
67+
[[maybe_unused]] const double rho, const double Egas, [[maybe_unused]] quokka::optional<amrex::GpuArray<amrex::Real, nmscalars_>> const &massScalars)
68+
-> double
6969
{
7070
return std::pow(4.0 * Egas / alpha_SuOlson, 1. / 4.);
7171
}
7272

7373
template <>
74-
AMREX_GPU_HOST_DEVICE auto
75-
::quokka::EOS<CouplingProblem>::ComputeEintFromTgas([[maybe_unused]] const double rho, const double Tgas,
76-
[[maybe_unused]] quokka::optional<amrex::GpuArray<amrex::Real, nmscalars_>> const &massScalars) -> double
74+
AMREX_GPU_HOST_DEVICE auto ::quokka::EOS<CouplingProblem>::ComputeEintFromTgas(
75+
[[maybe_unused]] const double rho, const double Tgas, [[maybe_unused]] quokka::optional<amrex::GpuArray<amrex::Real, nmscalars_>> const &massScalars)
76+
-> double
7777
{
7878
return (alpha_SuOlson / 4.0) * std::pow(Tgas, 4);
7979
}
8080

8181
template <>
82-
AMREX_GPU_HOST_DEVICE auto
83-
::quokka::EOS<CouplingProblem>::ComputeEintTempDerivative(const double /*rho*/, const double Tgas,
84-
quokka::optional<amrex::GpuArray<amrex::Real, nmscalars_>> const & /*massScalars*/) -> double
82+
AMREX_GPU_HOST_DEVICE auto ::quokka::EOS<CouplingProblem>::ComputeEintTempDerivative(
83+
const double /*rho*/, const double Tgas, quokka::optional<amrex::GpuArray<amrex::Real, nmscalars_>> const & /*massScalars*/) -> double
8584
{
8685
// This is also known as the heat capacity, i.e.
8786
// \del E_g / \del T = \rho c_v,

‎src/problems/RadMatterCouplingRSLA/testRadMatterCouplingRSLA.cpp‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -66,25 +66,24 @@ template <> AMREX_GPU_HOST_DEVICE auto RadSystem<CouplingProblem>::ComputeFluxMe
6666

6767
[[maybe_unused]] static constexpr int nmscalars_ = Physics_Traits<CouplingProblem>::numMassScalars;
6868
template <>
69-
AMREX_GPU_HOST_DEVICE auto
70-
::quokka::EOS<CouplingProblem>::ComputeTgasFromEint([[maybe_unused]] const double rho, const double Egas,
71-
[[maybe_unused]] quokka::optional<amrex::GpuArray<amrex::Real, nmscalars_>> const &massScalars) -> double
69+
AMREX_GPU_HOST_DEVICE auto ::quokka::EOS<CouplingProblem>::ComputeTgasFromEint(
70+
[[maybe_unused]] const double rho, const double Egas, [[maybe_unused]] quokka::optional<amrex::GpuArray<amrex::Real, nmscalars_>> const &massScalars)
71+
-> double
7272
{
7373
return std::pow(4.0 * Egas / alpha_SuOlson, 1. / 4.);
7474
}
7575

7676
template <>
77-
AMREX_GPU_HOST_DEVICE auto
78-
::quokka::EOS<CouplingProblem>::ComputeEintFromTgas([[maybe_unused]] const double rho, const double Tgas,
79-
[[maybe_unused]] quokka::optional<amrex::GpuArray<amrex::Real, nmscalars_>> const &massScalars) -> double
77+
AMREX_GPU_HOST_DEVICE auto ::quokka::EOS<CouplingProblem>::ComputeEintFromTgas(
78+
[[maybe_unused]] const double rho, const double Tgas, [[maybe_unused]] quokka::optional<amrex::GpuArray<amrex::Real, nmscalars_>> const &massScalars)
79+
-> double
8080
{
8181
return (alpha_SuOlson / 4.0) * std::pow(Tgas, 4);
8282
}
8383

8484
template <>
85-
AMREX_GPU_HOST_DEVICE auto
86-
::quokka::EOS<CouplingProblem>::ComputeEintTempDerivative(const double /*rho*/, const double Tgas,
87-
quokka::optional<amrex::GpuArray<amrex::Real, nmscalars_>> const & /*massScalars*/) -> double
85+
AMREX_GPU_HOST_DEVICE auto ::quokka::EOS<CouplingProblem>::ComputeEintTempDerivative(
86+
const double /*rho*/, const double Tgas, quokka::optional<amrex::GpuArray<amrex::Real, nmscalars_>> const & /*massScalars*/) -> double
8887
{
8988
// This is also known as the heat capacity, i.e.
9089
// \del E_g / \del T = \rho c_v,

‎src/problems/RadSuOlson/testRadSuOlson.cpp‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -87,25 +87,24 @@ template <> AMREX_GPU_HOST_DEVICE auto RadSystem<MarshakProblem>::ComputeFluxMea
8787

8888
[[maybe_unused]] static constexpr int nmscalars_ = Physics_Traits<MarshakProblem>::numMassScalars;
8989
template <>
90-
AMREX_GPU_HOST_DEVICE auto
91-
::quokka::EOS<MarshakProblem>::ComputeTgasFromEint([[maybe_unused]] const double rho, const double Egas,
92-
[[maybe_unused]] quokka::optional<amrex::GpuArray<amrex::Real, nmscalars_>> const &massScalars) -> double
90+
AMREX_GPU_HOST_DEVICE auto ::quokka::EOS<MarshakProblem>::ComputeTgasFromEint(
91+
[[maybe_unused]] const double rho, const double Egas, [[maybe_unused]] quokka::optional<amrex::GpuArray<amrex::Real, nmscalars_>> const &massScalars)
92+
-> double
9393
{
9494
return std::pow(4.0 * Egas / alpha_SuOlson, 1. / 4.);
9595
}
9696

9797
template <>
98-
AMREX_GPU_HOST_DEVICE auto
99-
::quokka::EOS<MarshakProblem>::ComputeEintFromTgas([[maybe_unused]] const double rho, const double Tgas,
100-
[[maybe_unused]] quokka::optional<amrex::GpuArray<amrex::Real, nmscalars_>> const &massScalars) -> double
98+
AMREX_GPU_HOST_DEVICE auto ::quokka::EOS<MarshakProblem>::ComputeEintFromTgas(
99+
[[maybe_unused]] const double rho, const double Tgas, [[maybe_unused]] quokka::optional<amrex::GpuArray<amrex::Real, nmscalars_>> const &massScalars)
100+
-> double
101101
{
102102
return (alpha_SuOlson / 4.0) * (Tgas * Tgas * Tgas * Tgas);
103103
}
104104

105105
template <>
106-
AMREX_GPU_HOST_DEVICE auto
107-
::quokka::EOS<MarshakProblem>::ComputeEintTempDerivative(const double /*rho*/, const double Tgas,
108-
quokka::optional<amrex::GpuArray<amrex::Real, nmscalars_>> const & /*massScalars*/) -> double
106+
AMREX_GPU_HOST_DEVICE auto ::quokka::EOS<MarshakProblem>::ComputeEintTempDerivative(
107+
const double /*rho*/, const double Tgas, quokka::optional<amrex::GpuArray<amrex::Real, nmscalars_>> const & /*massScalars*/) -> double
109108
{
110109
// This is also known as the heat capacity, i.e.
111110
// \del E_g / \del T = \rho c_v,
@@ -119,7 +118,7 @@ ::quokka::EOS<MarshakProblem>::ComputeEintTempDerivative(const double /*rho*/, c
119118
}
120119

121120
const auto initial_Egas = 1e-10 * ::quokka::EOS<MarshakProblem>::ComputeEintFromTgas(rho0, T_hohlraum); // NOLINT
122-
const auto initial_Erad = 1e-10 * (a_rad * (T_hohlraum * T_hohlraum * T_hohlraum * T_hohlraum)); // NOLINT
121+
const auto initial_Erad = 1e-10 * (a_rad * (T_hohlraum * T_hohlraum * T_hohlraum * T_hohlraum)); // NOLINT
123122

124123
template <>
125124
void RadSystem<MarshakProblem>::SetRadEnergySource(array_t &radEnergySource, amrex::Box const &indexRange,

0 commit comments

Comments
 (0)