From 15e3dd4e1a0b6631c694972dfaaf98d0c2961969 Mon Sep 17 00:00:00 2001 From: John Tramm Date: Fri, 3 Oct 2025 14:45:43 -0500 Subject: [PATCH 01/12] working --- src/random_ray/flat_source_domain.cpp | 22 ++++++++++++++++++++-- src/random_ray/linear_source_domain.cpp | 6 ++++-- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/src/random_ray/flat_source_domain.cpp b/src/random_ray/flat_source_domain.cpp index 1bf27e1eda1..75bd34f6b12 100644 --- a/src/random_ray/flat_source_domain.cpp +++ b/src/random_ray/flat_source_domain.cpp @@ -124,7 +124,9 @@ void FlatSourceDomain::update_single_neutron_source(SourceRegionHandle& srh) double chi = chi_[material * negroups_ + g_out]; scatter_source += sigma_s * scalar_flux; - fission_source += nu_sigma_f * scalar_flux * chi; + if (settings::create_fission_neutrons) { + fission_source += nu_sigma_f * scalar_flux * chi; + } } srh.source(g_out) = (scatter_source + fission_source * inverse_k_eff) / sigma_t; @@ -308,11 +310,13 @@ void FlatSourceDomain::compute_k_eff() { double fission_rate_old = 0; double fission_rate_new = 0; + double power = 0; // Vector for gathering fission source terms for Shannon entropy calculation vector p(n_source_regions(), 0.0f); -#pragma omp parallel for reduction(+ : fission_rate_old, fission_rate_new) +#pragma omp parallel for reduction( \ + + : fission_rate_old, fission_rate_new, power) for (int64_t sr = 0; sr < n_source_regions(); sr++) { // If simulation averaged volume is zero, don't include this cell @@ -328,22 +332,27 @@ void FlatSourceDomain::compute_k_eff() double sr_fission_source_old = 0; double sr_fission_source_new = 0; + double sr_power = 0; for (int g = 0; g < negroups_; g++) { double nu_sigma_f = nu_sigma_f_[material * negroups_ + g]; + double sigma_f = sigma_f_[material * negroups_ + g]; sr_fission_source_old += nu_sigma_f * source_regions_.scalar_flux_old(sr, g); sr_fission_source_new += nu_sigma_f * source_regions_.scalar_flux_new(sr, g); + sr_power += sigma_f * source_regions_.scalar_flux_new(sr, g) * volume; } // Compute total fission rates in FSR sr_fission_source_old *= volume; sr_fission_source_new *= volume; + sr_power *= volume; // Accumulate totals fission_rate_old += sr_fission_source_old; fission_rate_new += sr_fission_source_new; + power += sr_power; // Store total fission rate in the FSR for Shannon calculation p[sr] = sr_fission_source_new; @@ -351,6 +360,15 @@ void FlatSourceDomain::compute_k_eff() double k_eff_new = k_eff_ * (fission_rate_new / fission_rate_old); + // Normalize fluxes to generate a power level of 1 Watt + power = fission_rate_new; + power *= simulation_volume_; + double inverse_power = 1.0 / power; +#pragma omp parallel for + for (int64_t se = 0; se < n_source_elements(); se++) { + source_regions_.scalar_flux_new(se) *= inverse_power; + } + double H = 0.0; // defining an inverse sum for better performance double inverse_sum = 1 / fission_rate_new; diff --git a/src/random_ray/linear_source_domain.cpp b/src/random_ray/linear_source_domain.cpp index e1ad68e3d87..47ffbb727b7 100644 --- a/src/random_ray/linear_source_domain.cpp +++ b/src/random_ray/linear_source_domain.cpp @@ -68,9 +68,11 @@ void LinearSourceDomain::update_single_neutron_source(SourceRegionHandle& srh) // Compute source terms for flat and linear components of the flux scatter_flat += sigma_s * flux_flat; - fission_flat += nu_sigma_f * flux_flat * chi; scatter_linear += sigma_s * flux_linear; - fission_linear += nu_sigma_f * flux_linear * chi; + if (settings::create_fission_neutrons) { + fission_flat += nu_sigma_f * flux_flat * chi; + fission_linear += nu_sigma_f * flux_linear * chi; + } } // Compute the flat source term From 5ab5f2966da8bba46176ef737ca2086530571dc0 Mon Sep 17 00:00:00 2001 From: John Tramm Date: Fri, 3 Oct 2025 15:05:14 -0500 Subject: [PATCH 02/12] normalization improvements --- src/random_ray/flat_source_domain.cpp | 31 ++++++++++++++++----------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/src/random_ray/flat_source_domain.cpp b/src/random_ray/flat_source_domain.cpp index 75bd34f6b12..44dc0970e4d 100644 --- a/src/random_ray/flat_source_domain.cpp +++ b/src/random_ray/flat_source_domain.cpp @@ -310,13 +310,11 @@ void FlatSourceDomain::compute_k_eff() { double fission_rate_old = 0; double fission_rate_new = 0; - double power = 0; // Vector for gathering fission source terms for Shannon entropy calculation vector p(n_source_regions(), 0.0f); -#pragma omp parallel for reduction( \ - + : fission_rate_old, fission_rate_new, power) +#pragma omp parallel for reduction(+ : fission_rate_old, fission_rate_new) for (int64_t sr = 0; sr < n_source_regions(); sr++) { // If simulation averaged volume is zero, don't include this cell @@ -332,27 +330,22 @@ void FlatSourceDomain::compute_k_eff() double sr_fission_source_old = 0; double sr_fission_source_new = 0; - double sr_power = 0; for (int g = 0; g < negroups_; g++) { double nu_sigma_f = nu_sigma_f_[material * negroups_ + g]; - double sigma_f = sigma_f_[material * negroups_ + g]; sr_fission_source_old += nu_sigma_f * source_regions_.scalar_flux_old(sr, g); sr_fission_source_new += nu_sigma_f * source_regions_.scalar_flux_new(sr, g); - sr_power += sigma_f * source_regions_.scalar_flux_new(sr, g) * volume; } // Compute total fission rates in FSR sr_fission_source_old *= volume; sr_fission_source_new *= volume; - sr_power *= volume; // Accumulate totals fission_rate_old += sr_fission_source_old; fission_rate_new += sr_fission_source_new; - power += sr_power; // Store total fission rate in the FSR for Shannon calculation p[sr] = sr_fission_source_new; @@ -360,13 +353,25 @@ void FlatSourceDomain::compute_k_eff() double k_eff_new = k_eff_ * (fission_rate_new / fission_rate_old); - // Normalize fluxes to generate a power level of 1 Watt - power = fission_rate_new; - power *= simulation_volume_; - double inverse_power = 1.0 / power; + // Normalize fluxes by total number of fission neutrons produced. This ensures + // consistent scaling of the eigenvector such that its magnitude is + // comparable to the eigenvector produced by the Monte Carlo solver. + // Multiplying by the eigenvalue is unintuitive, but it is necessary. + // If the eigenvalue is 1.2, per starting source neutron, you will + // generate 1.2 neutrons. Thus if we normalize to generating only ONE neutron + // in total for the whole domain, then we don't actually have enough flux to + // generate the required 1.2 neutrons. We only know the flux required to + // generate 1 neutron (which would have required less then one starting + // neutron). Thus, you have to scale the flux up by the eigenvalue such + // that 1.2 neutrons are generated, so as to be consistent with the + // bookkeeping in MC which is all done per starting source neutron (not per + // neutron produced). + double total_fission_neutrons = fission_rate_new * simulation_volume_; + double norm_factor = k_eff_new / total_fission_neutrons; + #pragma omp parallel for for (int64_t se = 0; se < n_source_elements(); se++) { - source_regions_.scalar_flux_new(se) *= inverse_power; + source_regions_.scalar_flux_new(se) *= norm_factor; } double H = 0.0; From 018135fc8a19560280cbf0cc7954cb6d5ed8f08a Mon Sep 17 00:00:00 2001 From: John Tramm Date: Fri, 3 Oct 2025 16:51:12 -0500 Subject: [PATCH 03/12] updated tests due to new random ray flux normalization in eigenvalue mode --- .../random_ray_adjoint_k_eff/results_true.dat | 244 ++++++------- .../material_wise/results_true.dat | 2 +- .../stochastic_slab/results_true.dat | 2 +- .../results_true.dat | 2 +- .../results_true.dat | 336 ++++++++--------- .../random_ray_k_eff/results_true.dat | 338 +++++++++--------- .../random_ray_k_eff_mesh/results_true.dat | 338 +++++++++--------- .../random_ray_linear/linear/results_true.dat | 338 +++++++++--------- .../linear_xy/results_true.dat | 338 +++++++++--------- 9 files changed, 969 insertions(+), 969 deletions(-) diff --git a/tests/regression_tests/random_ray_adjoint_k_eff/results_true.dat b/tests/regression_tests/random_ray_adjoint_k_eff/results_true.dat index 657c841b561..dfef53cd2f9 100644 --- a/tests/regression_tests/random_ray_adjoint_k_eff/results_true.dat +++ b/tests/regression_tests/random_ray_adjoint_k_eff/results_true.dat @@ -1,171 +1,171 @@ k-combined: 1.006640E+00 1.812969E-03 tally 1: -6.684129E+00 -8.939821E+00 -2.685967E+00 -1.443592E+00 +1.208044E+00 +2.920182E-01 +4.854426E-01 +4.715453E-02 0.000000E+00 0.000000E+00 -6.358774E+00 -8.091444E+00 -9.687217E-01 -1.878029E-01 +1.149242E+00 +2.643067E-01 +1.750801E-01 +6.134563E-03 0.000000E+00 0.000000E+00 -5.963160E+00 -7.117108E+00 -1.932332E-01 -7.473914E-03 +1.077743E+00 +2.324814E-01 +3.492371E-02 +2.441363E-04 0.000000E+00 0.000000E+00 -5.137593E+00 -5.283310E+00 -1.714616E-01 -5.884834E-03 -1.086218E-06 -2.361752E-13 -4.857253E+00 -4.719856E+00 -5.689580E-02 -6.476286E-04 -2.989356E-03 -1.787808E-06 -4.830516E+00 -4.666801E+00 -7.203015E-03 -1.037676E-05 -3.620020E+00 -2.620927E+00 -5.161382E+00 -5.328124E+00 -6.786255E-02 -9.210763E-04 -5.531943E+00 -6.120553E+00 -5.414034E+00 -5.864661E+00 +9.285362E-01 +1.725808E-01 +3.098889E-02 +1.922297E-04 +1.963161E-07 +7.714727E-15 +8.778641E-01 +1.541719E-01 +1.028293E-02 +2.115448E-05 +5.402741E-04 +5.839789E-08 +8.730274E-01 +1.524358E-01 +1.301813E-03 +3.389450E-07 +6.542525E-01 +8.560964E-02 +9.328247E-01 +1.740366E-01 +1.226491E-02 +3.008584E-05 +9.997969E-01 +1.999204E-01 +9.784958E-01 +1.915688E-01 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 -5.632338E+00 -6.347626E+00 +1.017952E+00 +2.073461E-01 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 -5.682608E+00 -6.462382E+00 +1.027039E+00 +2.110955E-01 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 -5.310716E+00 -5.645180E+00 +9.598240E-01 +1.844004E-01 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 -4.945409E+00 -4.893171E+00 +8.937969E-01 +1.598332E-01 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 -4.842688E+00 -4.690352E+00 +8.752275E-01 +1.532052E-01 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 -5.117198E+00 -5.237280E+00 +9.248400E-01 +1.710699E-01 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 -6.938711E+00 -9.633345E+00 -2.835258E+00 -1.608212E+00 +1.254054E+00 +3.146708E-01 +5.124223E-01 +5.253093E-02 0.000000E+00 0.000000E+00 -6.549505E+00 -8.584036E+00 -1.015138E+00 -2.061993E-01 +1.183712E+00 +2.803961E-01 +1.834683E-01 +6.735381E-03 0.000000E+00 0.000000E+00 -6.050651E+00 -7.327711E+00 -1.992816E-01 -7.948424E-03 +1.093555E+00 +2.393604E-01 +3.601678E-02 +2.596341E-04 0.000000E+00 0.000000E+00 -5.113981E+00 -5.234801E+00 -1.732323E-01 -6.006619E-03 -1.097435E-06 -2.410627E-13 -4.837033E+00 -4.680541E+00 -5.760042E-02 -6.637112E-04 -3.026377E-03 -1.832205E-06 -4.827049E+00 -4.660105E+00 -7.319913E-03 -1.071647E-05 -3.678770E+00 -2.706730E+00 -5.175337E+00 -5.356957E+00 -6.923046E-02 -9.586177E-04 -5.643451E+00 -6.370016E+00 -6.693323E+00 -8.964322E+00 -2.753307E+00 -1.516683E+00 +9.242694E-01 +1.709967E-01 +3.130894E-02 +1.962084E-04 +1.983437E-07 +7.874400E-15 +8.742100E-01 +1.528879E-01 +1.041026E-02 +2.167970E-05 +5.469644E-04 +5.984780E-08 +8.724009E-01 +1.522171E-01 +1.322938E-03 +3.500386E-07 +6.648691E-01 +8.841161E-02 +9.353464E-01 +1.749781E-01 +1.251209E-02 +3.131171E-05 +1.019947E+00 +2.080664E-01 +1.209708E+00 +2.928214E-01 +4.976146E-01 +4.954258E-02 0.000000E+00 0.000000E+00 -6.358384E+00 -8.090233E+00 -9.912008E-01 -1.965868E-01 +1.149174E+00 +2.642694E-01 +1.791431E-01 +6.421530E-03 0.000000E+00 0.000000E+00 -5.957484E+00 -7.103246E+00 -1.974033E-01 -7.798286E-03 +1.076718E+00 +2.320295E-01 +3.567737E-02 +2.547314E-04 0.000000E+00 0.000000E+00 -5.130744E+00 -5.268844E+00 -1.749233E-01 -6.123348E-03 -1.108148E-06 -2.457474E-13 -4.857340E+00 -4.720019E+00 -5.816659E-02 -6.768049E-04 -3.056125E-03 -1.868351E-06 -4.830629E+00 -4.667018E+00 -7.366289E-03 -1.085264E-05 -3.702077E+00 -2.741125E+00 -5.164864E+00 -5.335279E+00 -6.947917E-02 -9.655086E-04 -5.663725E+00 -6.415806E+00 +9.272977E-01 +1.721077E-01 +3.161443E-02 +2.000179E-04 +2.002789E-07 +8.027290E-15 +8.778794E-01 +1.541769E-01 +1.051257E-02 +2.210729E-05 +5.523400E-04 +6.102818E-08 +8.730477E-01 +1.524429E-01 +1.331320E-03 +3.544869E-07 +6.690816E-01 +8.953516E-02 +9.334544E-01 +1.742707E-01 +1.255707E-02 +3.153710E-05 +1.023613E+00 +2.095641E-01 diff --git a/tests/regression_tests/random_ray_auto_convert/material_wise/results_true.dat b/tests/regression_tests/random_ray_auto_convert/material_wise/results_true.dat index d544a27df64..6557c76024a 100644 --- a/tests/regression_tests/random_ray_auto_convert/material_wise/results_true.dat +++ b/tests/regression_tests/random_ray_auto_convert/material_wise/results_true.dat @@ -1,2 +1,2 @@ k-combined: -7.356667E-01 6.637270E-03 +7.366910E-01 6.872852E-03 diff --git a/tests/regression_tests/random_ray_auto_convert/stochastic_slab/results_true.dat b/tests/regression_tests/random_ray_auto_convert/stochastic_slab/results_true.dat index 75a10a22477..56ce009acbc 100644 --- a/tests/regression_tests/random_ray_auto_convert/stochastic_slab/results_true.dat +++ b/tests/regression_tests/random_ray_auto_convert/stochastic_slab/results_true.dat @@ -1,2 +1,2 @@ k-combined: -7.551716E-01 8.117378E-03 +7.551716E-01 8.117379E-03 diff --git a/tests/regression_tests/random_ray_diagonal_stabilization/results_true.dat b/tests/regression_tests/random_ray_diagonal_stabilization/results_true.dat index f27ad46b467..736fd3749ff 100644 --- a/tests/regression_tests/random_ray_diagonal_stabilization/results_true.dat +++ b/tests/regression_tests/random_ray_diagonal_stabilization/results_true.dat @@ -1,2 +1,2 @@ k-combined: -7.201808E-01 1.506596E-02 +7.202605E-01 1.464839E-02 diff --git a/tests/regression_tests/random_ray_halton_samples/results_true.dat b/tests/regression_tests/random_ray_halton_samples/results_true.dat index b62398935b0..256f8a744a3 100644 --- a/tests/regression_tests/random_ray_halton_samples/results_true.dat +++ b/tests/regression_tests/random_ray_halton_samples/results_true.dat @@ -1,171 +1,171 @@ k-combined: 8.388051E-01 7.383265E-03 tally 1: -5.033308E+00 -5.072162E+00 -1.917335E+00 -7.360725E-01 -4.666410E+00 -4.360038E+00 -2.851812E+00 -1.629362E+00 -4.365590E-01 -3.818884E-02 -1.062497E+00 -2.262071E-01 -1.697621E+00 -5.829333E-01 -5.639912E-02 -6.427568E-04 -1.372642E-01 -3.807294E-03 -2.376683E+00 -1.151027E+00 -8.060903E-02 -1.323179E-03 -1.961862E-01 -7.837693E-03 -7.145452E+00 -1.037540E+01 -8.551803E-02 -1.486269E-03 -2.081363E-01 -8.803955E-03 -2.053205E+01 -8.469498E+01 -3.235618E-02 -2.102891E-04 -8.006311E-02 -1.287559E-03 -1.326545E+01 -3.519484E+01 -1.867471E-01 -6.975133E-03 -5.194275E-01 -5.396284E-02 -7.558115E+00 -1.142535E+01 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -3.386211E+00 -2.294414E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -1.827274E+00 -6.782305E-01 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -2.702858E+00 -1.489752E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -7.475537E+00 -1.133971E+01 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -1.828685E+01 -6.719606E+01 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -1.143600E+01 -2.615734E+01 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -4.590713E+00 -4.224107E+00 -1.705847E+00 -5.831967E-01 -4.151691E+00 -3.454497E+00 -2.730853E+00 -1.495413E+00 -4.072633E-01 -3.325944E-02 -9.911973E-01 -1.970084E-01 -1.664732E+00 -5.598668E-01 -5.385645E-02 -5.858353E-04 -1.310758E-01 -3.470126E-03 -2.312239E+00 -1.088485E+00 -7.662778E-02 -1.195422E-03 -1.864967E-01 -7.080943E-03 -7.105766E+00 -1.025960E+01 -8.287512E-02 -1.396474E-03 -2.017039E-01 -8.272053E-03 -2.099024E+01 -8.854251E+01 -3.191885E-02 -2.048368E-04 -7.898095E-02 -1.254175E-03 -1.355820E+01 -3.676862E+01 -1.815102E-01 -6.590727E-03 -5.048614E-01 -5.098890E-02 -5.093659E+00 -5.192360E+00 -1.874632E+00 -7.031793E-01 -4.562478E+00 -4.165199E+00 -2.870214E+00 -1.650126E+00 -4.244069E-01 -3.608745E-02 -1.032921E+00 -2.137598E-01 -1.703400E+00 -5.873029E-01 -5.464557E-02 -6.042855E-04 -1.329964E-01 -3.579413E-03 -2.389118E+00 -1.163674E+00 -7.832237E-02 -1.251254E-03 -1.906210E-01 -7.411654E-03 -7.162707E+00 -1.042515E+01 -8.273831E-02 -1.391799E-03 -2.013709E-01 -8.244359E-03 -2.043145E+01 -8.383557E+01 -3.096158E-02 -1.924116E-04 -7.661226E-02 -1.178098E-03 -1.314148E+01 -3.454143E+01 -1.771732E-01 -6.279887E-03 -4.927984E-01 -4.858410E-02 +1.065839E+00 +2.274384E-01 +4.060094E-01 +3.300592E-02 +9.881457E-01 +1.955066E-01 +6.038893E-01 +7.306038E-02 +9.244411E-02 +1.712380E-03 +2.249905E-01 +1.014308E-02 +3.594916E-01 +2.614145E-02 +1.194318E-02 +2.882412E-05 +2.906731E-02 +1.707363E-04 +5.032954E-01 +5.161897E-02 +1.707007E-02 +5.933921E-05 +4.154514E-02 +3.514889E-04 +1.513147E+00 +4.652938E-01 +1.810962E-02 +6.665306E-05 +4.407572E-02 +3.948212E-04 +4.347893E+00 +3.798064E+00 +6.851785E-03 +9.430195E-06 +1.695426E-02 +5.773923E-05 +2.809071E+00 +1.578195E+00 +3.954523E-02 +3.127754E-04 +1.099931E-01 +2.419775E-03 +1.600493E+00 +5.123291E-01 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +7.170555E-01 +1.028835E-01 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +3.869491E-01 +3.041553E-02 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +5.723683E-01 +6.680970E-02 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +1.583046E+00 +5.085372E-01 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +3.872447E+00 +3.013344E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +2.421670E+00 +1.172938E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +9.721128E-01 +1.894086E-01 +3.612242E-01 +2.615053E-02 +8.791475E-01 +1.548996E-01 +5.782742E-01 +6.705354E-02 +8.624040E-02 +1.491336E-03 +2.098919E-01 +8.833753E-03 +3.525265E-01 +2.510689E-02 +1.140473E-02 +2.627142E-05 +2.775683E-02 +1.556157E-04 +4.896481E-01 +4.881407E-02 +1.622698E-02 +5.360976E-05 +3.949322E-02 +3.175511E-04 +1.504743E+00 +4.601003E-01 +1.754995E-02 +6.262618E-05 +4.271358E-02 +3.709679E-04 +4.444922E+00 +3.970609E+00 +6.759184E-03 +9.185746E-06 +1.672513E-02 +5.624252E-05 +2.871068E+00 +1.648778E+00 +3.843643E-02 +2.955428E-04 +1.069090E-01 +2.286455E-03 +1.078620E+00 +2.328291E-01 +3.969671E-01 +3.153110E-02 +9.661384E-01 +1.867708E-01 +6.077864E-01 +7.399164E-02 +8.987086E-02 +1.618157E-03 +2.187277E-01 +9.584966E-03 +3.607158E-01 +2.633746E-02 +1.157185E-02 +2.709895E-05 +2.816358E-02 +1.605174E-04 +5.059289E-01 +5.218618E-02 +1.658585E-02 +5.611375E-05 +4.036663E-02 +3.323832E-04 +1.516801E+00 +4.675245E-01 +1.752096E-02 +6.241641E-05 +4.264304E-02 +3.697253E-04 +4.326588E+00 +3.759517E+00 +6.556454E-03 +8.628460E-06 +1.622349E-02 +5.283037E-05 +2.782815E+00 +1.548888E+00 +3.751781E-02 +2.815972E-04 +1.043539E-01 +2.178566E-03 diff --git a/tests/regression_tests/random_ray_k_eff/results_true.dat b/tests/regression_tests/random_ray_k_eff/results_true.dat index 37eca77f3cf..ace18df8cce 100644 --- a/tests/regression_tests/random_ray_k_eff/results_true.dat +++ b/tests/regression_tests/random_ray_k_eff/results_true.dat @@ -1,171 +1,171 @@ k-combined: -8.400321E-01 8.023358E-03 +8.400321E-01 8.023357E-03 tally 1: -5.086559E+00 -5.180935E+00 -1.885166E+00 -7.115503E-01 -4.588116E+00 -4.214784E+00 -2.860400E+00 -1.639328E+00 -4.245221E-01 -3.610929E-02 -1.033202E+00 -2.138892E-01 -1.692631E+00 -5.793966E-01 -5.445818E-02 -5.996625E-04 -1.325403E-01 -3.552030E-03 -2.372248E+00 -1.146944E+00 -7.808142E-02 -1.242278E-03 -1.900346E-01 -7.358491E-03 -7.134949E+00 -1.034824E+01 -8.272647E-02 -1.391871E-03 -2.013421E-01 -8.244788E-03 -2.043539E+01 -8.389902E+01 -3.099367E-02 -1.930673E-04 -7.669167E-02 -1.182113E-03 -1.313212E+01 -3.449537E+01 -1.764293E-01 -6.225586E-03 -4.907293E-01 -4.816400E-02 -7.567715E+00 -1.145439E+01 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -3.383194E+00 -2.290468E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -1.819672E+00 -6.726158E-01 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -2.693683E+00 -1.480961E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -7.453758E+00 -1.128171E+01 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -1.823561E+01 -6.681652E+01 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -1.137517E+01 -2.588512E+01 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -4.601916E+00 -4.242624E+00 -1.719723E+00 -5.923465E-01 -4.185462E+00 -3.508695E+00 -2.730305E+00 -1.494324E+00 -4.108214E-01 -3.383938E-02 -9.998572E-01 -2.004436E-01 -1.660852E+00 -5.570432E-01 -5.428709E-02 -5.947848E-04 -1.321239E-01 -3.523137E-03 -2.306069E+00 -1.082855E+00 -7.697031E-02 -1.206036E-03 -1.873303E-01 -7.143815E-03 -7.075194E+00 -1.017519E+01 -8.322052E-02 -1.408294E-03 -2.025446E-01 -8.342071E-03 -2.094832E+01 -8.816715E+01 -3.234739E-02 -2.101889E-04 -8.004135E-02 -1.286945E-03 -1.357413E+01 -3.685983E+01 -1.861680E-01 -6.934827E-03 -5.178169E-01 -5.365102E-02 -5.072149E+00 -5.151429E+00 -1.916643E+00 -7.358710E-01 -4.664726E+00 -4.358845E+00 -2.859464E+00 -1.638250E+00 -4.332944E-01 -3.763170E-02 -1.054552E+00 -2.229070E-01 -1.693008E+00 -5.796671E-01 -5.561096E-02 -6.247543E-04 -1.353459E-01 -3.700658E-03 -2.368860E+00 -1.143296E+00 -7.951819E-02 -1.286690E-03 -1.935314E-01 -7.621557E-03 -7.119587E+00 -1.030023E+01 -8.428175E-02 -1.442931E-03 -2.051274E-01 -8.547243E-03 -2.046758E+01 -8.418768E+01 -3.181946E-02 -2.034766E-04 -7.873502E-02 -1.245847E-03 -1.325834E+01 -3.515919E+01 -1.832838E-01 -6.720555E-03 -5.097947E-01 -5.199331E-02 +1.075769E+00 +2.317354E-01 +3.986991E-01 +3.182682E-02 +9.703538E-01 +1.885224E-01 +6.049423E-01 +7.331941E-02 +8.978161E-02 +1.614997E-03 +2.185105E-01 +9.566247E-03 +3.579852E-01 +2.591721E-02 +1.151770E-02 +2.682363E-05 +2.803176E-02 +1.588866E-04 +5.017326E-01 +5.130808E-02 +1.651428E-02 +5.557274E-05 +4.019245E-02 +3.291786E-04 +1.509054E+00 +4.629325E-01 +1.749679E-02 +6.226587E-05 +4.258421E-02 +3.688336E-04 +4.322054E+00 +3.753085E+00 +6.555113E-03 +8.636537E-06 +1.622017E-02 +5.287982E-05 +2.777351E+00 +1.542942E+00 +3.731363E-02 +2.784662E-04 +1.037860E-01 +2.154343E-03 +1.600522E+00 +5.123477E-01 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +7.155116E-01 +1.024445E-01 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +3.848568E-01 +3.008769E-02 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +5.697160E-01 +6.624996E-02 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +1.576480E+00 +5.046890E-01 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +3.856827E+00 +2.989000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +2.405807E+00 +1.157889E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +9.732717E-01 +1.897670E-01 +3.637108E-01 +2.649544E-02 +8.851992E-01 +1.569426E-01 +5.774286E-01 +6.683395E-02 +8.688408E-02 +1.513473E-03 +2.114585E-01 +8.964883E-03 +3.512640E-01 +2.491729E-02 +1.148149E-02 +2.660532E-05 +2.794365E-02 +1.575935E-04 +4.877362E-01 +4.844138E-02 +1.627932E-02 +5.395212E-05 +3.962062E-02 +3.195790E-04 +1.496416E+00 +4.551920E-01 +1.760130E-02 +6.300084E-05 +4.283856E-02 +3.731872E-04 +4.430519E+00 +3.943947E+00 +6.841363E-03 +9.402132E-06 +1.692847E-02 +5.756741E-05 +2.870816E+00 +1.648662E+00 +3.937267E-02 +3.101707E-04 +1.095131E-01 +2.399624E-03 +1.072714E+00 +2.304093E-01 +4.053505E-01 +3.291277E-02 +9.865420E-01 +1.949549E-01 +6.047420E-01 +7.327008E-02 +9.163611E-02 +1.683034E-03 +2.230240E-01 +9.969255E-03 +3.580639E-01 +2.592902E-02 +1.176143E-02 +2.794541E-05 +2.862497E-02 +1.655313E-04 +5.010143E-01 +5.114429E-02 +1.681803E-02 +5.755790E-05 +4.093173E-02 +3.409375E-04 +1.505803E+00 +4.607828E-01 +1.782566E-02 +6.454911E-05 +4.338462E-02 +3.823584E-04 +4.328879E+00 +3.766055E+00 +6.729800E-03 +9.102372E-06 +1.665242E-02 +5.573204E-05 +2.804070E+00 +1.572690E+00 +3.876396E-02 +3.006259E-04 +1.078200E-01 +2.325780E-03 diff --git a/tests/regression_tests/random_ray_k_eff_mesh/results_true.dat b/tests/regression_tests/random_ray_k_eff_mesh/results_true.dat index 83209044ba7..7d8280cb9e3 100644 --- a/tests/regression_tests/random_ray_k_eff_mesh/results_true.dat +++ b/tests/regression_tests/random_ray_k_eff_mesh/results_true.dat @@ -1,171 +1,171 @@ k-combined: -8.379203E-01 8.057199E-03 +8.379218E-01 8.057310E-03 tally 1: -5.080172E+00 -5.167984E+00 -1.880341E+00 -7.079266E-01 -4.576373E+00 -4.193319E+00 -2.859914E+00 -1.638769E+00 -4.243332E-01 -3.607732E-02 -1.032742E+00 -2.136998E-01 -1.692643E+00 -5.794069E-01 -5.445214E-02 -5.995213E-04 -1.325256E-01 -3.551193E-03 -2.372336E+00 -1.147031E+00 -7.807378E-02 -1.242019E-03 -1.900160E-01 -7.356955E-03 -7.135636E+00 -1.035026E+01 -8.273225E-02 -1.392069E-03 -2.013562E-01 -8.245961E-03 -2.044034E+01 -8.394042E+01 -3.100485E-02 -1.932097E-04 -7.671934E-02 -1.182985E-03 -1.313652E+01 -3.451846E+01 -1.764978E-01 -6.230420E-03 -4.909196E-01 -4.820140E-02 -7.585874E+00 -1.150936E+01 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -3.386790E+00 -2.295327E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -1.820058E+00 -6.729239E-01 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -2.694013E+00 -1.481363E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -7.453818E+00 -1.128202E+01 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -1.823642E+01 -6.682239E+01 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -1.137903E+01 -2.590265E+01 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -4.589529E+00 -4.219985E+00 -1.712446E+00 -5.873675E-01 -4.167750E+00 -3.479202E+00 -2.728285E+00 -1.492132E+00 -4.104063E-01 -3.377132E-02 -9.988468E-01 -2.000405E-01 -1.660506E+00 -5.567967E-01 -5.427391E-02 -5.944708E-04 -1.320918E-01 -3.521277E-03 -2.305889E+00 -1.082691E+00 -7.695793E-02 -1.205644E-03 -1.873002E-01 -7.141490E-03 -7.076637E+00 -1.017946E+01 -8.323139E-02 -1.408687E-03 -2.025710E-01 -8.344398E-03 -2.095897E+01 -8.825741E+01 -3.236513E-02 -2.104220E-04 -8.008525E-02 -1.288373E-03 -1.358006E+01 -3.689205E+01 -1.862562E-01 -6.941428E-03 -5.180621E-01 -5.370209E-02 -5.067386E+00 -5.141748E+00 -1.912704E+00 -7.328484E-01 -4.655140E+00 -4.340941E+00 -2.858992E+00 -1.637705E+00 -4.331050E-01 -3.759875E-02 -1.054091E+00 -2.227118E-01 -1.692974E+00 -5.796396E-01 -5.560487E-02 -6.246120E-04 -1.353311E-01 -3.699815E-03 -2.368737E+00 -1.143184E+00 -7.950086E-02 -1.286135E-03 -1.934892E-01 -7.618269E-03 -7.119767E+00 -1.030095E+01 -8.427628E-02 -1.442764E-03 -2.051141E-01 -8.546249E-03 -2.047651E+01 -8.426275E+01 -3.183786E-02 -2.037156E-04 -7.878057E-02 -1.247311E-03 -1.326415E+01 -3.519010E+01 -1.833688E-01 -6.726832E-03 -5.100312E-01 -5.204188E-02 +1.073899E+00 +2.309335E-01 +3.974865E-01 +3.163425E-02 +9.674026E-01 +1.873817E-01 +6.045473E-01 +7.322391E-02 +8.969834E-02 +1.612016E-03 +2.183078E-01 +9.548588E-03 +3.578125E-01 +2.589204E-02 +1.151078E-02 +2.679080E-05 +2.801493E-02 +1.586921E-04 +5.015042E-01 +5.126084E-02 +1.650454E-02 +5.550581E-05 +4.016875E-02 +3.287821E-04 +1.508457E+00 +4.625620E-01 +1.748940E-02 +6.221274E-05 +4.256623E-02 +3.685188E-04 +4.320984E+00 +3.751239E+00 +6.554267E-03 +8.634391E-06 +1.621807E-02 +5.286669E-05 +2.776930E+00 +1.542475E+00 +3.730994E-02 +2.784112E-04 +1.037757E-01 +2.153917E-03 +1.603584E+00 +5.143070E-01 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +7.159250E-01 +1.025625E-01 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +3.847492E-01 +3.007157E-02 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +5.695054E-01 +6.620186E-02 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +1.575717E+00 +5.042008E-01 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +3.855110E+00 +2.986318E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +2.405453E+00 +1.157547E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +9.701844E-01 +1.885734E-01 +3.619972E-01 +2.624754E-02 +8.810288E-01 +1.554742E-01 +5.767233E-01 +6.667193E-02 +8.675446E-02 +1.508982E-03 +2.111430E-01 +8.938279E-03 +3.510189E-01 +2.488166E-02 +1.147309E-02 +2.656504E-05 +2.792320E-02 +1.573549E-04 +4.874582E-01 +4.838581E-02 +1.626870E-02 +5.388091E-05 +3.959477E-02 +3.191572E-04 +1.495985E+00 +4.549299E-01 +1.759494E-02 +6.295571E-05 +4.282308E-02 +3.729198E-04 +4.430602E+00 +3.944095E+00 +6.841765E-03 +9.403286E-06 +1.692947E-02 +5.757448E-05 +2.870671E+00 +1.648496E+00 +3.937215E-02 +3.101637E-04 +1.095116E-01 +2.399569E-03 +1.071189E+00 +2.297551E-01 +4.043224E-01 +3.274607E-02 +9.840398E-01 +1.939675E-01 +6.043502E-01 +7.317527E-02 +9.155185E-02 +1.679945E-03 +2.228189E-01 +9.950956E-03 +3.578813E-01 +2.590214E-02 +1.175439E-02 +2.791143E-05 +2.860782E-02 +1.653300E-04 +5.007418E-01 +5.108832E-02 +1.680610E-02 +5.747580E-05 +4.090268E-02 +3.404511E-04 +1.505100E+00 +4.603567E-01 +1.781574E-02 +6.447740E-05 +4.336047E-02 +3.819337E-04 +4.328648E+00 +3.765701E+00 +6.730398E-03 +9.104089E-06 +1.665390E-02 +5.574255E-05 +2.803934E+00 +1.572541E+00 +3.876306E-02 +3.006136E-04 +1.078175E-01 +2.325685E-03 diff --git a/tests/regression_tests/random_ray_linear/linear/results_true.dat b/tests/regression_tests/random_ray_linear/linear/results_true.dat index 4c0e14370e3..eafa7833e38 100644 --- a/tests/regression_tests/random_ray_linear/linear/results_true.dat +++ b/tests/regression_tests/random_ray_linear/linear/results_true.dat @@ -1,171 +1,171 @@ k-combined: -1.095967E+00 1.543581E-02 +1.095996E+00 1.543745E-02 tally 1: -2.548108E+01 -3.269093E+01 -9.271804E+00 -4.327275E+00 -2.256572E+01 -2.563210E+01 -1.816107E+01 -1.653421E+01 -2.659203E+00 -3.544951E-01 -6.471969E+00 -2.099810E+00 -1.364193E+01 -9.308675E+00 -4.362828E-01 -9.521133E-03 -1.061825E+00 -5.639730E-02 -1.746102E+01 -1.524680E+01 -5.733016E-01 -1.643671E-02 -1.395301E+00 -9.736092E-02 -4.539598E+01 -1.030472E+02 -5.263055E-01 -1.385088E-02 -1.280938E+00 -8.204609E-02 -9.945736E+01 -4.946716E+02 -1.505228E-01 -1.133424E-03 -3.724582E-01 -6.939732E-03 -5.324914E+01 -1.418809E+02 -7.219589E-01 -2.614875E-02 -2.008092E+00 -2.022988E-01 -4.188246E+01 -8.843469E+01 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -2.224363E+01 -2.481131E+01 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -1.436097E+01 -1.031496E+01 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -1.901248E+01 -1.807657E+01 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -4.559337E+01 -1.039424E+02 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -8.802992E+01 -3.874925E+02 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -4.506602E+01 -1.016497E+02 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -2.207833E+01 -2.455068E+01 -8.139772E+00 -3.337974E+00 -1.981058E+01 -1.977210E+01 -1.710407E+01 -1.466648E+01 -2.542287E+00 -3.240467E-01 -6.187418E+00 -1.919453E+00 -1.342690E+01 -9.017908E+00 -4.362263E-01 -9.518695E-03 -1.061688E+00 -5.638286E-02 -1.713924E+01 -1.469065E+01 -5.714028E-01 -1.632839E-02 -1.390680E+00 -9.671931E-02 -4.539193E+01 -1.030326E+02 -5.345254E-01 -1.428719E-02 -1.300944E+00 -8.463057E-02 -1.013270E+02 -5.134168E+02 -1.555517E-01 -1.210145E-03 -3.849017E-01 -7.409480E-03 -5.377836E+01 -1.446537E+02 -7.374053E-01 -2.722908E-02 -2.051056E+00 -2.106567E-01 -2.522726E+01 -3.202007E+01 -9.366659E+00 -4.412278E+00 -2.279657E+01 -2.613561E+01 -1.803368E+01 -1.629756E+01 -2.696490E+00 -3.643066E-01 -6.562716E+00 -2.157928E+00 -1.357447E+01 -9.216150E+00 -4.437305E-01 -9.847287E-03 -1.079951E+00 -5.832923E-02 -1.735848E+01 -1.506775E+01 -5.825173E-01 -1.696803E-02 -1.417731E+00 -1.005081E-01 -4.519297E+01 -1.021280E+02 -5.357712E-01 -1.435322E-02 -1.303976E+00 -8.502167E-02 -9.934508E+01 -4.935314E+02 -1.538761E-01 -1.184229E-03 -3.807556E-01 -7.250804E-03 -5.335839E+01 -1.424221E+02 -7.404823E-01 -2.747396E-02 -2.059614E+00 -2.125512E-01 +5.425638E+00 +1.482193E+00 +1.974294E+00 +1.962100E-01 +4.805036E+00 +1.162227E+00 +3.866946E+00 +7.496283E-01 +5.662196E-01 +1.607259E-02 +1.378065E+00 +9.520408E-02 +2.904663E+00 +4.220187E-01 +9.289452E-02 +4.316549E-04 +2.260867E-01 +2.556857E-03 +3.717848E+00 +6.912357E-01 +1.220704E-01 +7.451985E-04 +2.970949E-01 +4.414096E-03 +9.665787E+00 +4.671733E+00 +1.120623E-01 +6.279464E-04 +2.727405E-01 +3.719658E-03 +2.117608E+01 +2.242511E+01 +3.204816E-02 +5.138000E-05 +7.930093E-02 +3.145897E-04 +1.133733E+01 +6.431586E+00 +1.537042E-01 +1.185202E-03 +4.275203E-01 +9.169267E-03 +8.917812E+00 +4.009425E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +4.736214E+00 +1.124879E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +3.057799E+00 +4.676480E-01 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +4.048225E+00 +8.195369E-01 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +9.707960E+00 +4.712445E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +1.874369E+01 +1.756769E+01 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +9.595683E+00 +4.608496E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +4.701064E+00 +1.113098E+00 +1.733195E+00 +1.513432E-01 +4.218249E+00 +8.964633E-01 +3.641874E+00 +6.649431E-01 +5.413172E-01 +1.469163E-02 +1.317458E+00 +8.702412E-02 +2.858883E+00 +4.088372E-01 +9.288215E-02 +4.315400E-04 +2.260566E-01 +2.556176E-03 +3.649337E+00 +6.660223E-01 +1.216653E-01 +7.402775E-04 +2.961090E-01 +4.384947E-03 +9.664960E+00 +4.671105E+00 +1.138124E-01 +6.477255E-04 +2.770000E-01 +3.836819E-03 +2.157443E+01 +2.327552E+01 +3.311948E-02 +5.485980E-05 +8.195185E-02 +3.358958E-04 +1.145030E+01 +6.557627E+00 +1.570002E-01 +1.234278E-03 +4.366880E-01 +9.548944E-03 +5.371595E+00 +1.451769E+00 +1.994464E+00 +2.000578E-01 +4.854127E+00 +1.185019E+00 +3.839839E+00 +7.389016E-01 +5.741578E-01 +1.651730E-02 +1.397385E+00 +9.783830E-02 +2.890327E+00 +4.178307E-01 +9.448103E-02 +4.464468E-04 +2.299479E-01 +2.644475E-03 +3.696047E+00 +6.831277E-01 +1.240331E-01 +7.692912E-04 +3.018719E-01 +4.556806E-03 +9.622674E+00 +4.630166E+00 +1.140790E-01 +6.507332E-04 +2.776488E-01 +3.854636E-03 +2.115259E+01 +2.237433E+01 +3.276303E-02 +5.368601E-05 +8.106983E-02 +3.287089E-04 +1.136088E+01 +6.456442E+00 +1.576557E-01 +1.245384E-03 +4.385114E-01 +9.634868E-03 diff --git a/tests/regression_tests/random_ray_linear/linear_xy/results_true.dat b/tests/regression_tests/random_ray_linear/linear_xy/results_true.dat index abfd03c0678..b2842d4739e 100644 --- a/tests/regression_tests/random_ray_linear/linear_xy/results_true.dat +++ b/tests/regression_tests/random_ray_linear/linear_xy/results_true.dat @@ -1,171 +1,171 @@ k-combined: -1.104727E+00 1.593303E-02 +1.104727E+00 1.593285E-02 tally 1: -2.566934E+01 -3.317503E+01 -9.417202E+00 -4.465518E+00 -2.291958E+01 -2.645097E+01 -1.823903E+01 -1.667438E+01 -2.679931E+00 -3.600420E-01 -6.522415E+00 -2.132667E+00 -1.365623E+01 -9.327448E+00 -4.370682E-01 -9.554968E-03 -1.063736E+00 -5.659772E-02 -1.750634E+01 -1.532609E+01 -5.762870E-01 -1.660889E-02 -1.402567E+00 -9.838082E-02 -4.543609E+01 -1.032286E+02 -5.271287E-01 -1.389456E-02 -1.282941E+00 -8.230483E-02 -9.881678E+01 -4.882586E+02 -1.487616E-01 -1.106634E-03 -3.681003E-01 -6.775702E-03 -5.260781E+01 -1.384126E+02 -7.018594E-01 -2.464953E-02 -1.952187E+00 -1.907001E-01 -4.184779E+01 -8.826530E+01 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -2.226932E+01 -2.486554E+01 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -1.441107E+01 -1.038682E+01 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -1.909194E+01 -1.822767E+01 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -4.579319E+01 -1.048559E+02 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -8.833276E+01 -3.901410E+02 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -4.528911E+01 -1.025740E+02 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -2.218278E+01 -2.477434E+01 -8.203467E+00 -3.389915E+00 -1.996560E+01 -2.007976E+01 -1.714818E+01 -1.473927E+01 -2.551034E+00 -3.262450E-01 -6.208707E+00 -1.932474E+00 -1.343470E+01 -9.027502E+00 -4.363259E-01 -9.522121E-03 -1.061930E+00 -5.640315E-02 -1.717034E+01 -1.474381E+01 -5.729720E-01 -1.641841E-02 -1.394499E+00 -9.725251E-02 -4.542715E+01 -1.031896E+02 -5.348128E-01 -1.430232E-02 -1.301643E+00 -8.472019E-02 -1.009076E+02 -5.091264E+02 -1.543547E-01 -1.191320E-03 -3.819398E-01 -7.294216E-03 -5.342751E+01 -1.427427E+02 -7.255554E-01 -2.633014E-02 -2.018096E+00 -2.037021E-01 -2.540053E+01 -3.247261E+01 -9.483956E+00 -4.526477E+00 -2.308205E+01 -2.681205E+01 -1.812760E+01 -1.646855E+01 -2.717374E+00 -3.700301E-01 -6.613545E+00 -2.191830E+00 -1.362672E+01 -9.286907E+00 -4.458292E-01 -9.940508E-03 -1.085059E+00 -5.888142E-02 -1.744511E+01 -1.521876E+01 -5.866632E-01 -1.721091E-02 -1.427821E+00 -1.019468E-01 -4.538426E+01 -1.029941E+02 -5.385934E-01 -1.450495E-02 -1.310845E+00 -8.592045E-02 -9.921424E+01 -4.921945E+02 -1.532444E-01 -1.174272E-03 -3.791926E-01 -7.189835E-03 -5.301633E+01 -1.405571E+02 -7.285745E-01 -2.655093E-02 -2.026493E+00 -2.054102E-01 +5.465543E+00 +1.504029E+00 +2.005118E+00 +2.024486E-01 +4.880056E+00 +1.199180E+00 +3.883465E+00 +7.559477E-01 +5.706120E-01 +1.632279E-02 +1.388756E+00 +9.668611E-02 +2.907681E+00 +4.228621E-01 +9.306046E-02 +4.331767E-04 +2.264905E-01 +2.565871E-03 +3.727441E+00 +6.948089E-01 +1.227027E-01 +7.529630E-04 +2.986338E-01 +4.460088E-03 +9.674219E+00 +4.679846E+00 +1.122358E-01 +6.299070E-04 +2.731629E-01 +3.731271E-03 +2.103996E+01 +2.213497E+01 +3.167421E-02 +5.016895E-05 +7.837561E-02 +3.071747E-04 +1.120119E+01 +6.274852E+00 +1.494396E-01 +1.117486E-03 +4.156586E-01 +8.645390E-03 +8.910275E+00 +4.001614E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +4.741597E+00 +1.127301E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +3.068401E+00 +4.708885E-01 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +4.065045E+00 +8.263510E-01 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +9.750251E+00 +4.753623E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +1.880773E+01 +1.768690E+01 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +9.642921E+00 +4.650165E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +4.723190E+00 +1.123180E+00 +1.746693E+00 +1.536861E-01 +4.251100E+00 +9.103412E-01 +3.651202E+00 +6.682179E-01 +5.431675E-01 +1.479058E-02 +1.321961E+00 +8.761024E-02 +2.860513E+00 +4.092640E-01 +9.290238E-02 +4.316867E-04 +2.261058E-01 +2.557045E-03 +3.655900E+00 +6.684112E-01 +1.219969E-01 +7.443278E-04 +2.969160E-01 +4.408938E-03 +9.672316E+00 +4.678083E+00 +1.138719E-01 +6.483918E-04 +2.771448E-01 +3.840766E-03 +2.148514E+01 +2.308100E+01 +3.286501E-02 +5.400775E-05 +8.132216E-02 +3.306789E-04 +1.137571E+01 +6.471141E+00 +1.544841E-01 +1.193653E-03 +4.296897E-01 +9.234650E-03 +5.408305E+00 +1.472181E+00 +2.019331E+00 +2.052121E-01 +4.914649E+00 +1.215549E+00 +3.859736E+00 +7.466136E-01 +5.785839E-01 +1.677553E-02 +1.408158E+00 +9.936791E-02 +2.901397E+00 +4.210234E-01 +9.492573E-02 +4.506531E-04 +2.310302E-01 +2.669390E-03 +3.714401E+00 +6.899411E-01 +1.249118E-01 +7.802522E-04 +3.040105E-01 +4.621732E-03 +9.663183E+00 +4.669215E+00 +1.146768E-01 +6.575767E-04 +2.791038E-01 +3.895174E-03 +2.112461E+01 +2.231346E+01 +3.262865E-02 +5.323508E-05 +8.073730E-02 +3.259480E-04 +1.128817E+01 +6.372070E+00 +1.551272E-01 +1.203670E-03 +4.314785E-01 +9.312149E-03 From 1081b789aaf579eb4690a1ff9d742ee0f46bacec Mon Sep 17 00:00:00 2001 From: John Tramm Date: Sat, 4 Oct 2025 01:18:01 +0000 Subject: [PATCH 04/12] regenerated tests involving MGXS creation using the expected nndc data --- .../random_ray_auto_convert/material_wise/results_true.dat | 2 +- .../random_ray_diagonal_stabilization/results_true.dat | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/regression_tests/random_ray_auto_convert/material_wise/results_true.dat b/tests/regression_tests/random_ray_auto_convert/material_wise/results_true.dat index 6557c76024a..e0f37c9dcf7 100644 --- a/tests/regression_tests/random_ray_auto_convert/material_wise/results_true.dat +++ b/tests/regression_tests/random_ray_auto_convert/material_wise/results_true.dat @@ -1,2 +1,2 @@ k-combined: -7.366910E-01 6.872852E-03 +7.356667E-01 6.637266E-03 diff --git a/tests/regression_tests/random_ray_diagonal_stabilization/results_true.dat b/tests/regression_tests/random_ray_diagonal_stabilization/results_true.dat index 736fd3749ff..59051cb9d4b 100644 --- a/tests/regression_tests/random_ray_diagonal_stabilization/results_true.dat +++ b/tests/regression_tests/random_ray_diagonal_stabilization/results_true.dat @@ -1,2 +1,2 @@ k-combined: -7.202605E-01 1.464839E-02 +7.201807E-01 1.506630E-02 From 774d0af8f26696b1f5bebd24b9233df5b6cdc68b Mon Sep 17 00:00:00 2001 From: John Tramm Date: Fri, 3 Oct 2025 20:18:55 -0500 Subject: [PATCH 05/12] Update src/random_ray/flat_source_domain.cpp Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- src/random_ray/flat_source_domain.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/random_ray/flat_source_domain.cpp b/src/random_ray/flat_source_domain.cpp index 44dc0970e4d..324dcbe5e7e 100644 --- a/src/random_ray/flat_source_domain.cpp +++ b/src/random_ray/flat_source_domain.cpp @@ -361,7 +361,7 @@ void FlatSourceDomain::compute_k_eff() // generate 1.2 neutrons. Thus if we normalize to generating only ONE neutron // in total for the whole domain, then we don't actually have enough flux to // generate the required 1.2 neutrons. We only know the flux required to - // generate 1 neutron (which would have required less then one starting + // generate 1 neutron (which would have required less than one starting // neutron). Thus, you have to scale the flux up by the eigenvalue such // that 1.2 neutrons are generated, so as to be consistent with the // bookkeeping in MC which is all done per starting source neutron (not per From b11c04383b5ece615674671305554188aeae2522 Mon Sep 17 00:00:00 2001 From: John Tramm Date: Sat, 4 Oct 2025 13:11:11 -0500 Subject: [PATCH 06/12] fix for infinite medium random ray k-eff roundoff --- src/eigenvalue.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/eigenvalue.cpp b/src/eigenvalue.cpp index a2120a006d5..8412cbd3b47 100644 --- a/src/eigenvalue.cpp +++ b/src/eigenvalue.cpp @@ -403,6 +403,16 @@ void calculate_average_keff() t_value * std::sqrt( (simulation::k_sum[1] / n - std::pow(simulation::keff, 2)) / (n - 1)); + + // In some cases (such as an infinite medium problem), random ray + // may estimate k exactly and in an unvarying manner between iterations. + // In this case, the floating point roundoff between the division and the + // power operations may cause an extremely small negative value to occur + // inside the sqrt operation, leading to NaN. If this occurs, we check for + // it and set the std dev to zero. + if (!std::isfinite(simulation::keff_std)) { + simulation::keff_std = 0.0; + } } } } From 8975b881e126d87e03ed444e61e96083d1194534 Mon Sep 17 00:00:00 2001 From: John Tramm Date: Wed, 15 Oct 2025 16:20:47 -0500 Subject: [PATCH 07/12] moved eigenvalue flux normalization to tallying, so as to avoid altering the live iteration flux and prevent instabilities from arising --- .../openmc/random_ray/flat_source_domain.h | 2 + src/random_ray/flat_source_domain.cpp | 40 ++++++++++++++----- 2 files changed, 33 insertions(+), 9 deletions(-) diff --git a/include/openmc/random_ray/flat_source_domain.h b/include/openmc/random_ray/flat_source_domain.h index d4e80273460..b33333fe3b9 100644 --- a/include/openmc/random_ray/flat_source_domain.h +++ b/include/openmc/random_ray/flat_source_domain.h @@ -169,6 +169,8 @@ class FlatSourceDomain { double simulation_volume_; // Total physical volume of the simulation domain, as // defined by the 3D box of the random ray source + + double fission_rate_; // The system's fission rate (per cm^3), in eigenvalue mode // Volumes for each tally and bin/score combination. This intermediate data // structure is used when tallying quantities that must be normalized by diff --git a/src/random_ray/flat_source_domain.cpp b/src/random_ray/flat_source_domain.cpp index 324dcbe5e7e..9773342ce5d 100644 --- a/src/random_ray/flat_source_domain.cpp +++ b/src/random_ray/flat_source_domain.cpp @@ -366,13 +366,13 @@ void FlatSourceDomain::compute_k_eff() // that 1.2 neutrons are generated, so as to be consistent with the // bookkeeping in MC which is all done per starting source neutron (not per // neutron produced). - double total_fission_neutrons = fission_rate_new * simulation_volume_; - double norm_factor = k_eff_new / total_fission_neutrons; + // double total_fission_neutrons = fission_rate_new * simulation_volume_; + // double norm_factor = k_eff_new / total_fission_neutrons; -#pragma omp parallel for - for (int64_t se = 0; se < n_source_elements(); se++) { - source_regions_.scalar_flux_new(se) *= norm_factor; - } + // #pragma omp parallel for + // for (int64_t se = 0; se < n_source_elements(); se++) { + // source_regions_.scalar_flux_new(se) *= norm_factor; + // } double H = 0.0; // defining an inverse sum for better performance @@ -392,6 +392,7 @@ void FlatSourceDomain::compute_k_eff() // Adds entropy value to shared entropy vector in openmc namespace. simulation::entropy.push_back(H); + fission_rate_ = fission_rate_new; k_eff_ = k_eff_new; } @@ -542,12 +543,33 @@ void FlatSourceDomain::reset_tally_volumes() // simulation double FlatSourceDomain::compute_fixed_source_normalization_factor() const { - // If we are not in fixed source mode, then there are no external sources - // so no normalization is needed. - if (settings::run_mode != RunMode::FIXED_SOURCE || adjoint_) { + // Eigenvalue mode normalization + if (settings::run_mode == RunMode::EIGENVALUE) { + // Normalize fluxes by total number of fission neutrons produced. This + // ensures consistent scaling of the eigenvector such that its magnitude is + // comparable to the eigenvector produced by the Monte Carlo solver. + // Multiplying by the eigenvalue is unintuitive, but it is necessary. + // If the eigenvalue is 1.2, per starting source neutron, you will + // generate 1.2 neutrons. Thus if we normalize to generating only ONE + // neutron in total for the whole domain, then we don't actually have enough + // flux to generate the required 1.2 neutrons. We only know the flux + // required to generate 1 neutron (which would have required less than one + // starting neutron). Thus, you have to scale the flux up by the eigenvalue + // such that 1.2 neutrons are generated, so as to be consistent with the + // bookkeeping in MC which is all done per starting source neutron (not per + // neutron produced). + return k_eff_ / (fission_rate_ * simulation_volume_); + } + + // If we are in adjoint mode of a fixed source problem, the external + // source is already normalized, such that all resulting fluxes are + // also normalized. + if (adjoint_) { return 1.0; } + // Fixed source mode normalization + // Step 1 is to sum over all source regions and energy groups to get the // total external source strength in the simulation. double simulation_external_source_strength = 0.0; From e9e69762433494cf69c68809b5f12bb1fe576739 Mon Sep 17 00:00:00 2001 From: John Tramm Date: Wed, 15 Oct 2025 16:21:08 -0500 Subject: [PATCH 08/12] ran clang format --- include/openmc/random_ray/flat_source_domain.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/openmc/random_ray/flat_source_domain.h b/include/openmc/random_ray/flat_source_domain.h index b33333fe3b9..4df4e5d8d32 100644 --- a/include/openmc/random_ray/flat_source_domain.h +++ b/include/openmc/random_ray/flat_source_domain.h @@ -169,8 +169,9 @@ class FlatSourceDomain { double simulation_volume_; // Total physical volume of the simulation domain, as // defined by the 3D box of the random ray source - - double fission_rate_; // The system's fission rate (per cm^3), in eigenvalue mode + + double + fission_rate_; // The system's fission rate (per cm^3), in eigenvalue mode // Volumes for each tally and bin/score combination. This intermediate data // structure is used when tallying quantities that must be normalized by From d2d9acec88cc1a522527f0173bb36121e71a1151 Mon Sep 17 00:00:00 2001 From: John Tramm Date: Wed, 15 Oct 2025 16:22:36 -0500 Subject: [PATCH 09/12] removed commented out code --- src/random_ray/flat_source_domain.cpp | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/src/random_ray/flat_source_domain.cpp b/src/random_ray/flat_source_domain.cpp index 9773342ce5d..ec14795dd2d 100644 --- a/src/random_ray/flat_source_domain.cpp +++ b/src/random_ray/flat_source_domain.cpp @@ -353,27 +353,6 @@ void FlatSourceDomain::compute_k_eff() double k_eff_new = k_eff_ * (fission_rate_new / fission_rate_old); - // Normalize fluxes by total number of fission neutrons produced. This ensures - // consistent scaling of the eigenvector such that its magnitude is - // comparable to the eigenvector produced by the Monte Carlo solver. - // Multiplying by the eigenvalue is unintuitive, but it is necessary. - // If the eigenvalue is 1.2, per starting source neutron, you will - // generate 1.2 neutrons. Thus if we normalize to generating only ONE neutron - // in total for the whole domain, then we don't actually have enough flux to - // generate the required 1.2 neutrons. We only know the flux required to - // generate 1 neutron (which would have required less than one starting - // neutron). Thus, you have to scale the flux up by the eigenvalue such - // that 1.2 neutrons are generated, so as to be consistent with the - // bookkeeping in MC which is all done per starting source neutron (not per - // neutron produced). - // double total_fission_neutrons = fission_rate_new * simulation_volume_; - // double norm_factor = k_eff_new / total_fission_neutrons; - - // #pragma omp parallel for - // for (int64_t se = 0; se < n_source_elements(); se++) { - // source_regions_.scalar_flux_new(se) *= norm_factor; - // } - double H = 0.0; // defining an inverse sum for better performance double inverse_sum = 1 / fission_rate_new; From 89f2f47180087479a1dac6430ae94167d91d281c Mon Sep 17 00:00:00 2001 From: John Tramm Date: Mon, 20 Oct 2025 14:06:12 -0500 Subject: [PATCH 10/12] regenerated test results with nndc data --- .../infinite_medium/results_true.dat | 2 +- .../material_wise/results_true.dat | 2 +- .../stochastic_slab/results_true.dat | 2 +- .../random_ray_auto_convert/test.py | 2 +- .../results_true.dat | 2 +- .../random_ray_diagonal_stabilization/test.py | 2 +- .../random_ray_k_eff_mesh/results_true.dat | 246 ++++++------- .../random_ray_linear/linear/results_true.dat | 338 +++++++++--------- .../linear_xy/results_true.dat | 102 +++--- 9 files changed, 349 insertions(+), 349 deletions(-) diff --git a/tests/regression_tests/random_ray_auto_convert/infinite_medium/results_true.dat b/tests/regression_tests/random_ray_auto_convert/infinite_medium/results_true.dat index c7584ab647f..2a67a949760 100644 --- a/tests/regression_tests/random_ray_auto_convert/infinite_medium/results_true.dat +++ b/tests/regression_tests/random_ray_auto_convert/infinite_medium/results_true.dat @@ -1,2 +1,2 @@ k-combined: -7.797820E-01 1.054725E-02 +7.802550E-01 1.050198E-02 diff --git a/tests/regression_tests/random_ray_auto_convert/material_wise/results_true.dat b/tests/regression_tests/random_ray_auto_convert/material_wise/results_true.dat index e0f37c9dcf7..4a163475800 100644 --- a/tests/regression_tests/random_ray_auto_convert/material_wise/results_true.dat +++ b/tests/regression_tests/random_ray_auto_convert/material_wise/results_true.dat @@ -1,2 +1,2 @@ k-combined: -7.356667E-01 6.637266E-03 +7.399169E-01 6.951715E-03 diff --git a/tests/regression_tests/random_ray_auto_convert/stochastic_slab/results_true.dat b/tests/regression_tests/random_ray_auto_convert/stochastic_slab/results_true.dat index 56ce009acbc..386b274769d 100644 --- a/tests/regression_tests/random_ray_auto_convert/stochastic_slab/results_true.dat +++ b/tests/regression_tests/random_ray_auto_convert/stochastic_slab/results_true.dat @@ -1,2 +1,2 @@ k-combined: -7.551716E-01 8.117379E-03 +7.410620E-01 8.235247E-03 diff --git a/tests/regression_tests/random_ray_auto_convert/test.py b/tests/regression_tests/random_ray_auto_convert/test.py index fa7f2f17f49..965114c7b4b 100644 --- a/tests/regression_tests/random_ray_auto_convert/test.py +++ b/tests/regression_tests/random_ray_auto_convert/test.py @@ -27,7 +27,7 @@ def test_random_ray_auto_convert(method): # Convert to a multi-group model model.convert_to_multigroup( - method=method, groups='CASMO-2', nparticles=30, + method=method, groups='CASMO-2', nparticles=15, overwrite_mgxs_library=False, mgxs_path="mgxs.h5" ) diff --git a/tests/regression_tests/random_ray_diagonal_stabilization/results_true.dat b/tests/regression_tests/random_ray_diagonal_stabilization/results_true.dat index 59051cb9d4b..69bb938a5ec 100644 --- a/tests/regression_tests/random_ray_diagonal_stabilization/results_true.dat +++ b/tests/regression_tests/random_ray_diagonal_stabilization/results_true.dat @@ -1,2 +1,2 @@ k-combined: -7.201807E-01 1.506630E-02 +7.081064E-01 1.411504E-02 diff --git a/tests/regression_tests/random_ray_diagonal_stabilization/test.py b/tests/regression_tests/random_ray_diagonal_stabilization/test.py index c7a1c9f7cd9..fd5674f8801 100644 --- a/tests/regression_tests/random_ray_diagonal_stabilization/test.py +++ b/tests/regression_tests/random_ray_diagonal_stabilization/test.py @@ -23,7 +23,7 @@ def test_random_ray_diagonal_stabilization(): # MGXS data with some negatives on the diagonal, in order # to trigger diagonal correction. model.convert_to_multigroup( - method='material_wise', groups='CASMO-70', nparticles=30, + method='material_wise', groups='CASMO-70', nparticles=15, overwrite_mgxs_library=True, mgxs_path="mgxs.h5", correction='P0' ) diff --git a/tests/regression_tests/random_ray_k_eff_mesh/results_true.dat b/tests/regression_tests/random_ray_k_eff_mesh/results_true.dat index 7d8280cb9e3..2ae8fad85fb 100644 --- a/tests/regression_tests/random_ray_k_eff_mesh/results_true.dat +++ b/tests/regression_tests/random_ray_k_eff_mesh/results_true.dat @@ -1,80 +1,80 @@ k-combined: -8.379218E-01 8.057310E-03 +8.379203E-01 8.057199E-03 tally 1: -1.073899E+00 -2.309335E-01 -3.974865E-01 -3.163425E-02 -9.674026E-01 -1.873817E-01 -6.045473E-01 -7.322391E-02 -8.969834E-02 -1.612016E-03 -2.183078E-01 -9.548588E-03 -3.578125E-01 -2.589204E-02 -1.151078E-02 -2.679080E-05 -2.801493E-02 -1.586921E-04 -5.015042E-01 -5.126084E-02 -1.650454E-02 -5.550581E-05 -4.016875E-02 -3.287821E-04 -1.508457E+00 -4.625620E-01 -1.748940E-02 -6.221274E-05 -4.256623E-02 -3.685188E-04 +1.073897E+00 +2.309328E-01 +3.974859E-01 +3.163415E-02 +9.674011E-01 +1.873811E-01 +6.045463E-01 +7.322367E-02 +8.969819E-02 +1.612011E-03 +2.183075E-01 +9.548557E-03 +3.578121E-01 +2.589198E-02 +1.151076E-02 +2.679073E-05 +2.801489E-02 +1.586917E-04 +5.015038E-01 +5.126076E-02 +1.650453E-02 +5.550572E-05 +4.016872E-02 +3.287816E-04 +1.508456E+00 +4.625615E-01 +1.748939E-02 +6.221267E-05 +4.256620E-02 +3.685184E-04 4.320984E+00 -3.751239E+00 -6.554267E-03 -8.634391E-06 +3.751237E+00 +6.554265E-03 +8.634389E-06 1.621807E-02 -5.286669E-05 +5.286667E-05 2.776930E+00 1.542475E+00 -3.730994E-02 -2.784112E-04 +3.730995E-02 +2.784113E-04 1.037757E-01 -2.153917E-03 -1.603584E+00 -5.143070E-01 +2.153918E-03 +1.603583E+00 +5.143065E-01 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 -7.159250E-01 -1.025625E-01 +7.159242E-01 +1.025623E-01 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 -3.847492E-01 -3.007157E-02 +3.847488E-01 +3.007151E-02 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 -5.695054E-01 -6.620186E-02 +5.695050E-01 +6.620177E-02 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 -1.575717E+00 -5.042008E-01 +1.575716E+00 +5.042003E-01 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 -3.855110E+00 -2.986318E+00 +3.855109E+00 +2.986316E+00 0.000000E+00 0.000000E+00 0.000000E+00 @@ -85,86 +85,86 @@ tally 1: 0.000000E+00 0.000000E+00 0.000000E+00 -9.701844E-01 -1.885734E-01 -3.619972E-01 -2.624754E-02 -8.810288E-01 -1.554742E-01 -5.767233E-01 -6.667193E-02 -8.675446E-02 -1.508982E-03 -2.111430E-01 -8.938279E-03 -3.510189E-01 -2.488166E-02 -1.147309E-02 -2.656504E-05 -2.792320E-02 -1.573549E-04 -4.874582E-01 -4.838581E-02 -1.626870E-02 -5.388091E-05 -3.959477E-02 -3.191572E-04 -1.495985E+00 -4.549299E-01 -1.759494E-02 -6.295571E-05 -4.282308E-02 -3.729198E-04 -4.430602E+00 -3.944095E+00 -6.841765E-03 -9.403286E-06 -1.692947E-02 -5.757448E-05 -2.870671E+00 +9.701818E-01 +1.885724E-01 +3.619962E-01 +2.624740E-02 +8.810264E-01 +1.554734E-01 +5.767221E-01 +6.667165E-02 +8.675429E-02 +1.508976E-03 +2.111426E-01 +8.938242E-03 +3.510185E-01 +2.488161E-02 +1.147307E-02 +2.656498E-05 +2.792316E-02 +1.573545E-04 +4.874578E-01 +4.838573E-02 +1.626869E-02 +5.388082E-05 +3.959473E-02 +3.191567E-04 +1.495984E+00 +4.549294E-01 +1.759493E-02 +6.295564E-05 +4.282306E-02 +3.729194E-04 +4.430601E+00 +3.944093E+00 +6.841763E-03 +9.403281E-06 +1.692946E-02 +5.757445E-05 +2.870670E+00 1.648496E+00 3.937215E-02 3.101637E-04 1.095116E-01 2.399569E-03 -1.071189E+00 -2.297551E-01 -4.043224E-01 -3.274607E-02 -9.840398E-01 -1.939675E-01 -6.043502E-01 -7.317527E-02 -9.155185E-02 -1.679945E-03 -2.228189E-01 -9.950956E-03 -3.578813E-01 -2.590214E-02 -1.175439E-02 -2.791143E-05 -2.860782E-02 -1.653300E-04 -5.007418E-01 -5.108832E-02 -1.680610E-02 -5.747580E-05 -4.090268E-02 -3.404511E-04 +1.071187E+00 +2.297540E-01 +4.043214E-01 +3.274592E-02 +9.840375E-01 +1.939666E-01 +6.043491E-01 +7.317500E-02 +9.155169E-02 +1.679939E-03 +2.228185E-01 +9.950920E-03 +3.578809E-01 +2.590208E-02 +1.175437E-02 +2.791136E-05 +2.860779E-02 +1.653296E-04 +5.007414E-01 +5.108824E-02 +1.680608E-02 +5.747571E-05 +4.090264E-02 +3.404506E-04 1.505100E+00 -4.603567E-01 -1.781574E-02 -6.447740E-05 -4.336047E-02 -3.819337E-04 -4.328648E+00 -3.765701E+00 -6.730398E-03 -9.104089E-06 -1.665390E-02 -5.574255E-05 +4.603562E-01 +1.781573E-02 +6.447733E-05 +4.336044E-02 +3.819332E-04 +4.328647E+00 +3.765700E+00 +6.730396E-03 +9.104085E-06 +1.665389E-02 +5.574253E-05 2.803934E+00 -1.572541E+00 +1.572540E+00 3.876306E-02 3.006136E-04 1.078175E-01 diff --git a/tests/regression_tests/random_ray_linear/linear/results_true.dat b/tests/regression_tests/random_ray_linear/linear/results_true.dat index eafa7833e38..77d41f3732c 100644 --- a/tests/regression_tests/random_ray_linear/linear/results_true.dat +++ b/tests/regression_tests/random_ray_linear/linear/results_true.dat @@ -1,171 +1,171 @@ k-combined: -1.095996E+00 1.543745E-02 +1.095967E+00 1.543581E-02 tally 1: -5.425638E+00 -1.482193E+00 -1.974294E+00 -1.962100E-01 -4.805036E+00 -1.162227E+00 -3.866946E+00 -7.496283E-01 -5.662196E-01 -1.607259E-02 -1.378065E+00 -9.520408E-02 -2.904663E+00 -4.220187E-01 -9.289452E-02 -4.316549E-04 -2.260867E-01 -2.556857E-03 -3.717848E+00 -6.912357E-01 -1.220704E-01 -7.451985E-04 -2.970949E-01 -4.414096E-03 -9.665787E+00 -4.671733E+00 -1.120623E-01 -6.279464E-04 -2.727405E-01 -3.719658E-03 -2.117608E+01 -2.242511E+01 -3.204816E-02 -5.138000E-05 -7.930093E-02 -3.145897E-04 -1.133733E+01 -6.431586E+00 -1.537042E-01 -1.185202E-03 -4.275203E-01 -9.169267E-03 -8.917812E+00 -4.009425E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -4.736214E+00 -1.124879E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -3.057799E+00 -4.676480E-01 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -4.048225E+00 -8.195369E-01 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -9.707960E+00 -4.712445E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -1.874369E+01 -1.756769E+01 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -9.595683E+00 -4.608496E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -0.000000E+00 -4.701064E+00 -1.113098E+00 -1.733195E+00 -1.513432E-01 -4.218249E+00 -8.964633E-01 -3.641874E+00 -6.649431E-01 -5.413172E-01 -1.469163E-02 -1.317458E+00 -8.702412E-02 -2.858883E+00 -4.088372E-01 -9.288215E-02 -4.315400E-04 -2.260566E-01 -2.556176E-03 -3.649337E+00 -6.660223E-01 -1.216653E-01 -7.402775E-04 -2.961090E-01 -4.384947E-03 -9.664960E+00 -4.671105E+00 -1.138124E-01 -6.477255E-04 -2.770000E-01 -3.836819E-03 -2.157443E+01 -2.327552E+01 -3.311948E-02 -5.485980E-05 -8.195185E-02 -3.358958E-04 -1.145030E+01 -6.557627E+00 -1.570002E-01 -1.234278E-03 -4.366880E-01 -9.548944E-03 -5.371595E+00 -1.451769E+00 -1.994464E+00 -2.000578E-01 -4.854127E+00 -1.185019E+00 -3.839839E+00 -7.389016E-01 -5.741578E-01 -1.651730E-02 -1.397385E+00 -9.783830E-02 -2.890327E+00 -4.178307E-01 -9.448103E-02 -4.464468E-04 -2.299479E-01 -2.644475E-03 -3.696047E+00 -6.831277E-01 -1.240331E-01 -7.692912E-04 -3.018719E-01 -4.556806E-03 -9.622674E+00 -4.630166E+00 -1.140790E-01 -6.507332E-04 -2.776488E-01 -3.854636E-03 -2.115259E+01 -2.237433E+01 -3.276303E-02 -5.368601E-05 -8.106983E-02 -3.287089E-04 -1.136088E+01 -6.456442E+00 -1.576557E-01 -1.245384E-03 -4.385114E-01 -9.634868E-03 +5.425537E+00 +1.482137E+00 +1.974189E+00 +1.961888E-01 +4.804781E+00 +1.162101E+00 +3.866915E+00 +7.496163E-01 +5.662059E-01 +1.607180E-02 +1.378032E+00 +9.519943E-02 +2.904666E+00 +4.220197E-01 +9.289413E-02 +4.316514E-04 +2.260857E-01 +2.556836E-03 +3.717829E+00 +6.912286E-01 +1.220682E-01 +7.451721E-04 +2.970897E-01 +4.413940E-03 +9.665773E+00 +4.671720E+00 +1.120617E-01 +6.279393E-04 +2.727390E-01 +3.719615E-03 +2.117656E+01 +2.242614E+01 +3.204951E-02 +5.138445E-05 +7.930426E-02 +3.146169E-04 +1.133784E+01 +6.432186E+00 +1.537206E-01 +1.185474E-03 +4.275660E-01 +9.171376E-03 +8.917756E+00 +4.009380E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +4.736166E+00 +1.124858E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +3.057755E+00 +4.676344E-01 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +4.048156E+00 +8.195089E-01 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +9.707791E+00 +4.712281E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +1.874344E+01 +1.756722E+01 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +9.595520E+00 +4.608366E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +0.000000E+00 +4.701002E+00 +1.113069E+00 +1.733152E+00 +1.513360E-01 +4.218145E+00 +8.964208E-01 +3.641849E+00 +6.649342E-01 +5.413112E-01 +1.469131E-02 +1.317443E+00 +8.702223E-02 +2.858878E+00 +4.088359E-01 +9.288202E-02 +4.315389E-04 +2.260562E-01 +2.556170E-03 +3.649312E+00 +6.660131E-01 +1.216639E-01 +7.402611E-04 +2.961057E-01 +4.384849E-03 +9.664912E+00 +4.671059E+00 +1.138118E-01 +6.477188E-04 +2.769985E-01 +3.836780E-03 +2.157464E+01 +2.327600E+01 +3.312018E-02 +5.486221E-05 +8.195357E-02 +3.359106E-04 +1.145052E+01 +6.557893E+00 +1.570084E-01 +1.234420E-03 +4.367109E-01 +9.550040E-03 +5.371474E+00 +1.451702E+00 +1.994382E+00 +2.000414E-01 +4.853928E+00 +1.184921E+00 +3.839778E+00 +7.388780E-01 +5.741437E-01 +1.651648E-02 +1.397351E+00 +9.783345E-02 +2.890296E+00 +4.178220E-01 +9.447974E-02 +4.464346E-04 +2.299448E-01 +2.644403E-03 +3.695989E+00 +6.831063E-01 +1.240303E-01 +7.692555E-04 +3.018649E-01 +4.556594E-03 +9.622545E+00 +4.630042E+00 +1.140770E-01 +6.507108E-04 +2.776440E-01 +3.854503E-03 +2.115266E+01 +2.237450E+01 +3.276343E-02 +5.368742E-05 +8.107083E-02 +3.287176E-04 +1.136109E+01 +6.456700E+00 +1.576636E-01 +1.245524E-03 +4.385334E-01 +9.635950E-03 diff --git a/tests/regression_tests/random_ray_linear/linear_xy/results_true.dat b/tests/regression_tests/random_ray_linear/linear_xy/results_true.dat index b2842d4739e..052608b4254 100644 --- a/tests/regression_tests/random_ray_linear/linear_xy/results_true.dat +++ b/tests/regression_tests/random_ray_linear/linear_xy/results_true.dat @@ -1,28 +1,28 @@ k-combined: -1.104727E+00 1.593285E-02 +1.104727E+00 1.593303E-02 tally 1: -5.465543E+00 -1.504029E+00 -2.005118E+00 -2.024486E-01 -4.880056E+00 -1.199180E+00 -3.883465E+00 -7.559477E-01 -5.706120E-01 -1.632279E-02 +5.465547E+00 +1.504031E+00 +2.005120E+00 +2.024490E-01 +4.880060E+00 +1.199182E+00 +3.883466E+00 +7.559482E-01 +5.706123E-01 +1.632280E-02 1.388756E+00 -9.668611E-02 +9.668619E-02 2.907681E+00 4.228621E-01 9.306046E-02 -4.331767E-04 +4.331768E-04 2.264905E-01 2.565871E-03 3.727441E+00 6.948089E-01 1.227027E-01 -7.529630E-04 +7.529631E-04 2.986338E-01 4.460088E-03 9.674219E+00 @@ -38,19 +38,19 @@ tally 1: 7.837561E-02 3.071747E-04 1.120119E+01 -6.274852E+00 +6.274853E+00 1.494396E-01 1.117486E-03 4.156586E-01 8.645390E-03 -8.910275E+00 -4.001614E+00 +8.910289E+00 +4.001626E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 -4.741597E+00 -1.127301E+00 +4.741600E+00 +1.127303E+00 0.000000E+00 0.000000E+00 0.000000E+00 @@ -85,12 +85,12 @@ tally 1: 0.000000E+00 0.000000E+00 0.000000E+00 -4.723190E+00 -1.123180E+00 -1.746693E+00 -1.536861E-01 -4.251100E+00 -9.103412E-01 +4.723189E+00 +1.123179E+00 +1.746692E+00 +1.536860E-01 +4.251098E+00 +9.103405E-01 3.651202E+00 6.682179E-01 5.431675E-01 @@ -99,46 +99,46 @@ tally 1: 8.761024E-02 2.860513E+00 4.092640E-01 -9.290238E-02 +9.290237E-02 4.316867E-04 2.261058E-01 2.557045E-03 3.655900E+00 6.684112E-01 1.219969E-01 -7.443278E-04 +7.443277E-04 2.969160E-01 -4.408938E-03 +4.408937E-03 9.672316E+00 -4.678083E+00 +4.678082E+00 1.138719E-01 -6.483918E-04 +6.483917E-04 2.771448E-01 3.840766E-03 2.148514E+01 2.308100E+01 3.286501E-02 -5.400775E-05 +5.400774E-05 8.132216E-02 -3.306789E-04 +3.306788E-04 1.137571E+01 -6.471141E+00 +6.471140E+00 1.544841E-01 1.193653E-03 4.296897E-01 -9.234650E-03 -5.408305E+00 -1.472181E+00 -2.019331E+00 -2.052121E-01 -4.914649E+00 -1.215549E+00 -3.859736E+00 -7.466136E-01 -5.785839E-01 -1.677553E-02 +9.234647E-03 +5.408307E+00 +1.472183E+00 +2.019332E+00 +2.052123E-01 +4.914651E+00 +1.215551E+00 +3.859737E+00 +7.466141E-01 +5.785840E-01 +1.677554E-02 1.408158E+00 -9.936791E-02 +9.936796E-02 2.901397E+00 4.210234E-01 9.492573E-02 @@ -148,24 +148,24 @@ tally 1: 3.714401E+00 6.899411E-01 1.249118E-01 -7.802522E-04 -3.040105E-01 +7.802521E-04 +3.040104E-01 4.621732E-03 9.663183E+00 4.669215E+00 1.146768E-01 6.575767E-04 2.791038E-01 -3.895174E-03 +3.895173E-03 2.112461E+01 2.231346E+01 -3.262865E-02 +3.262864E-02 5.323508E-05 8.073730E-02 -3.259480E-04 +3.259479E-04 1.128817E+01 6.372070E+00 1.551272E-01 1.203670E-03 4.314785E-01 -9.312149E-03 +9.312148E-03 From fd4c4a275361a1120954df51f0a1bdf053056201 Mon Sep 17 00:00:00 2001 From: John Tramm Date: Tue, 21 Oct 2025 11:39:35 -0500 Subject: [PATCH 11/12] reduced MGXS generation particle count to avoid MGMC divergence --- .../random_ray_auto_convert/infinite_medium/results_true.dat | 2 +- .../random_ray_auto_convert/material_wise/results_true.dat | 2 +- .../random_ray_auto_convert/stochastic_slab/results_true.dat | 2 +- tests/regression_tests/random_ray_auto_convert/test.py | 2 +- .../random_ray_diagonal_stabilization/results_true.dat | 2 +- .../regression_tests/random_ray_diagonal_stabilization/test.py | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/regression_tests/random_ray_auto_convert/infinite_medium/results_true.dat b/tests/regression_tests/random_ray_auto_convert/infinite_medium/results_true.dat index 2a67a949760..1c59437bfbb 100644 --- a/tests/regression_tests/random_ray_auto_convert/infinite_medium/results_true.dat +++ b/tests/regression_tests/random_ray_auto_convert/infinite_medium/results_true.dat @@ -1,2 +1,2 @@ k-combined: -7.802550E-01 1.050198E-02 +7.799042E-01 1.053187E-02 diff --git a/tests/regression_tests/random_ray_auto_convert/material_wise/results_true.dat b/tests/regression_tests/random_ray_auto_convert/material_wise/results_true.dat index 4a163475800..d4a9c30f451 100644 --- a/tests/regression_tests/random_ray_auto_convert/material_wise/results_true.dat +++ b/tests/regression_tests/random_ray_auto_convert/material_wise/results_true.dat @@ -1,2 +1,2 @@ k-combined: -7.399169E-01 6.951715E-03 +7.339938E-01 6.876131E-03 diff --git a/tests/regression_tests/random_ray_auto_convert/stochastic_slab/results_true.dat b/tests/regression_tests/random_ray_auto_convert/stochastic_slab/results_true.dat index 386b274769d..4c6dbedaed9 100644 --- a/tests/regression_tests/random_ray_auto_convert/stochastic_slab/results_true.dat +++ b/tests/regression_tests/random_ray_auto_convert/stochastic_slab/results_true.dat @@ -1,2 +1,2 @@ k-combined: -7.410620E-01 8.235247E-03 +7.499841E-01 8.155578E-03 diff --git a/tests/regression_tests/random_ray_auto_convert/test.py b/tests/regression_tests/random_ray_auto_convert/test.py index 965114c7b4b..3b9bf764b3a 100644 --- a/tests/regression_tests/random_ray_auto_convert/test.py +++ b/tests/regression_tests/random_ray_auto_convert/test.py @@ -27,7 +27,7 @@ def test_random_ray_auto_convert(method): # Convert to a multi-group model model.convert_to_multigroup( - method=method, groups='CASMO-2', nparticles=15, + method=method, groups='CASMO-2', nparticles=14, overwrite_mgxs_library=False, mgxs_path="mgxs.h5" ) diff --git a/tests/regression_tests/random_ray_diagonal_stabilization/results_true.dat b/tests/regression_tests/random_ray_diagonal_stabilization/results_true.dat index 69bb938a5ec..034d7f7c64d 100644 --- a/tests/regression_tests/random_ray_diagonal_stabilization/results_true.dat +++ b/tests/regression_tests/random_ray_diagonal_stabilization/results_true.dat @@ -1,2 +1,2 @@ k-combined: -7.081064E-01 1.411504E-02 +7.134473E-01 1.422763E-02 diff --git a/tests/regression_tests/random_ray_diagonal_stabilization/test.py b/tests/regression_tests/random_ray_diagonal_stabilization/test.py index fd5674f8801..8d36e1d2581 100644 --- a/tests/regression_tests/random_ray_diagonal_stabilization/test.py +++ b/tests/regression_tests/random_ray_diagonal_stabilization/test.py @@ -23,7 +23,7 @@ def test_random_ray_diagonal_stabilization(): # MGXS data with some negatives on the diagonal, in order # to trigger diagonal correction. model.convert_to_multigroup( - method='material_wise', groups='CASMO-70', nparticles=15, + method='material_wise', groups='CASMO-70', nparticles=13, overwrite_mgxs_library=True, mgxs_path="mgxs.h5", correction='P0' ) From a591080e93106b2d3e72cab9a1e26b78c53d307e Mon Sep 17 00:00:00 2001 From: John Tramm Date: Tue, 21 Oct 2025 13:21:08 -0500 Subject: [PATCH 12/12] increased auto MGXS generation particle count to avoid MGMC divergence --- .../random_ray_auto_convert/infinite_medium/results_true.dat | 2 +- .../random_ray_auto_convert/material_wise/results_true.dat | 2 +- .../random_ray_auto_convert/stochastic_slab/results_true.dat | 2 +- tests/regression_tests/random_ray_auto_convert/test.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/regression_tests/random_ray_auto_convert/infinite_medium/results_true.dat b/tests/regression_tests/random_ray_auto_convert/infinite_medium/results_true.dat index 1c59437bfbb..ee396fa7461 100644 --- a/tests/regression_tests/random_ray_auto_convert/infinite_medium/results_true.dat +++ b/tests/regression_tests/random_ray_auto_convert/infinite_medium/results_true.dat @@ -1,2 +1,2 @@ k-combined: -7.799042E-01 1.053187E-02 +7.797252E-01 1.055731E-02 diff --git a/tests/regression_tests/random_ray_auto_convert/material_wise/results_true.dat b/tests/regression_tests/random_ray_auto_convert/material_wise/results_true.dat index d4a9c30f451..dcb59c3a43d 100644 --- a/tests/regression_tests/random_ray_auto_convert/material_wise/results_true.dat +++ b/tests/regression_tests/random_ray_auto_convert/material_wise/results_true.dat @@ -1,2 +1,2 @@ k-combined: -7.339938E-01 6.876131E-03 +7.372001E-01 7.015495E-03 diff --git a/tests/regression_tests/random_ray_auto_convert/stochastic_slab/results_true.dat b/tests/regression_tests/random_ray_auto_convert/stochastic_slab/results_true.dat index 4c6dbedaed9..9d73b52b674 100644 --- a/tests/regression_tests/random_ray_auto_convert/stochastic_slab/results_true.dat +++ b/tests/regression_tests/random_ray_auto_convert/stochastic_slab/results_true.dat @@ -1,2 +1,2 @@ k-combined: -7.499841E-01 8.155578E-03 +7.515989E-01 8.148131E-03 diff --git a/tests/regression_tests/random_ray_auto_convert/test.py b/tests/regression_tests/random_ray_auto_convert/test.py index 3b9bf764b3a..99a931dce86 100644 --- a/tests/regression_tests/random_ray_auto_convert/test.py +++ b/tests/regression_tests/random_ray_auto_convert/test.py @@ -27,7 +27,7 @@ def test_random_ray_auto_convert(method): # Convert to a multi-group model model.convert_to_multigroup( - method=method, groups='CASMO-2', nparticles=14, + method=method, groups='CASMO-2', nparticles=100, overwrite_mgxs_library=False, mgxs_path="mgxs.h5" )