diff --git a/tests/test_score_nuscatter/inputs_true.dat b/tests/test_score_nuscatter/inputs_true.dat index 440db11243..6ae99b4a17 100644 --- a/tests/test_score_nuscatter/inputs_true.dat +++ b/tests/test_score_nuscatter/inputs_true.dat @@ -1 +1 @@ -5d0e915af1f424b8ca9d3723fecc2e0e0c558bcbe70b5ad45bcc8e03caf9b4caae9ed593010ce31c6dfe09be06a6dc3929b839999132917569f2ed93c3b70455 \ No newline at end of file +c74fb5e4e8caecd11642231b55cb9442264da220329fd6a1c9959214342acd5efb4ef23368b0b018f0388a6102bce65226f6161d32f3613128d8c3762a3f6f9e \ No newline at end of file diff --git a/tests/test_score_nuscatter/results_true.dat b/tests/test_score_nuscatter/results_true.dat index 6e9935f218..8f9fcba891 100644 --- a/tests/test_score_nuscatter/results_true.dat +++ b/tests/test_score_nuscatter/results_true.dat @@ -1,11 +1,11 @@ k-combined: -9.903196E-01 4.279617E-02 +1.034954E+00 1.782721E-02 tally 1: 0.000000E+00 0.000000E+00 -1.485000E+01 -4.439790E+01 -4.120000E+00 -3.438000E+00 -5.173000E+01 -5.467243E+02 +2.514000E+01 +6.511880E+01 +6.370000E+00 +4.230900E+00 +8.547000E+01 +7.481913E+02 diff --git a/tests/test_score_nuscatter/test_score_nuscatter.py b/tests/test_score_nuscatter/test_score_nuscatter.py index e94ab61f15..d13ded507c 100644 --- a/tests/test_score_nuscatter/test_score_nuscatter.py +++ b/tests/test_score_nuscatter/test_score_nuscatter.py @@ -17,7 +17,12 @@ class ScoreNuScatterTestHarness(PyAPITestHarness): self._input_set.tallies = openmc.TalliesFile() self._input_set.tallies.add_tally(t) - PyAPITestHarness._build_inputs(self) + self._input_set.build_default_materials_and_geometry() + self._input_set.build_default_settings() + + self._input_set.settings.inactive = 0 + + self._input_set.export() def _cleanup(self): PyAPITestHarness._cleanup(self) diff --git a/tests/test_score_nuscatter_n/inputs_true.dat b/tests/test_score_nuscatter_n/inputs_true.dat index a907148a7c..c7924a247a 100644 --- a/tests/test_score_nuscatter_n/inputs_true.dat +++ b/tests/test_score_nuscatter_n/inputs_true.dat @@ -1 +1 @@ -3db6a6067fb07ed0e213c1e293f32a23ab64fbfb45a7a69320e8326ae76e5a3020c2f73986e7a93eeee1dde1422d84081ff18f0a9770aaba94423586bd134721 \ No newline at end of file +c184ef2764fa23db32253ec4c23d36cf842f173a0a57c93cb165faf771f2ff23346756160ba5793c558448283eb0917d23e3871753ea2b7e3e24f14d6cf4179f \ No newline at end of file diff --git a/tests/test_score_nuscatter_n/results_true.dat b/tests/test_score_nuscatter_n/results_true.dat index 96e56bd6ab..0c1315807f 100644 --- a/tests/test_score_nuscatter_n/results_true.dat +++ b/tests/test_score_nuscatter_n/results_true.dat @@ -1,33 +1,33 @@ k-combined: -9.903196E-01 4.279617E-02 +1.034954E+00 1.782721E-02 tally 1: -1.485000E+01 -4.439790E+01 -1.259515E+00 -3.360064E-01 -7.983154E-01 -1.355632E-01 -3.425460E-01 -2.971972E-02 -2.949225E-01 -3.975603E-02 -4.120000E+00 -3.438000E+00 -6.222571E-01 -8.335984E-02 -1.670136E-01 -1.374768E-02 --5.819374E-02 -1.091808E-02 --6.389550E-02 -5.688533E-03 -5.173000E+01 -5.467243E+02 -2.669403E+01 -1.451361E+02 -9.691140E+00 -1.933574E+01 -5.860769E-01 -2.122377E-01 --1.190340E+00 -3.145785E-01 +2.514000E+01 +6.511880E+01 +2.724740E+00 +8.378120E-01 +1.521255E+00 +2.667071E-01 +7.903706E-01 +1.216244E-01 +5.770120E-01 +5.508594E-02 +6.370000E+00 +4.230900E+00 +8.075261E-01 +9.047897E-02 +5.879624E-01 +4.107777E-02 +2.034636E-01 +8.243025E-03 +-2.744502E-02 +1.515916E-03 +8.547000E+01 +7.481913E+02 +4.446994E+01 +2.016855E+02 +1.664683E+01 +2.837713E+01 +1.373176E+00 +3.329601E-01 +-1.663772E+00 +4.264485E-01 diff --git a/tests/test_score_nuscatter_n/test_score_nuscatter_n.py b/tests/test_score_nuscatter_n/test_score_nuscatter_n.py index 5b0a755567..c675bc7be3 100644 --- a/tests/test_score_nuscatter_n/test_score_nuscatter_n.py +++ b/tests/test_score_nuscatter_n/test_score_nuscatter_n.py @@ -21,7 +21,12 @@ class ScoreNuScatterNTestHarness(PyAPITestHarness): self._input_set.tallies = openmc.TalliesFile() self._input_set.tallies.add_tally(t) - PyAPITestHarness._build_inputs(self) + self._input_set.build_default_materials_and_geometry() + self._input_set.build_default_settings() + + self._input_set.settings.inactive = 0 + + self._input_set.export() def _cleanup(self): PyAPITestHarness._cleanup(self) diff --git a/tests/test_score_nuscatter_pn/inputs_true.dat b/tests/test_score_nuscatter_pn/inputs_true.dat index eb2962dc34..30a894dafb 100644 --- a/tests/test_score_nuscatter_pn/inputs_true.dat +++ b/tests/test_score_nuscatter_pn/inputs_true.dat @@ -1 +1 @@ -5cd39eacee3efe8d7a8db38edb741d8f773a0b42276dab8635d36e7fc9809617d9ad47510be06bc019472e1b792bc678d88fcbb26ca4ed07504a222388ee230c \ No newline at end of file +79d74ffe32f564b83bdde94048f57233454881f3b55413e9b5e30ce4b9813ff6436dca98d691d941d5f31947f2215dcb656369c2b32e6240e1424e6aad96395e \ No newline at end of file diff --git a/tests/test_score_nuscatter_pn/results_true.dat b/tests/test_score_nuscatter_pn/results_true.dat index 753216a8b7..603c13e701 100644 --- a/tests/test_score_nuscatter_pn/results_true.dat +++ b/tests/test_score_nuscatter_pn/results_true.dat @@ -1,24 +1,24 @@ k-combined: -9.903196E-01 4.279617E-02 +1.034954E+00 1.782721E-02 tally 1: -1.485000E+01 -4.439790E+01 -1.259515E+00 -3.360064E-01 -7.983154E-01 -1.355632E-01 -3.425460E-01 -2.971972E-02 -2.949225E-01 -3.975603E-02 +2.514000E+01 +6.511880E+01 +2.724740E+00 +8.378120E-01 +1.521255E+00 +2.667071E-01 +7.903706E-01 +1.216244E-01 +5.770120E-01 +5.508594E-02 tally 2: -1.485000E+01 -4.439790E+01 -1.259515E+00 -3.360064E-01 -7.983154E-01 -1.355632E-01 -3.425460E-01 -2.971972E-02 -2.949225E-01 -3.975603E-02 +2.514000E+01 +6.511880E+01 +2.724740E+00 +8.378120E-01 +1.521255E+00 +2.667071E-01 +7.903706E-01 +1.216244E-01 +5.770120E-01 +5.508594E-02 diff --git a/tests/test_score_nuscatter_pn/test_score_nuscatter_pn.py b/tests/test_score_nuscatter_pn/test_score_nuscatter_pn.py index a69679873f..d3a4a55961 100644 --- a/tests/test_score_nuscatter_pn/test_score_nuscatter_pn.py +++ b/tests/test_score_nuscatter_pn/test_score_nuscatter_pn.py @@ -25,7 +25,12 @@ class ScoreNuScatterPNTestHarness(PyAPITestHarness): self._input_set.tallies.add_tally(t1) self._input_set.tallies.add_tally(t2) - PyAPITestHarness._build_inputs(self) + self._input_set.build_default_materials_and_geometry() + self._input_set.build_default_settings() + + self._input_set.settings.inactive = 0 + + self._input_set.export() def _cleanup(self): PyAPITestHarness._cleanup(self) diff --git a/tests/test_score_nuscatter_yn/inputs_true.dat b/tests/test_score_nuscatter_yn/inputs_true.dat index 510c6f04d9..9a8a934b17 100644 --- a/tests/test_score_nuscatter_yn/inputs_true.dat +++ b/tests/test_score_nuscatter_yn/inputs_true.dat @@ -1 +1 @@ -4bce40c1119ba7ac23c12b0fcf79fbf9b6dfb89ce2921f5f3906cb8683b79355bd9ba208c80f736f03ea18dccf3449a4ddaedb72ebb10b27301e843c31822f58 \ No newline at end of file +fd7b5b66e5d5e705da488651445d75240b05dcc1d243b2d2e8b8a729c8220221cdfa1eccfeca30897a006caaceae3e8c7449392b5027b290cb388b33e86ff2a3 \ No newline at end of file diff --git a/tests/test_score_nuscatter_yn/results_true.dat b/tests/test_score_nuscatter_yn/results_true.dat index d1b165274d..79c89b7708 100644 --- a/tests/test_score_nuscatter_yn/results_true.dat +++ b/tests/test_score_nuscatter_yn/results_true.dat @@ -1,38 +1,38 @@ k-combined: -9.903196E-01 4.279617E-02 +1.034954E+00 1.782721E-02 tally 1: -1.485000E+01 -4.439790E+01 +2.514000E+01 +6.511880E+01 tally 2: -1.485000E+01 -4.439790E+01 -8.440076E-02 -1.135203E-02 -8.198663E-02 -3.887429E-02 -1.358080E-01 -2.890416E-02 --3.544823E-02 -9.843339E-04 -1.542072E-01 -8.228126E-03 -1.057111E-01 -3.758100E-03 -1.647870E-02 -4.827841E-03 -1.378297E-01 -1.566876E-02 --4.676778E-02 -4.809366E-03 -1.966204E-02 -7.447981E-04 --1.889258E-02 -6.841953E-04 -1.337703E-02 -1.250077E-03 -1.044684E-01 -6.969498E-03 --1.177995E-02 -8.208715E-03 -1.940058E-04 -5.128759E-03 +2.514000E+01 +6.511880E+01 +-2.222467E-01 +2.881247E-02 +3.019176E-01 +3.014833E-02 +8.459006E-04 +4.773570E-02 +9.596964E-02 +1.009754E-02 +-4.314855E-02 +6.207871E-03 +4.607677E-02 +9.205573E-03 +-2.345994E-03 +1.243004E-02 +9.577397E-02 +6.605519E-03 +-2.821584E-02 +3.834286E-03 +-1.077389E-01 +6.570217E-03 +-1.106443E-01 +1.006436E-02 +1.322104E-01 +7.721677E-03 +1.315548E-02 +5.488918E-04 +-2.792171E-02 +5.816161E-03 +-1.994370E-02 +1.169674E-03 diff --git a/tests/test_score_nuscatter_yn/test_score_nuscatter_yn.py b/tests/test_score_nuscatter_yn/test_score_nuscatter_yn.py index 0b2005bdcb..d48df6a21e 100644 --- a/tests/test_score_nuscatter_yn/test_score_nuscatter_yn.py +++ b/tests/test_score_nuscatter_yn/test_score_nuscatter_yn.py @@ -21,7 +21,12 @@ class ScoreNuScatterYNTestHarness(PyAPITestHarness): self._input_set.tallies.add_tally(t1) self._input_set.tallies.add_tally(t2) - PyAPITestHarness._build_inputs(self) + self._input_set.build_default_materials_and_geometry() + self._input_set.build_default_settings() + + self._input_set.settings.inactive = 0 + + self._input_set.export() def _cleanup(self): PyAPITestHarness._cleanup(self)