Do not divide particle energy weight by frequency.

+ Remove division by frequency in source particle creation. + Update singularity-opac commit to correct mean opacity accesses. + Have regressions fail if mean errors are NaN.
lanl · Jan 29, 2025 · 5bffda0 · 5bffda0
1 parent 33d68b9
commit 5bffda0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/external/singularity-opac b/external/singularity-opac
diff --git a/src/jaybenne/sourcing.cpp b/src/jaybenne/sourcing.cpp
@@ -223,6 +223,9 @@ TaskStatus SourcePhotons(T *md, const Real t_start, const Real dt) {
           ppack_i(b, ph::ijk(1), n) = j;
           ppack_i(b, ph::ijk(2), n) = k;
 
+          // Set energy weight
+          ppack_r(b, ph::weight(), n) = vmesh(b, fj::source_ew_per_cell(), k, j, i);
+
           // Sample position uniformly in space over cell
           // TODO(BRR) only valid for Cartesian
           ppack_r(b, swarm_position::x(), n) = xi + dx_i * (rng_gen.drand() - 0.5);
@@ -257,8 +260,6 @@ TaskStatus SourcePhotons(T *md, const Real t_start, const Real dt) {
             const Real nu = numind * std::exp((n + 0.5) * dlnu);
             ppack_r(b, ph::energy(), n) = hd * nu;
           }
-          ppack_r(b, ph::weight(), n) =
-              vmesh(b, fj::source_ew_per_cell(), k, j, i) / ppack_r(b, ph::energy(), n);
 
           if constexpr (ST == SourceType::emission) {
             dejbn -= ppack_r(b, ph::weight(), n);

diff --git a/tst/regression_test.py b/tst/regression_test.py
@@ -412,10 +412,10 @@ def analytic_comparison(
     print(f"Max fractional error:           {max_frac_error:.2e}")
 
     if args.comparison == "mean":
-        if mean_frac_error > tolerance:
+        if mean_frac_error > tolerance or np.isnan(mean_frac_error):
             success = False
     elif args.comparison == "weighted_mean":
-        if mean_frac_error_weighted > tolerance:
+        if mean_frac_error_weighted > tolerance or np.isnan(mean_frac_error):
             success = False
 
     if args.visualize:
+88 −13		README.md
+8 −0		singularity-opac/constants/constants.hpp
+5 −3		singularity-opac/neutrinos/mean_opacity_neutrinos.hpp
+2 −2		singularity-opac/neutrinos/thermal_distributions_neutrinos.hpp
+2 −2		singularity-opac/neutrinos/tophat_emissivity_neutrinos.hpp
+2 −2		singularity-opac/photons/epbremsstrahlung_opacity_photons.hpp
+2 −4		singularity-opac/photons/gray_opacity_photons.hpp
+5 −7		singularity-opac/photons/mean_opacity_photons.hpp
+31 −0		singularity-opac/photons/mean_photon_types.hpp
+3 −2		singularity-opac/photons/mean_photon_variant.hpp
+6 −4		singularity-opac/photons/non_cgs_photons.hpp
+2 −4		singularity-opac/photons/powerlaw_opacity_photons.hpp
+2 −2		singularity-opac/photons/thermal_distributions_photons.hpp
+1 −1		test/test_mean_opacities.cpp
+1 −1		utils/spiner