Merge pull request #63 from lanl/pdmullen/absorption_coef

Modify evaluation of absorption coefficients
lanl · Jan 17, 2025 · 6ccf891 · 6ccf891
2 parents d93837f + 21ca6f0
commit 6ccf891
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 16 deletions.
diff --git a/singularity-opac/neutrinos/thermal_distributions_neutrinos.hpp b/singularity-opac/neutrinos/thermal_distributions_neutrinos.hpp
@@ -81,7 +81,7 @@ struct FermiDiracDistributionNoMu {
     return ThermalNumberDistributionOfT(temp, type, lambda) / pc::c;
   }
   template <typename Emissivity>
-  PORTABLE_INLINE_FUNCTION Real AbsorptionCoefficientFromKirkhoff(
+  PORTABLE_INLINE_FUNCTION Real AbsorptionCoefficientFromKirchhoff(
       const Emissivity &J, const Real rho, const Real temp, const Real Ye,
       const RadiationType type, const Real nu, Real *lambda = nullptr) const {
     const Real Bnu =
@@ -91,7 +91,7 @@ struct FermiDiracDistributionNoMu {
     return singularity_opac::robust::ratio(jnu, Bnu);
   }
   template <typename Emissivity>
-  PORTABLE_INLINE_FUNCTION Real AngleAveragedAbsorptionCoefficientFromKirkhoff(
+  PORTABLE_INLINE_FUNCTION Real AngleAveragedAbsorptionCoefficientFromKirchhoff(
       const Emissivity &J, const Real rho, const Real temp, const Real Ye,
       const RadiationType type, const Real nu, Real *lambda = nullptr) const {
     const Real Bnu =

diff --git a/singularity-opac/neutrinos/tophat_emissivity_neutrinos.hpp b/singularity-opac/neutrinos/tophat_emissivity_neutrinos.hpp
@@ -55,7 +55,7 @@ class TophatEmissivity {
   Real AbsorptionCoefficient(const Real rho, const Real temp, const Real Ye,
                              const RadiationType type, const Real nu,
                              Real *lambda = nullptr) const {
-    return dist_.AbsorptionCoefficientFromKirkhoff(*this, rho, temp, Ye, type,
+    return dist_.AbsorptionCoefficientFromKirchhoff(*this, rho, temp, Ye, type,
                                                    nu, lambda) /
            (4. * M_PI);
   }
@@ -78,7 +78,7 @@ class TophatEmissivity {
                                           const RadiationType type,
                                           const Real nu,
                                           Real *lambda = nullptr) const {
-    return dist_.AngleAveragedAbsorptionCoefficientFromKirkhoff(
+    return dist_.AngleAveragedAbsorptionCoefficientFromKirchhoff(
         *this, rho, temp, Ye, type, nu, lambda);
   }
 

diff --git a/singularity-opac/photons/epbremsstrahlung_opacity_photons.hpp b/singularity-opac/photons/epbremsstrahlung_opacity_photons.hpp
@@ -53,7 +53,7 @@ class EPBremsstrahlungOpacity {
   PORTABLE_INLINE_FUNCTION
   Real AbsorptionCoefficient(const Real rho, const Real temp, const Real nu,
                              Real *lambda = nullptr) const {
-    return dist_.AbsorptionCoefficientFromKirkhoff(*this, rho, temp, nu,
+    return dist_.AbsorptionCoefficientFromKirchhoff(*this, rho, temp, nu,
                                                    lambda);
   }
 
@@ -71,7 +71,7 @@ class EPBremsstrahlungOpacity {
   Real AngleAveragedAbsorptionCoefficient(const Real rho, const Real temp,
                                           const Real nu,
                                           Real *lambda = nullptr) const {
-    return dist_.AngleAveragedAbsorptionCoefficientFromKirkhoff(
+    return dist_.AngleAveragedAbsorptionCoefficientFromKirchhoff(
         *this, rho, temp, nu, lambda);
   }
 

diff --git a/singularity-opac/photons/gray_opacity_photons.hpp b/singularity-opac/photons/gray_opacity_photons.hpp
@@ -49,8 +49,7 @@ class GrayOpacity {
   PORTABLE_INLINE_FUNCTION
   Real AbsorptionCoefficient(const Real rho, const Real temp, const Real nu,
                              Real *lambda = nullptr) const {
-    return dist_.AbsorptionCoefficientFromKirkhoff(*this, rho, temp, nu,
-                                                   lambda);
+    return rho * kappa_;
   }
 
   template <typename FrequencyIndexer, typename DataIndexer>
@@ -67,8 +66,7 @@ class GrayOpacity {
   Real AngleAveragedAbsorptionCoefficient(const Real rho, const Real temp,
                                           const Real nu,
                                           Real *lambda = nullptr) const {
-    return dist_.AngleAveragedAbsorptionCoefficientFromKirkhoff(
-        *this, rho, temp, nu, lambda);
+    return AbsorptionCoefficient(rho, temp, nu, lambda);
   }
 
   template <typename FrequencyIndexer, typename DataIndexer>

diff --git a/singularity-opac/photons/powerlaw_opacity_photons.hpp b/singularity-opac/photons/powerlaw_opacity_photons.hpp
@@ -52,8 +52,7 @@ class PowerLawOpacity {
   PORTABLE_INLINE_FUNCTION
   Real AbsorptionCoefficient(const Real rho, const Real temp, const Real nu,
                              Real *lambda = nullptr) const {
-    return dist_.AbsorptionCoefficientFromKirkhoff(*this, rho, temp, nu,
-                                                   lambda);
+    return rho * (kappa0_ * std::pow(rho, rho_exp_) * std::pow(temp, temp_exp_));
   }
 
   template <typename FrequencyIndexer, typename DataIndexer>
@@ -70,8 +69,7 @@ class PowerLawOpacity {
   Real AngleAveragedAbsorptionCoefficient(const Real rho, const Real temp,
                                           const Real nu,
                                           Real *lambda = nullptr) const {
-    return dist_.AngleAveragedAbsorptionCoefficientFromKirkhoff(
-        *this, rho, temp, nu, lambda);
+    return AbsorptionCoefficient(rho, temp, nu, lambda);
   }
 
   template <typename FrequencyIndexer, typename DataIndexer>

diff --git a/singularity-opac/photons/thermal_distributions_photons.hpp b/singularity-opac/photons/thermal_distributions_photons.hpp
@@ -74,15 +74,15 @@ struct PlanckDistribution {
     return ThermalNumberDistributionOfT(temp, lambda) / pc::c;
   }
   template <typename Emissivity>
-  PORTABLE_INLINE_FUNCTION Real AbsorptionCoefficientFromKirkhoff(
+  PORTABLE_INLINE_FUNCTION Real AbsorptionCoefficientFromKirchhoff(
       const Emissivity &J, const Real rho, const Real temp, const Real nu,
       Real *lambda = nullptr) const {
     Real Bnu = ThermalDistributionOfTNu(temp, nu, lambda);
     Real jnu = J.EmissivityPerNuOmega(rho, temp, nu, lambda);
     return singularity_opac::robust::ratio(jnu, Bnu);
   }
   template <typename Emissivity>
-  PORTABLE_INLINE_FUNCTION Real AngleAveragedAbsorptionCoefficientFromKirkhoff(
+  PORTABLE_INLINE_FUNCTION Real AngleAveragedAbsorptionCoefficientFromKirchhoff(
       const Emissivity &J, const Real rho, const Real temp, const Real nu,
       Real *lambda = nullptr) const {
     Real Bnu = ThermalDistributionOfTNu(temp, nu, lambda);