diff --git a/singularity-opac/photons/mean_opacity_photons.hpp b/singularity-opac/photons/mean_opacity_photons.hpp index f98dbfe..9e97557 100644 --- a/singularity-opac/photons/mean_opacity_photons.hpp +++ b/singularity-opac/photons/mean_opacity_photons.hpp @@ -323,10 +323,6 @@ class MeanOpacity { } Spiner::DataBox lkappa_; const char *filename_; - enum OpacityAveraging { - Rosseland = 0, - Planck = 1 - }; PlanckDistribution dist_; }; diff --git a/singularity-opac/photons/mean_photon_variant.hpp b/singularity-opac/photons/mean_photon_variant.hpp index d56e705..63f7ec4 100644 --- a/singularity-opac/photons/mean_photon_variant.hpp +++ b/singularity-opac/photons/mean_photon_variant.hpp @@ -28,6 +28,12 @@ namespace singularity { namespace photons { namespace impl { +// mean-opacity mode +enum OpacityAveraging { + Rosseland = 0, + Planck = 1 +}; + template class MeanVariant { private: @@ -94,7 +100,7 @@ class MeanVariant { PORTABLE_INLINE_FUNCTION Real AbsorptionCoefficient(const Real rho, const Real temp, - const int gmode = 0) const { + const int gmode = Rosseland) const { return mpark::visit( [=](const auto &opac) { return opac.AbsorptionCoefficient(rho, temp, gmode); @@ -104,7 +110,7 @@ class MeanVariant { PORTABLE_INLINE_FUNCTION Real Emissivity(const Real rho, const Real temp, - const int gmode = 0, + const int gmode = Rosseland, Real *lambda = nullptr) const { return mpark::visit( [=](const auto &opac) {