From 6c0ea800cd4546c0c3400b13b20a1d4587d96288 Mon Sep 17 00:00:00 2001 From: ChongChong He Date: Sun, 6 Oct 2024 20:33:32 +1100 Subject: [PATCH] moved enable_dust_gas_thermal_coupling_model to ISM_Traits --- src/QuokkaSimulation.hpp | 2 +- src/problems/RadBeam/test_radiation_beam.cpp | 1 - src/problems/RadDust/test_rad_dust.cpp | 5 +++++ src/problems/RadDustMG/test_rad_dust_MG.cpp | 5 +++++ src/problems/RadForce/test_radiation_force.cpp | 1 - src/problems/RadMarshak/test_radiation_marshak.cpp | 1 - .../test_radiation_marshak_asymptotic.cpp | 1 - src/problems/RadMarshakCGS/test_radiation_marshak_cgs.cpp | 1 - src/problems/RadMarshakDust/test_radiation_marshak_dust.cpp | 4 ++-- .../RadMarshakDustPE/test_radiation_marshak_dust_and_PE.cpp | 2 +- .../RadMarshakVaytet/test_radiation_marshak_Vaytet.cpp | 1 - .../RadMatterCoupling/test_radiation_matter_coupling.cpp | 1 - .../test_radiation_matter_coupling_rsla.cpp | 1 - src/problems/RadPulse/test_radiation_pulse.cpp | 1 - src/problems/RadShadow/test_radiation_shadow.cpp | 1 - src/problems/RadStreaming/test_radiation_streaming.cpp | 1 - src/problems/RadStreamingY/test_radiation_streaming_y.cpp | 1 - src/problems/RadSuOlson/test_radiation_SuOlson.cpp | 1 - src/problems/RadTophat/test_radiation_tophat.cpp | 1 - src/problems/RadTube/test_radiation_tube.cpp | 1 - src/problems/RadhydroBB/test_radhydro_bb.cpp | 1 - src/problems/RadhydroPulse/test_radhydro_pulse.cpp | 2 -- src/problems/RadhydroPulseDyn/test_radhydro_pulse_dyn.cpp | 2 -- src/problems/RadhydroPulseGrey/test_radhydro_pulse_grey.cpp | 2 -- .../test_radhydro_pulse_MG_const_kappa.cpp | 2 -- .../RadhydroPulseMGint/test_radhydro_pulse_MG_int.cpp | 2 -- src/problems/RadhydroShell/test_radhydro_shell.cpp | 1 - src/problems/RadhydroShock/test_radhydro_shock.cpp | 1 - src/problems/RadhydroShockCGS/test_radhydro_shock_cgs.cpp | 1 - .../test_radhydro_shock_multigroup.cpp | 1 - .../test_radhydro_uniform_advecting.cpp | 1 - src/radiation/radiation_system.hpp | 5 +++-- 32 files changed, 17 insertions(+), 37 deletions(-) diff --git a/src/QuokkaSimulation.hpp b/src/QuokkaSimulation.hpp index 601915334..42c7cc462 100644 --- a/src/QuokkaSimulation.hpp +++ b/src/QuokkaSimulation.hpp @@ -1682,7 +1682,7 @@ void QuokkaSimulation::subcycleRadiationAtLevel(int lev, amrex::Real amrex::Print() << "The average number of Newton-Raphson solvings per IMEX stage is " << global_solving_mean << ", (mean, max) number of Newton-Raphson iterations are " << global_iteration_mean << ", " << global_iteration_max << ".\n"; - if constexpr (RadSystem_Traits::enable_dust_gas_thermal_coupling_model) { + if constexpr (ISM_Traits::enable_dust_gas_thermal_coupling_model) { amrex::Print() << "The fraction of gas-dust interactions that are decoupled is " << global_decoupled_iteration_mean << "\n"; } diff --git a/src/problems/RadBeam/test_radiation_beam.cpp b/src/problems/RadBeam/test_radiation_beam.cpp index e760f96b9..df9cc02a8 100644 --- a/src/problems/RadBeam/test_radiation_beam.cpp +++ b/src/problems/RadBeam/test_radiation_beam.cpp @@ -38,7 +38,6 @@ template <> struct RadSystem_Traits { static constexpr double radiation_constant = radiation_constant_cgs_; static constexpr double Erad_floor = 0.; static constexpr int beta_order = 1; - static constexpr bool enable_dust_gas_thermal_coupling_model = false; }; template <> struct Physics_Traits { diff --git a/src/problems/RadDust/test_rad_dust.cpp b/src/problems/RadDust/test_rad_dust.cpp index f269ef1b2..52b460dfc 100644 --- a/src/problems/RadDust/test_rad_dust.cpp +++ b/src/problems/RadDust/test_rad_dust.cpp @@ -50,7 +50,12 @@ template <> struct RadSystem_Traits { static constexpr double radiation_constant = a_rad; static constexpr double Erad_floor = erad_floor; static constexpr int beta_order = beta_order_; +}; + +template <> struct ISM_Traits { static constexpr bool enable_dust_gas_thermal_coupling_model = true; + static constexpr double gas_dust_coupling_threshold = 1.0e-6; + static constexpr bool enable_photoelectric_heating = false; }; template <> struct Physics_Traits { diff --git a/src/problems/RadDustMG/test_rad_dust_MG.cpp b/src/problems/RadDustMG/test_rad_dust_MG.cpp index 17cba0312..cb504ec2a 100644 --- a/src/problems/RadDustMG/test_rad_dust_MG.cpp +++ b/src/problems/RadDustMG/test_rad_dust_MG.cpp @@ -65,7 +65,12 @@ template <> struct RadSystem_Traits { static constexpr amrex::GpuArray::nGroups + 1> radBoundaries{1.0e-3, 0.1, 1.0, 10.0, 1.0e3}; // static constexpr OpacityModel opacity_model = OpacityModel::piecewise_constant_opacity; static constexpr OpacityModel opacity_model = OpacityModel::PPL_opacity_fixed_slope_spectrum; +}; + +template <> struct ISM_Traits { static constexpr bool enable_dust_gas_thermal_coupling_model = true; + static constexpr double gas_dust_coupling_threshold = 1.0e-6; + static constexpr bool enable_photoelectric_heating = false; }; template <> diff --git a/src/problems/RadForce/test_radiation_force.cpp b/src/problems/RadForce/test_radiation_force.cpp index 180b093ff..d5934ebb4 100644 --- a/src/problems/RadForce/test_radiation_force.cpp +++ b/src/problems/RadForce/test_radiation_force.cpp @@ -71,7 +71,6 @@ template <> struct RadSystem_Traits { static constexpr double Erad_floor = 0.; static constexpr double energy_unit = C::ev2erg; static constexpr int beta_order = 1; - static constexpr bool enable_dust_gas_thermal_coupling_model = false; }; template <> AMREX_GPU_HOST_DEVICE auto RadSystem::ComputePlanckOpacity(const double /*rho*/, const double /*Tgas*/) -> amrex::Real { return 0.; } diff --git a/src/problems/RadMarshak/test_radiation_marshak.cpp b/src/problems/RadMarshak/test_radiation_marshak.cpp index a2dcd9449..81e031bbf 100644 --- a/src/problems/RadMarshak/test_radiation_marshak.cpp +++ b/src/problems/RadMarshak/test_radiation_marshak.cpp @@ -42,7 +42,6 @@ template <> struct RadSystem_Traits { static constexpr double radiation_constant = a_rad; static constexpr double Erad_floor = 0.; static constexpr int beta_order = 0; - static constexpr bool enable_dust_gas_thermal_coupling_model = false; }; template <> struct Physics_Traits { diff --git a/src/problems/RadMarshakAsymptotic/test_radiation_marshak_asymptotic.cpp b/src/problems/RadMarshakAsymptotic/test_radiation_marshak_asymptotic.cpp index 44ca3b0f0..e32e29abd 100644 --- a/src/problems/RadMarshakAsymptotic/test_radiation_marshak_asymptotic.cpp +++ b/src/problems/RadMarshakAsymptotic/test_radiation_marshak_asymptotic.cpp @@ -39,7 +39,6 @@ template <> struct RadSystem_Traits { static constexpr double radiation_constant = radiation_constant_cgs_; static constexpr double Erad_floor = Erad_floor_; static constexpr int beta_order = 0; - static constexpr bool enable_dust_gas_thermal_coupling_model = false; }; template <> struct Physics_Traits { diff --git a/src/problems/RadMarshakCGS/test_radiation_marshak_cgs.cpp b/src/problems/RadMarshakCGS/test_radiation_marshak_cgs.cpp index b724c9ac4..818639850 100644 --- a/src/problems/RadMarshakCGS/test_radiation_marshak_cgs.cpp +++ b/src/problems/RadMarshakCGS/test_radiation_marshak_cgs.cpp @@ -44,7 +44,6 @@ template <> struct RadSystem_Traits { static constexpr double radiation_constant = radiation_constant_cgs_; static constexpr double Erad_floor = 0.; static constexpr int beta_order = 1; - static constexpr bool enable_dust_gas_thermal_coupling_model = false; }; template <> struct Physics_Traits { diff --git a/src/problems/RadMarshakDust/test_radiation_marshak_dust.cpp b/src/problems/RadMarshakDust/test_radiation_marshak_dust.cpp index 8f39445bb..474a6a024 100644 --- a/src/problems/RadMarshakDust/test_radiation_marshak_dust.cpp +++ b/src/problems/RadMarshakDust/test_radiation_marshak_dust.cpp @@ -65,15 +65,15 @@ template <> struct RadSystem_Traits { static constexpr double radiation_constant = a_rad; static constexpr double Erad_floor = erad_floor; static constexpr int beta_order = 0; - static constexpr bool enable_dust_gas_thermal_coupling_model = dust_on; static constexpr double energy_unit = 1.0; static constexpr amrex::GpuArray radBoundaries = radBoundaries_; static constexpr OpacityModel opacity_model = opacity_model_; }; template <> struct ISM_Traits { - static constexpr double gas_dust_coupling_threshold = 1.0e-5; + static constexpr bool enable_dust_gas_thermal_coupling_model = true; static constexpr bool enable_photoelectric_heating = false; + static constexpr double gas_dust_coupling_threshold = 1.0e-5; }; template <> AMREX_GPU_HOST_DEVICE auto RadSystem::ComputePlanckOpacity(const double /*rho*/, const double /*Tgas*/) -> amrex::Real diff --git a/src/problems/RadMarshakDustPE/test_radiation_marshak_dust_and_PE.cpp b/src/problems/RadMarshakDustPE/test_radiation_marshak_dust_and_PE.cpp index e86784cb4..991b05d2d 100644 --- a/src/problems/RadMarshakDustPE/test_radiation_marshak_dust_and_PE.cpp +++ b/src/problems/RadMarshakDustPE/test_radiation_marshak_dust_and_PE.cpp @@ -62,13 +62,13 @@ template <> struct RadSystem_Traits { static constexpr double radiation_constant = a_rad; static constexpr double Erad_floor = erad_floor; static constexpr int beta_order = 1; - static constexpr bool enable_dust_gas_thermal_coupling_model = dust_on; static constexpr double energy_unit = 1.0; static constexpr amrex::GpuArray radBoundaries = radBoundaries_; static constexpr OpacityModel opacity_model = opacity_model_; }; template <> struct ISM_Traits { + static constexpr bool enable_dust_gas_thermal_coupling_model = dust_on; static constexpr double gas_dust_coupling_threshold = gas_dust_coupling_threshold_; static constexpr bool enable_photoelectric_heating = PE_on; }; diff --git a/src/problems/RadMarshakVaytet/test_radiation_marshak_Vaytet.cpp b/src/problems/RadMarshakVaytet/test_radiation_marshak_Vaytet.cpp index 6e5f5d854..5e9a75173 100644 --- a/src/problems/RadMarshakVaytet/test_radiation_marshak_Vaytet.cpp +++ b/src/problems/RadMarshakVaytet/test_radiation_marshak_Vaytet.cpp @@ -124,7 +124,6 @@ template <> struct RadSystem_Traits { static constexpr double energy_unit = C::hplanck; // set boundary unit to Hz static constexpr amrex::GpuArray radBoundaries = group_edges_; static constexpr OpacityModel opacity_model = opacity_model_; - static constexpr bool enable_dust_gas_thermal_coupling_model = false; }; template <> diff --git a/src/problems/RadMatterCoupling/test_radiation_matter_coupling.cpp b/src/problems/RadMatterCoupling/test_radiation_matter_coupling.cpp index ed17b1f2b..11be6e3d3 100644 --- a/src/problems/RadMatterCoupling/test_radiation_matter_coupling.cpp +++ b/src/problems/RadMatterCoupling/test_radiation_matter_coupling.cpp @@ -42,7 +42,6 @@ template <> struct RadSystem_Traits { static constexpr double radiation_constant = radiation_constant_cgs_; static constexpr double Erad_floor = 0.; static constexpr int beta_order = 1; - static constexpr bool enable_dust_gas_thermal_coupling_model = false; }; template <> struct Physics_Traits { diff --git a/src/problems/RadMatterCouplingRSLA/test_radiation_matter_coupling_rsla.cpp b/src/problems/RadMatterCouplingRSLA/test_radiation_matter_coupling_rsla.cpp index e61548026..97d5a27ac 100644 --- a/src/problems/RadMatterCouplingRSLA/test_radiation_matter_coupling_rsla.cpp +++ b/src/problems/RadMatterCouplingRSLA/test_radiation_matter_coupling_rsla.cpp @@ -44,7 +44,6 @@ template <> struct RadSystem_Traits { static constexpr double radiation_constant = radiation_constant_cgs_; static constexpr double Erad_floor = 0.; static constexpr int beta_order = 1; - static constexpr bool enable_dust_gas_thermal_coupling_model = false; }; template <> struct Physics_Traits { diff --git a/src/problems/RadPulse/test_radiation_pulse.cpp b/src/problems/RadPulse/test_radiation_pulse.cpp index 0df12a9e6..cde6a25cc 100644 --- a/src/problems/RadPulse/test_radiation_pulse.cpp +++ b/src/problems/RadPulse/test_radiation_pulse.cpp @@ -40,7 +40,6 @@ template <> struct RadSystem_Traits { static constexpr double radiation_constant = a_rad; static constexpr double Erad_floor = erad_floor; static constexpr int beta_order = 0; - static constexpr bool enable_dust_gas_thermal_coupling_model = false; }; template <> struct Physics_Traits { diff --git a/src/problems/RadShadow/test_radiation_shadow.cpp b/src/problems/RadShadow/test_radiation_shadow.cpp index bd7a5f8dd..f4e583ac2 100644 --- a/src/problems/RadShadow/test_radiation_shadow.cpp +++ b/src/problems/RadShadow/test_radiation_shadow.cpp @@ -41,7 +41,6 @@ template <> struct RadSystem_Traits { static constexpr double radiation_constant = a_rad; static constexpr double Erad_floor = 0.; static constexpr int beta_order = 1; - static constexpr bool enable_dust_gas_thermal_coupling_model = false; }; template <> struct Physics_Traits { diff --git a/src/problems/RadStreaming/test_radiation_streaming.cpp b/src/problems/RadStreaming/test_radiation_streaming.cpp index 4bf372adb..1746e9e5b 100644 --- a/src/problems/RadStreaming/test_radiation_streaming.cpp +++ b/src/problems/RadStreaming/test_radiation_streaming.cpp @@ -46,7 +46,6 @@ template <> struct RadSystem_Traits { static constexpr double radiation_constant = 1.0; static constexpr double Erad_floor = initial_Erad; static constexpr int beta_order = 0; - static constexpr bool enable_dust_gas_thermal_coupling_model = false; }; template <> AMREX_GPU_HOST_DEVICE auto RadSystem::ComputePlanckOpacity(const double /*rho*/, const double /*Tgas*/) -> amrex::Real diff --git a/src/problems/RadStreamingY/test_radiation_streaming_y.cpp b/src/problems/RadStreamingY/test_radiation_streaming_y.cpp index 87eadc783..2c6894291 100644 --- a/src/problems/RadStreamingY/test_radiation_streaming_y.cpp +++ b/src/problems/RadStreamingY/test_radiation_streaming_y.cpp @@ -49,7 +49,6 @@ template <> struct RadSystem_Traits { static constexpr double radiation_constant = 1.0; static constexpr double Erad_floor = initial_Erad; static constexpr int beta_order = 0; - static constexpr bool enable_dust_gas_thermal_coupling_model = false; }; template <> AMREX_GPU_HOST_DEVICE auto RadSystem::ComputePlanckOpacity(const double /*rho*/, const double /*Tgas*/) -> amrex::Real diff --git a/src/problems/RadSuOlson/test_radiation_SuOlson.cpp b/src/problems/RadSuOlson/test_radiation_SuOlson.cpp index a5cda31e0..7d64fa4db 100644 --- a/src/problems/RadSuOlson/test_radiation_SuOlson.cpp +++ b/src/problems/RadSuOlson/test_radiation_SuOlson.cpp @@ -50,7 +50,6 @@ template <> struct RadSystem_Traits { static constexpr double gamma = 5. / 3.; static constexpr double Erad_floor = 0.; static constexpr int beta_order = 0; - static constexpr bool enable_dust_gas_thermal_coupling_model = false; }; template <> struct quokka::EOS_Traits { diff --git a/src/problems/RadTophat/test_radiation_tophat.cpp b/src/problems/RadTophat/test_radiation_tophat.cpp index 03c6a4595..eff81e77d 100644 --- a/src/problems/RadTophat/test_radiation_tophat.cpp +++ b/src/problems/RadTophat/test_radiation_tophat.cpp @@ -46,7 +46,6 @@ template <> struct RadSystem_Traits { static constexpr double radiation_constant = radiation_constant_cgs_; static constexpr double Erad_floor = 0.; static constexpr int beta_order = 0; - static constexpr bool enable_dust_gas_thermal_coupling_model = false; }; template <> struct Physics_Traits { diff --git a/src/problems/RadTube/test_radiation_tube.cpp b/src/problems/RadTube/test_radiation_tube.cpp index a17fb0a01..80c9770a4 100644 --- a/src/problems/RadTube/test_radiation_tube.cpp +++ b/src/problems/RadTube/test_radiation_tube.cpp @@ -70,7 +70,6 @@ template <> struct RadSystem_Traits { // static constexpr OpacityModel opacity_model = OpacityModel::single_group; static constexpr OpacityModel opacity_model = OpacityModel::piecewise_constant_opacity; // static constexpr OpacityModel opacity_model = OpacityModel::PPL_opacity_fixed_slope_spectrum; - static constexpr bool enable_dust_gas_thermal_coupling_model = false; }; template <> diff --git a/src/problems/RadhydroBB/test_radhydro_bb.cpp b/src/problems/RadhydroBB/test_radhydro_bb.cpp index a0a631d5e..a969fe3ef 100644 --- a/src/problems/RadhydroBB/test_radhydro_bb.cpp +++ b/src/problems/RadhydroBB/test_radhydro_bb.cpp @@ -132,7 +132,6 @@ template <> struct RadSystem_Traits { static constexpr double energy_unit = nu_unit; static constexpr amrex::GpuArray radBoundaries = rad_boundaries_; static constexpr OpacityModel opacity_model = OpacityModel::piecewise_constant_opacity; - static constexpr bool enable_dust_gas_thermal_coupling_model = false; }; template <> diff --git a/src/problems/RadhydroPulse/test_radhydro_pulse.cpp b/src/problems/RadhydroPulse/test_radhydro_pulse.cpp index c101927ac..181ed8821 100644 --- a/src/problems/RadhydroPulse/test_radhydro_pulse.cpp +++ b/src/problems/RadhydroPulse/test_radhydro_pulse.cpp @@ -49,7 +49,6 @@ template <> struct RadSystem_Traits { static constexpr double radiation_constant = a_rad; static constexpr double Erad_floor = erad_floor; static constexpr int beta_order = beta_order_; - static constexpr bool enable_dust_gas_thermal_coupling_model = false; }; template <> struct RadSystem_Traits { static constexpr double c_light = c; @@ -57,7 +56,6 @@ template <> struct RadSystem_Traits { static constexpr double radiation_constant = a_rad; static constexpr double Erad_floor = erad_floor; static constexpr int beta_order = beta_order_; - static constexpr bool enable_dust_gas_thermal_coupling_model = false; }; template <> struct Physics_Traits { diff --git a/src/problems/RadhydroPulseDyn/test_radhydro_pulse_dyn.cpp b/src/problems/RadhydroPulseDyn/test_radhydro_pulse_dyn.cpp index 5f6bd12d7..2415c3e84 100644 --- a/src/problems/RadhydroPulseDyn/test_radhydro_pulse_dyn.cpp +++ b/src/problems/RadhydroPulseDyn/test_radhydro_pulse_dyn.cpp @@ -50,7 +50,6 @@ template <> struct RadSystem_Traits { static constexpr double radiation_constant = a_rad; static constexpr double Erad_floor = erad_floor; static constexpr int beta_order = beta_order_; - static constexpr bool enable_dust_gas_thermal_coupling_model = false; }; template <> struct RadSystem_Traits { static constexpr double c_light = c; @@ -58,7 +57,6 @@ template <> struct RadSystem_Traits { static constexpr double radiation_constant = a_rad; static constexpr double Erad_floor = erad_floor; static constexpr int beta_order = beta_order_; - static constexpr bool enable_dust_gas_thermal_coupling_model = false; }; template <> struct Physics_Traits { diff --git a/src/problems/RadhydroPulseGrey/test_radhydro_pulse_grey.cpp b/src/problems/RadhydroPulseGrey/test_radhydro_pulse_grey.cpp index 83e4fdf71..8c6536e0f 100644 --- a/src/problems/RadhydroPulseGrey/test_radhydro_pulse_grey.cpp +++ b/src/problems/RadhydroPulseGrey/test_radhydro_pulse_grey.cpp @@ -52,7 +52,6 @@ template <> struct RadSystem_Traits { static constexpr double radiation_constant = a_rad; static constexpr double Erad_floor = erad_floor; static constexpr int beta_order = 1; - static constexpr bool enable_dust_gas_thermal_coupling_model = false; }; template <> struct RadSystem_Traits { static constexpr double c_light = c; @@ -60,7 +59,6 @@ template <> struct RadSystem_Traits { static constexpr double radiation_constant = a_rad; static constexpr double Erad_floor = erad_floor; static constexpr int beta_order = 2; - static constexpr bool enable_dust_gas_thermal_coupling_model = false; }; template <> struct Physics_Traits { diff --git a/src/problems/RadhydroPulseMGconst/test_radhydro_pulse_MG_const_kappa.cpp b/src/problems/RadhydroPulseMGconst/test_radhydro_pulse_MG_const_kappa.cpp index 1f99c62fa..10b1e943b 100644 --- a/src/problems/RadhydroPulseMGconst/test_radhydro_pulse_MG_const_kappa.cpp +++ b/src/problems/RadhydroPulseMGconst/test_radhydro_pulse_MG_const_kappa.cpp @@ -111,7 +111,6 @@ template <> struct RadSystem_Traits { static constexpr double radiation_constant = a_rad; static constexpr double Erad_floor = erad_floor; static constexpr int beta_order = 1; - static constexpr bool enable_dust_gas_thermal_coupling_model = false; }; template <> AMREX_GPU_HOST_DEVICE auto RadSystem::ComputePlanckOpacity(const double /*rho*/, const double /*Tgas*/) -> amrex::Real { return kappa0; } @@ -182,7 +181,6 @@ template <> struct RadSystem_Traits { // static constexpr OpacityModel opacity_model = OpacityModel::piecewise_constant_opacity; static constexpr OpacityModel opacity_model = OpacityModel::PPL_opacity_fixed_slope_spectrum; // static constexpr OpacityModel opacity_model = OpacityModel::PPL_opacity_full_spectrum; - static constexpr bool enable_dust_gas_thermal_coupling_model = false; }; template <> diff --git a/src/problems/RadhydroPulseMGint/test_radhydro_pulse_MG_int.cpp b/src/problems/RadhydroPulseMGint/test_radhydro_pulse_MG_int.cpp index 619fee4dd..befd25c4d 100644 --- a/src/problems/RadhydroPulseMGint/test_radhydro_pulse_MG_int.cpp +++ b/src/problems/RadhydroPulseMGint/test_radhydro_pulse_MG_int.cpp @@ -132,7 +132,6 @@ template <> struct RadSystem_Traits { static constexpr amrex::GpuArray radBoundaries = rad_boundaries_; static constexpr int beta_order = 1; static constexpr OpacityModel opacity_model = opacity_model_; - static constexpr bool enable_dust_gas_thermal_coupling_model = false; }; template <> struct RadSystem_Traits { static constexpr double c_light = c; @@ -142,7 +141,6 @@ template <> struct RadSystem_Traits { static constexpr bool compute_v_over_c_terms = true; static constexpr int beta_order = 1; static constexpr OpacityModel opacity_model = OpacityModel::single_group; - static constexpr bool enable_dust_gas_thermal_coupling_model = false; }; AMREX_GPU_HOST_DEVICE diff --git a/src/problems/RadhydroShell/test_radhydro_shell.cpp b/src/problems/RadhydroShell/test_radhydro_shell.cpp index 9acbd5352..13bfc1e86 100644 --- a/src/problems/RadhydroShell/test_radhydro_shell.cpp +++ b/src/problems/RadhydroShell/test_radhydro_shell.cpp @@ -56,7 +56,6 @@ template <> struct RadSystem_Traits { static constexpr double radiation_constant = a_rad; static constexpr double Erad_floor = 0.; static constexpr int beta_order = 1; - static constexpr bool enable_dust_gas_thermal_coupling_model = false; }; template <> struct HydroSystem_Traits { diff --git a/src/problems/RadhydroShock/test_radhydro_shock.cpp b/src/problems/RadhydroShock/test_radhydro_shock.cpp index 75cf62af4..dd04e87a9 100644 --- a/src/problems/RadhydroShock/test_radhydro_shock.cpp +++ b/src/problems/RadhydroShock/test_radhydro_shock.cpp @@ -59,7 +59,6 @@ template <> struct RadSystem_Traits { static constexpr double radiation_constant = a_rad; static constexpr double Erad_floor = 0.; static constexpr int beta_order = 1; - static constexpr bool enable_dust_gas_thermal_coupling_model = false; }; template <> struct quokka::EOS_Traits { diff --git a/src/problems/RadhydroShockCGS/test_radhydro_shock_cgs.cpp b/src/problems/RadhydroShockCGS/test_radhydro_shock_cgs.cpp index 4e1ae9999..940054e7b 100644 --- a/src/problems/RadhydroShockCGS/test_radhydro_shock_cgs.cpp +++ b/src/problems/RadhydroShockCGS/test_radhydro_shock_cgs.cpp @@ -60,7 +60,6 @@ template <> struct RadSystem_Traits { static constexpr double radiation_constant = a_rad; static constexpr double Erad_floor = 0.; static constexpr int beta_order = 1; - static constexpr bool enable_dust_gas_thermal_coupling_model = false; }; template <> struct quokka::EOS_Traits { diff --git a/src/problems/RadhydroShockMultigroup/test_radhydro_shock_multigroup.cpp b/src/problems/RadhydroShockMultigroup/test_radhydro_shock_multigroup.cpp index a72799c2b..40552c359 100644 --- a/src/problems/RadhydroShockMultigroup/test_radhydro_shock_multigroup.cpp +++ b/src/problems/RadhydroShockMultigroup/test_radhydro_shock_multigroup.cpp @@ -66,7 +66,6 @@ template <> struct RadSystem_Traits { // static constexpr OpacityModel opacity_model = OpacityModel::piecewise_constant_opacity; static constexpr OpacityModel opacity_model = OpacityModel::PPL_opacity_fixed_slope_spectrum; // static constexpr OpacityModel opacity_model = OpacityModel::PPL_opacity_full_spectrum; - static constexpr bool enable_dust_gas_thermal_coupling_model = false; }; template <> struct quokka::EOS_Traits { diff --git a/src/problems/RadhydroUniformAdvecting/test_radhydro_uniform_advecting.cpp b/src/problems/RadhydroUniformAdvecting/test_radhydro_uniform_advecting.cpp index 79f55b4db..c1085a384 100644 --- a/src/problems/RadhydroUniformAdvecting/test_radhydro_uniform_advecting.cpp +++ b/src/problems/RadhydroUniformAdvecting/test_radhydro_uniform_advecting.cpp @@ -62,7 +62,6 @@ template <> struct RadSystem_Traits { static constexpr double radiation_constant = a_rad; static constexpr double Erad_floor = 0.0; static constexpr int beta_order = beta_order_; - static constexpr bool enable_dust_gas_thermal_coupling_model = false; }; template <> struct Physics_Traits { diff --git a/src/radiation/radiation_system.hpp b/src/radiation/radiation_system.hpp index 678cd0232..7dd8f3f1f 100644 --- a/src/radiation/radiation_system.hpp +++ b/src/radiation/radiation_system.hpp @@ -83,8 +83,9 @@ template struct RadSystem_Traits { // this struct is specialized by the user application code // template struct ISM_Traits { - static constexpr double gas_dust_coupling_threshold = 1.0e-6; + static constexpr bool enable_dust_gas_thermal_coupling_model = false; static constexpr bool enable_photoelectric_heating = false; + static constexpr double gas_dust_coupling_threshold = 1.0e-6; }; // A struct to hold the results of the ComputeRadPressure function. @@ -193,7 +194,7 @@ template class RadSystem : public HyperbolicSystem::beta_order; - static constexpr bool enable_dust_gas_thermal_coupling_model_ = RadSystem_Traits::enable_dust_gas_thermal_coupling_model; + static constexpr bool enable_dust_gas_thermal_coupling_model_ = ISM_Traits::enable_dust_gas_thermal_coupling_model; static constexpr bool enable_photoelectric_heating_ = ISM_Traits::enable_photoelectric_heating; static constexpr int nGroups_ = Physics_Traits::nGroups;