remove mass_code_units

quokka-astro · Jul 25, 2023 · 852ee12 · 852ee12
1 parent 9ce8fb7
commit 852ee12
Show file tree

Hide file tree

Showing 37 changed files with 3 additions and 41 deletions.
diff --git a/src/EOS.hpp b/src/EOS.hpp
@@ -34,7 +34,6 @@ template <typename problem_t> struct EOS_Traits {
 	static constexpr double cs_isothermal = NAN; // only used when gamma = 1
 	static constexpr double mean_molecular_weight = NAN;
 	static constexpr double boltzmann_constant = C::k_B;
-	static constexpr double mass_code_units = C::m_u;
 };
 
 template <typename problem_t> class EOS
@@ -54,7 +53,6 @@ template <typename problem_t> class EOS
 	static constexpr amrex::Real gamma_ = EOS_Traits<problem_t>::gamma;
 	static constexpr amrex::Real boltzmann_constant_ = EOS_Traits<problem_t>::boltzmann_constant;
 	static constexpr amrex::Real mean_molecular_weight_ = EOS_Traits<problem_t>::mean_molecular_weight;
-	static constexpr amrex::Real mass_code_units_ = EOS_Traits<problem_t>::mass_code_units;
 };
 
 template <typename problem_t>
@@ -88,7 +86,7 @@ AMREX_FORCE_INLINE AMREX_GPU_HOST_DEVICE auto EOS<problem_t>::ComputeTgasFromEin
 		chem_eos_t estate;
 		estate.rho = rho;
 		estate.e = Eint / rho;
-		estate.mu = mean_molecular_weight_ / mass_code_units_;
+		estate.mu = mean_molecular_weight_ / C::m_u;
 		eos(eos_input_re, estate);
 		// scale returned temperature in case boltzmann constant is dimensionless
 		Tgas = estate.T * C::k_B / boltzmann_constant_;
@@ -130,7 +128,7 @@ AMREX_FORCE_INLINE AMREX_GPU_HOST_DEVICE auto EOS<problem_t>::ComputeEintFromTga
 		chem_eos_t estate;
 		estate.rho = rho;
 		estate.T = Tgas;
-		estate.mu = mean_molecular_weight_ / mass_code_units_;
+		estate.mu = mean_molecular_weight_ / C::m_u;
 		eos(eos_input_rt, estate);
 		Eint = estate.e * rho * boltzmann_constant_ / C::k_B;
 	}
@@ -170,7 +168,7 @@ EOS<problem_t>::ComputeEintTempDerivative(const amrex::Real rho, const amrex::Re
 		chem_eos_t estate;
 		estate.rho = rho;
 		estate.T = Tgas;
-		estate.mu = mean_molecular_weight_ / mass_code_units_;
+		estate.mu = mean_molecular_weight_ / C::m_u;
 		eos(eos_input_rt, estate);
 		dEint_dT = estate.dedT * rho * boltzmann_constant_ / C::k_B;
 	}

diff --git a/src/FCQuantities/test_fc_quantities.cpp b/src/FCQuantities/test_fc_quantities.cpp
@@ -29,7 +29,6 @@ template <> struct quokka::EOS_Traits<FCQuantities> {
 	static constexpr double gamma = 5. / 3.;
 	static constexpr double mean_molecular_weight = C::m_u;
 	static constexpr double boltzmann_constant = C::k_B;
-	static constexpr double mass_code_units = C::m_u;
 };
 
 template <> struct Physics_Traits<FCQuantities> {

diff --git a/src/HydroBlast2D/test_hydro2d_blast.cpp b/src/HydroBlast2D/test_hydro2d_blast.cpp
@@ -29,7 +29,6 @@ template <> struct quokka::EOS_Traits<BlastProblem> {
 	static constexpr double gamma = 5. / 3.;
 	static constexpr double mean_molecular_weight = NAN;
 	static constexpr double boltzmann_constant = C::k_B;
-	static constexpr double mass_code_units = C::m_u;
 };
 
 template <> struct Physics_Traits<BlastProblem> {

diff --git a/src/HydroBlast3D/test_hydro3d_blast.cpp b/src/HydroBlast3D/test_hydro3d_blast.cpp
@@ -36,7 +36,6 @@ template <> struct quokka::EOS_Traits<SedovProblem> {
 	static constexpr double gamma = 1.4;
 	static constexpr double mean_molecular_weight = NAN;
 	static constexpr double boltzmann_constant = C::k_B;
-	static constexpr double mass_code_units = C::m_u;
 };
 
 template <> struct HydroSystem_Traits<SedovProblem> {

diff --git a/src/HydroContact/test_hydro_contact.cpp b/src/HydroContact/test_hydro_contact.cpp
@@ -25,7 +25,6 @@ template <> struct quokka::EOS_Traits<ContactProblem> {
 	static constexpr double gamma = 1.4;
 	static constexpr double mean_molecular_weight = C::m_u;
 	static constexpr double boltzmann_constant = C::k_B;
-	static constexpr double mass_code_units = C::m_u;
 };
 
 template <> struct Physics_Traits<ContactProblem> {

diff --git a/src/HydroHighMach/test_hydro_highmach.cpp b/src/HydroHighMach/test_hydro_highmach.cpp
@@ -32,7 +32,6 @@ template <> struct quokka::EOS_Traits<HighMachProblem> {
 	static constexpr double gamma = 5. / 3.;
 	static constexpr double mean_molecular_weight = NAN;
 	static constexpr double boltzmann_constant = C::k_B;
-	static constexpr double mass_code_units = C::m_u;
 };
 
 template <> struct Physics_Traits<HighMachProblem> {

diff --git a/src/HydroKelvinHelmholz/test_hydro2d_kh.cpp b/src/HydroKelvinHelmholz/test_hydro2d_kh.cpp
@@ -26,7 +26,6 @@ template <> struct quokka::EOS_Traits<KelvinHelmholzProblem> {
 	static constexpr double gamma = 1.4;
 	static constexpr double mean_molecular_weight = NAN;
 	static constexpr double boltzmann_constant = C::k_B;
-	static constexpr double mass_code_units = C::m_u;
 };
 
 template <> struct HydroSystem_Traits<KelvinHelmholzProblem> {

diff --git a/src/HydroLeblanc/test_hydro_leblanc.cpp b/src/HydroLeblanc/test_hydro_leblanc.cpp
@@ -32,7 +32,6 @@ template <> struct quokka::EOS_Traits<ShocktubeProblem> {
 	static constexpr double gamma = (5. / 3.);
 	static constexpr double mean_molecular_weight = C::m_u;
 	static constexpr double boltzmann_constant = C::k_B;
-	static constexpr double mass_code_units = C::m_u;
 };
 
 template <> struct Physics_Traits<ShocktubeProblem> {

diff --git a/src/HydroQuirk/test_quirk.cpp b/src/HydroQuirk/test_quirk.cpp
@@ -45,7 +45,6 @@ template <> struct quokka::EOS_Traits<QuirkProblem> {
 	static constexpr double gamma = 5. / 3.;
 	static constexpr double mean_molecular_weight = NAN;
 	static constexpr double boltzmann_constant = C::k_B;
-	static constexpr double mass_code_units = C::m_u;
 };
 
 template <> struct HydroSystem_Traits<QuirkProblem> {

diff --git a/src/HydroRichtmeyerMeshkov/test_hydro2d_rm.cpp b/src/HydroRichtmeyerMeshkov/test_hydro2d_rm.cpp
@@ -25,7 +25,6 @@ template <> struct quokka::EOS_Traits<RichtmeyerMeshkovProblem> {
 	static constexpr double gamma = 1.4;
 	static constexpr double mean_molecular_weight = NAN;
 	static constexpr double boltzmann_constant = C::k_B;
-	static constexpr double mass_code_units = C::m_u;
 };
 
 template <> struct HydroSystem_Traits<RichtmeyerMeshkovProblem> {

diff --git a/src/HydroSMS/test_hydro_sms.cpp b/src/HydroSMS/test_hydro_sms.cpp
@@ -25,7 +25,6 @@ template <> struct quokka::EOS_Traits<ShocktubeProblem> {
 	static constexpr double gamma = 1.4;
 	static constexpr double mean_molecular_weight = C::m_u;
 	static constexpr double boltzmann_constant = C::k_B;
-	static constexpr double mass_code_units = C::m_u;
 };
 
 template <> struct Physics_Traits<ShocktubeProblem> {

diff --git a/src/HydroShocktube/test_hydro_shocktube.cpp b/src/HydroShocktube/test_hydro_shocktube.cpp
@@ -30,7 +30,6 @@ template <> struct quokka::EOS_Traits<ShocktubeProblem> {
 	static constexpr double gamma = 1.4;
 	static constexpr double mean_molecular_weight = NAN;
 	static constexpr double boltzmann_constant = C::k_B;
-	static constexpr double mass_code_units = C::m_u;
 };
 
 template <> struct Physics_Traits<ShocktubeProblem> {

diff --git a/src/HydroShocktubeCMA/test_hydro_shocktube_cma.cpp b/src/HydroShocktubeCMA/test_hydro_shocktube_cma.cpp
@@ -35,7 +35,6 @@ template <> struct quokka::EOS_Traits<ShocktubeProblem> {
 	static constexpr double gamma = 1.4;
 	static constexpr double mean_molecular_weight = NAN;
 	static constexpr double boltzmann_constant = C::k_B;
-	static constexpr double mass_code_units = C::m_u;
 };
 
 template <> struct Physics_Traits<ShocktubeProblem> {

diff --git a/src/HydroShuOsher/test_hydro_shuosher.cpp b/src/HydroShuOsher/test_hydro_shuosher.cpp
@@ -27,7 +27,6 @@ template <> struct quokka::EOS_Traits<ShocktubeProblem> {
 	static constexpr double gamma = 1.4;
 	static constexpr double mean_molecular_weight = C::m_u;
 	static constexpr double boltzmann_constant = C::k_B;
-	static constexpr double mass_code_units = C::m_u;
 };
 
 template <> struct Physics_Traits<ShocktubeProblem> {

diff --git a/src/HydroVacuum/test_hydro_vacuum.cpp b/src/HydroVacuum/test_hydro_vacuum.cpp
@@ -29,7 +29,6 @@ template <> struct quokka::EOS_Traits<ShocktubeProblem> {
 	static constexpr double gamma = 1.4;
 	static constexpr double mean_molecular_weight = NAN;
 	static constexpr double boltzmann_constant = C::k_B;
-	static constexpr double mass_code_units = C::m_u;
 };
 
 template <> struct Physics_Traits<ShocktubeProblem> {

diff --git a/src/HydroWave/test_hydro_wave.cpp b/src/HydroWave/test_hydro_wave.cpp
@@ -25,7 +25,6 @@ template <> struct quokka::EOS_Traits<WaveProblem> {
 	static constexpr double gamma = 5. / 3.;
 	static constexpr double mean_molecular_weight = C::m_u;
 	static constexpr double boltzmann_constant = C::k_B;
-	static constexpr double mass_code_units = C::m_u;
 };
 
 template <> struct Physics_Traits<WaveProblem> {

diff --git a/src/ODEIntegration/test_ode.cpp b/src/ODEIntegration/test_ode.cpp
@@ -21,7 +21,6 @@ template <> struct quokka::EOS_Traits<ODETest> {
 	static constexpr double mean_molecular_weight = C::m_u;
 	static constexpr double boltzmann_constant = C::k_B;
 	static constexpr double gamma = 5. / 3.;
-	static constexpr double mass_code_units = C::m_u;
 };
 
 struct ODEUserData {

diff --git a/src/PassiveScalar/test_scalars.cpp b/src/PassiveScalar/test_scalars.cpp
@@ -27,7 +27,6 @@ template <> struct quokka::EOS_Traits<ScalarProblem> {
 	static constexpr double gamma = 1.4;
 	static constexpr double mean_molecular_weight = C::m_u;
 	static constexpr double boltzmann_constant = C::k_B;
-	static constexpr double mass_code_units = C::m_u;
 };
 
 template <> struct Physics_Traits<ScalarProblem> {

diff --git a/src/RadBeam/test_radiation_beam.cpp b/src/RadBeam/test_radiation_beam.cpp
@@ -36,7 +36,6 @@ template <> struct quokka::EOS_Traits<BeamProblem> {
 	static constexpr double mean_molecular_weight = C::m_u;
 	static constexpr double boltzmann_constant = C::k_B;
 	static constexpr double gamma = 5. / 3.;
-	static constexpr double mass_code_units = C::m_u;
 };
 
 template <> struct RadSystem_Traits<BeamProblem> {

diff --git a/src/RadForce/test_radiation_force.cpp b/src/RadForce/test_radiation_force.cpp
@@ -48,7 +48,6 @@ template <> struct quokka::EOS_Traits<TubeProblem> {
 	static constexpr double boltzmann_constant = C::k_B;
 	static constexpr double gamma = gamma_gas;
 	static constexpr double cs_isothermal = a0; // only used when gamma = 1
-	static constexpr double mass_code_units = C::m_u;
 };
 
 template <> struct RadSystem_Traits<TubeProblem> {

diff --git a/src/RadMarshak/test_radiation_marshak.cpp b/src/RadMarshak/test_radiation_marshak.cpp
@@ -34,7 +34,6 @@ template <> struct quokka::EOS_Traits<SuOlsonProblem> {
 	static constexpr double mean_molecular_mass = 1.0;
 	static constexpr double boltzmann_constant = 1.0;
 	static constexpr double gamma = 5. / 3.;
-	static constexpr double mass_code_units = C::m_u;
 };
 
 template <> struct RadSystem_Traits<SuOlsonProblem> {

diff --git a/src/RadMarshakAsymptotic/test_radiation_marshak_asymptotic.cpp b/src/RadMarshakAsymptotic/test_radiation_marshak_asymptotic.cpp
@@ -29,7 +29,6 @@ template <> struct quokka::EOS_Traits<SuOlsonProblemCgs> {
 	static constexpr double mean_molecular_weight = C::m_u;
 	static constexpr double boltzmann_constant = C::k_B;
 	static constexpr double gamma = 5. / 3.;
-	static constexpr double mass_code_units = C::m_u;
 };
 
 template <> struct RadSystem_Traits<SuOlsonProblemCgs> {

diff --git a/src/RadMarshakCGS/test_radiation_marshak_cgs.cpp b/src/RadMarshakCGS/test_radiation_marshak_cgs.cpp
@@ -36,7 +36,6 @@ template <> struct quokka::EOS_Traits<SuOlsonProblemCgs> {
 	static constexpr double mean_molecular_mass = C::m_u;
 	static constexpr double boltzmann_constant = C::k_B;
 	static constexpr double gamma = 5. / 3.;
-	static constexpr double mass_code_units = C::m_u;
 };
 
 template <> struct RadSystem_Traits<SuOlsonProblemCgs> {

diff --git a/src/RadMatterCoupling/test_radiation_matter_coupling.cpp b/src/RadMatterCoupling/test_radiation_matter_coupling.cpp
@@ -34,7 +34,6 @@ template <> struct quokka::EOS_Traits<CouplingProblem> {
 	static constexpr double mean_molecular_mass = C::m_u;
 	static constexpr double boltzmann_constant = C::k_B;
 	static constexpr double gamma = 5. / 3.;
-	static constexpr double mass_code_units = C::m_u;
 };
 
 template <> struct RadSystem_Traits<CouplingProblem> {

diff --git a/src/RadMatterCouplingRSLA/test_radiation_matter_coupling_rsla.cpp b/src/RadMatterCouplingRSLA/test_radiation_matter_coupling_rsla.cpp
@@ -36,7 +36,6 @@ template <> struct quokka::EOS_Traits<CouplingProblem> {
 	static constexpr double mean_molecular_mass = C::m_u;
 	static constexpr double boltzmann_constant = C::k_B;
 	static constexpr double gamma = 5. / 3.;
-	static constexpr double mass_code_units = C::m_u;
 };
 
 template <> struct RadSystem_Traits<CouplingProblem> {

diff --git a/src/RadPulse/test_radiation_pulse.cpp b/src/RadPulse/test_radiation_pulse.cpp
@@ -31,7 +31,6 @@ template <> struct quokka::EOS_Traits<PulseProblem> {
 	static constexpr double mean_molecular_weight = 1.0;
 	static constexpr double boltzmann_constant = (2. / 3.);
 	static constexpr double gamma = 5. / 3.;
-	static constexpr double mass_code_units = C::m_u;
 };
 
 template <> struct RadSystem_Traits<PulseProblem> {

diff --git a/src/RadShadow/test_radiation_shadow.cpp b/src/RadShadow/test_radiation_shadow.cpp
@@ -37,7 +37,6 @@ template <> struct quokka::EOS_Traits<ShadowProblem> {
 	static constexpr double mean_molecular_weight = 10. * C::m_u;
 	static constexpr double boltzmann_constant = C::k_B;
 	static constexpr double gamma = 5. / 3.;
-	static constexpr double mass_code_units = C::m_u;
 };
 
 template <> struct RadSystem_Traits<ShadowProblem> {

diff --git a/src/RadStreaming/test_radiation_streaming.cpp b/src/RadStreaming/test_radiation_streaming.cpp
@@ -26,7 +26,6 @@ template <> struct quokka::EOS_Traits<StreamingProblem> {
 	static constexpr double mean_molecular_weight = 1.0;
 	static constexpr double boltzmann_constant = 1.0;
 	static constexpr double gamma = 5. / 3.;
-	static constexpr double mass_code_units = C::m_u;
 };
 
 template <> struct RadSystem_Traits<StreamingProblem> {

diff --git a/src/RadTophat/test_radiation_tophat.cpp b/src/RadTophat/test_radiation_tophat.cpp
@@ -41,7 +41,6 @@ template <> struct quokka::EOS_Traits<TophatProblem> {
 	static constexpr double mean_molecular_weight = C::m_u;
 	static constexpr double boltzmann_constant = C::k_B;
 	static constexpr double gamma = 5. / 3.;
-	static constexpr double mass_code_units = C::m_u;
 };
 
 template <> struct RadSystem_Traits<TophatProblem> {

diff --git a/src/RadTube/test_radiation_tube.cpp b/src/RadTube/test_radiation_tube.cpp
@@ -40,7 +40,6 @@ template <> struct quokka::EOS_Traits<TubeProblem> {
 	static constexpr double mean_molecular_weight = mu;
 	static constexpr double boltzmann_constant = C::k_B;
 	static constexpr double gamma = gamma_gas;
-	static constexpr double mass_code_units = C::m_u;
 };
 
 template <> struct RadSystem_Traits<TubeProblem> {

diff --git a/src/RadhydroShell/test_radhydro_shell.cpp b/src/RadhydroShell/test_radhydro_shell.cpp
@@ -48,7 +48,6 @@ template <> struct quokka::EOS_Traits<ShellProblem> {
 	static constexpr double mean_molecular_weight = 2.2 * m_H;
 	static constexpr double boltzmann_constant = k_B;
 	static constexpr double gamma = gamma_gas;
-	static constexpr double mass_code_units = C::m_u;
 };
 
 template <> struct RadSystem_Traits<ShellProblem> {

diff --git a/src/RadhydroShock/test_radhydro_shock.cpp b/src/RadhydroShock/test_radhydro_shock.cpp
@@ -65,7 +65,6 @@ template <> struct quokka::EOS_Traits<ShockProblem> {
 	static constexpr double mean_molecular_weight = mu;
 	static constexpr double boltzmann_constant = k_B;
 	static constexpr double gamma = gamma_gas;
-	static constexpr double mass_code_units = C::m_u;
 };
 
 template <> struct Physics_Traits<ShockProblem> {

diff --git a/src/RadhydroShockCGS/test_radhydro_shock_cgs.cpp b/src/RadhydroShockCGS/test_radhydro_shock_cgs.cpp
@@ -66,7 +66,6 @@ template <> struct quokka::EOS_Traits<ShockProblem> {
 	static constexpr double mean_molecular_weight = C::m_p + C::m_e;
 	static constexpr double boltzmann_constant = k_B;
 	static constexpr double gamma = gamma_gas;
-	static constexpr double mass_code_units = C::m_u;
 };
 
 template <> struct Physics_Traits<ShockProblem> {

diff --git a/src/RayleighTaylor2D/test_hydro2d_rt.cpp b/src/RayleighTaylor2D/test_hydro2d_rt.cpp
@@ -26,7 +26,6 @@ template <> struct quokka::EOS_Traits<RTProblem> {
 	static constexpr double gamma = 1.4;
 	static constexpr double mean_molecular_weight = NAN;
 	static constexpr double boltzmann_constant = C::k_B;
-	static constexpr double mass_code_units = C::m_u;
 };
 
 template <> struct HydroSystem_Traits<RTProblem> {

diff --git a/src/RayleighTaylor3D/test_hydro3d_rt.cpp b/src/RayleighTaylor3D/test_hydro3d_rt.cpp
@@ -26,7 +26,6 @@ template <> struct quokka::EOS_Traits<RTProblem> {
 	static constexpr double gamma = 1.4;
 	static constexpr double mean_molecular_weight = C::m_u;
 	static constexpr double boltzmann_constant = C::k_B;
-	static constexpr double mass_code_units = C::m_u;
 };
 
 template <> struct HydroSystem_Traits<RTProblem> {

diff --git a/src/ShockCloud/cloud.cpp b/src/ShockCloud/cloud.cpp
@@ -41,7 +41,6 @@ template <> struct quokka::EOS_Traits<ShockCloud> {
 	static constexpr double gamma = 5. / 3.; // default value
 	static constexpr double mean_molecular_weight = NAN;
 	static constexpr double boltzmann_constant = C::k_B;
-	static constexpr double mass_code_units = C::m_u;
 };
 
 template <> struct Physics_Traits<ShockCloud> {

diff --git a/src/SphericalCollapse/spherical_collapse.cpp b/src/SphericalCollapse/spherical_collapse.cpp
@@ -30,7 +30,6 @@ template <> struct quokka::EOS_Traits<CollapseProblem> {
 	static constexpr double gamma = 5. / 3.;
 	static constexpr double mean_molecular_weight = NAN;
 	static constexpr double boltzmann_constant = C::k_B;
-	static constexpr double mass_code_units = C::m_u;
 };
 
 template <> struct HydroSystem_Traits<CollapseProblem> {