Merge branch 'nuscatter_fix' into scatt_bins

2026-07-28 14:15:42 -04:00 · 2015-09-28 04:59:46 -04:00 · 2015-09-28 04:59:46 -04:00 · cd365eeb71
commit cd365eeb71
parent 137131534c d719129a56
9 changed files with 101 additions and 102 deletions
--- a/src/tally.F90
+++ b/src/tally.F90
@ -5,7 +5,6 @@ module tally
  use error,            only: fatal_error
  use geometry_header
  use global
-  use interpolation
  use math,             only: t_percentile, calc_pn, calc_rn
  use mesh,             only: get_mesh_bin, bin_to_mesh_indices, &
                              get_mesh_indices, mesh_indices_to_bin, &
@ -196,7 +195,7 @@ contains
            score = p % wgt
          else
            ! Grab the multiplicity from the rxn
-            score = p % last_wgt * real(rxn % multiplicity,8)
+            score = p % last_wgt * rxn % multiplicity
          end if
        end if

@ -233,7 +232,7 @@ contains
            score = p % wgt
          else
            ! Grab the multiplicity from the rxn
-            score = p % last_wgt * real(rxn % multiplicity,8)
+            score = p % last_wgt * rxn % multiplicity
          end if
        end if

@ -270,7 +269,7 @@ contains
            score = p % wgt
          else
            ! Grab the multiplicity from the rxn
-            score = p % last_wgt * real(rxn % multiplicity,8)
+            score = p % last_wgt * rxn % multiplicity
          end if
        end if

--- a/tests/test_score_nuscatter/results_true.dat
+++ b/tests/test_score_nuscatter/results_true.dat
@ -1,11 +1,11 @@
 k-combined:
-1.005983E+00 2.248579E-02
+9.870214E-01 2.095925E-02
 tally 1:
 0.000000E+00
 0.000000E+00
-1.169000E+01
-2.915330E+01
-3.200000E+00
-2.342600E+00
-4.064000E+01
-3.595168E+02
+3.353000E+01
+1.133379E+02
+8.150000E+00
+6.793700E+00
+1.098500E+02
+1.221333E+03
--- a/tests/test_score_nuscatter/settings.xml
+++ b/tests/test_score_nuscatter/settings.xml
@ -3,7 +3,7 @@

  <eigenvalue>
    <batches>10</batches>
-    <inactive>5</inactive>
+    <inactive>0</inactive>
    <particles>100</particles>
  </eigenvalue>

--- a/tests/test_score_nuscatter_n/results_true.dat
+++ b/tests/test_score_nuscatter_n/results_true.dat
@ -1,33 +1,33 @@
 k-combined:
-1.005983E+00 2.248579E-02
+9.870214E-01 2.095925E-02
 tally 1:
-1.169000E+01
-2.915330E+01
-1.247253E+00
-3.767436E-01
-5.330812E-01
-1.385083E-01
-2.987823E-01
-5.699361E-02
-2.645512E-01
-2.905381E-02
-3.200000E+00
-2.342600E+00
-3.809941E-01
-2.965326E-02
-4.319242E-01
-3.738822E-02
-9.261909E-02
-6.711328E-03
-6.052442E-02
-7.087230E-03
-4.064000E+01
-3.595168E+02
-2.096700E+01
-9.516606E+01
-7.560566E+00
-1.248694E+01
-2.093348E-01
-4.278510E-02
-1.449929E+00
-4.356371E-01
+3.353000E+01
+1.133379E+02
+3.491100E+00
+1.265776E+00
+1.948509E+00
+4.761101E-01
+9.177045E-01
+1.251750E-01
+5.654249E-01
+5.567043E-02
+8.150000E+00
+6.793700E+00
+1.223263E+00
+1.678053E-01
+7.833173E-01
+8.407682E-02
+1.350170E-01
+7.393546E-03
+2.164837E-01
+1.367122E-02
+1.098500E+02
+1.221333E+03
+5.598624E+01
+3.183267E+02
+2.048716E+01
+4.301097E+01
+1.399456E+00
+4.458904E-01
+-2.183180E+00
+6.628474E-01
--- a/tests/test_score_nuscatter_n/settings.xml
+++ b/tests/test_score_nuscatter_n/settings.xml
@ -3,7 +3,7 @@

  <eigenvalue>
    <batches>10</batches>
-    <inactive>5</inactive>
+    <inactive>0</inactive>
    <particles>100</particles>
  </eigenvalue>

--- a/tests/test_score_nuscatter_pn/results_true.dat
+++ b/tests/test_score_nuscatter_pn/results_true.dat
@ -1,24 +1,24 @@
 k-combined:
-1.005983E+00 2.248579E-02
+9.870214E-01 2.095925E-02
 tally 1:
-1.169000E+01
-2.915330E+01
-1.247253E+00
-3.767436E-01
-5.330812E-01
-1.385083E-01
-2.987823E-01
-5.699361E-02
-2.645512E-01
-2.905381E-02
+3.353000E+01
+1.133379E+02
+3.491100E+00
+1.265776E+00
+1.948509E+00
+4.761101E-01
+9.177045E-01
+1.251750E-01
+5.654249E-01
+5.567043E-02
 tally 2:
-1.169000E+01
-2.915330E+01
-1.247253E+00
-3.767436E-01
-5.330812E-01
-1.385083E-01
-2.987823E-01
-5.699361E-02
-2.645512E-01
-2.905381E-02
+3.353000E+01
+1.133379E+02
+3.491100E+00
+1.265776E+00
+1.948509E+00
+4.761101E-01
+9.177045E-01
+1.251750E-01
+5.654249E-01
+5.567043E-02
--- a/tests/test_score_nuscatter_pn/settings.xml
+++ b/tests/test_score_nuscatter_pn/settings.xml
@ -3,7 +3,7 @@

  <eigenvalue>
    <batches>10</batches>
-    <inactive>5</inactive>
+    <inactive>0</inactive>
    <particles>100</particles>
  </eigenvalue>

--- a/tests/test_score_nuscatter_yn/results_true.dat
+++ b/tests/test_score_nuscatter_yn/results_true.dat
@ -1,38 +1,38 @@
 k-combined:
-1.005983E+00 2.248579E-02
+9.870214E-01 2.095925E-02
 tally 1:
-1.169000E+01
-2.915330E+01
+3.353000E+01
+1.133379E+02
 tally 2:
-1.169000E+01
-2.915330E+01
-2.198379E-01
-2.828670E-02
-1.317276E-01
-9.568596E-03
-8.309792E-02
-1.155410E-02
-2.288506E-02
-3.710542E-03
-2.720674E-02
-1.789163E-03
-1.323964E-02
-1.819112E-04
-8.941597E-02
-4.265616E-03
-1.516805E-01
-1.332526E-02
-1.832782E-02
-6.611171E-03
-1.311371E-02
-2.840648E-03
-3.728365E-02
-2.866806E-03
-5.100587E-02
-2.957146E-03
-3.388028E-02
-2.481570E-03
-7.766921E-02
-3.129377E-03
-1.666131E-02
-3.828290E-03
+3.353000E+01
+1.133379E+02
+4.293226E-01
+6.259462E-02
+-2.011041E-02
+5.388144E-02
+3.900136E-01
+5.873137E-02
+6.150213E-02
+9.043796E-03
+5.518583E-02
+1.739087E-02
+-2.047987E-01
+1.993679E-02
+6.710345E-02
+1.652573E-02
+-3.619254E-02
+1.598186E-02
+3.551558E-02
+9.077346E-03
+1.044669E-01
+2.082961E-03
+-3.782063E-02
+1.681459E-02
+1.752386E-01
+1.411429E-02
+-3.289649E-02
+9.534958E-03
+5.252770E-02
+7.518445E-03
+2.688056E-02
+3.397824E-03
--- a/tests/test_score_nuscatter_yn/settings.xml
+++ b/tests/test_score_nuscatter_yn/settings.xml
@ -3,7 +3,7 @@

  <eigenvalue>
    <batches>10</batches>
-    <inactive>5</inactive>
+    <inactive>0</inactive>
    <particles>100</particles>
  </eigenvalue>