Skip to content

Commit 3749522

Browse files
committed
typo fixes; fix tests; update msbr example
1 parent 12cfdb9 commit 3749522

4 files changed

Lines changed: 38 additions & 4 deletions

File tree

examples/msbr/msbr_endfb71_main.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"proc_input_file": "msbr_objects.json",
33
"dot_input_file": "msbr.dot",
4-
"n_depletion_steps": 12,
4+
"n_depletion_steps": 122,
55
"output_path": "serpent_msbr_test",
66
"depcode": {
77
"codename": "serpent",

examples/msbr/msbr_openmc.json

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
{
2+
"proc_input_file": "msbr_objects.json",
3+
"dot_input_file": "msbr.dot",
4+
"n_depletion_steps": 122,
5+
"output_path": "openmc_msbr_test",
6+
"depcode": {
7+
"codename": "openmc",
8+
"template_input_file_path": {
9+
"materials": "materials.xml",
10+
"settings": "settings.xml"},
11+
"geo_file_paths": ["geometry.xml"],
12+
"chain_file_path": "chain_endfb71_pwr.xml",
13+
"depletion_settings": {
14+
"operator_kwargs": {
15+
"fission_q": "serpent_fissq.json"
16+
}
17+
}
18+
},
19+
"simulation": {
20+
"sim_name": "msbr_openmc_test"
21+
},
22+
"reactor": {
23+
"volume": 1.0,
24+
"mass_flowrate": 9920000,
25+
"power_levels": [ 2250000000 ],
26+
"depletion_timesteps": [ 3 ],
27+
"timestep_units": "d"
28+
}
29+
}

saltproc/openmc_depcode.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,7 @@ def write_runtime_input(self, reactor, depletion_step, restart):
466466
geometry.export_to_xml(self.runtime_inputfile['geometry'])
467467
settings.export_to_xml(self.runtime_inputfile['settings'])
468468
self.write_depletion_settings(reactor, depletion_step)
469-
self.write_saltproc_openmc_tallies(materials, geometry, _ENERGY_BOUNDS, _N_DELAYED_GROUPS)
469+
self.write_saltproc_openmc_tallies(materials, geometry, _DELAYED_ENERGY_BOUNDS, _N_DELAYED_GROUPS)
470470
del materials, geometry, settings
471471

472472
def write_depletion_settings(self, reactor, step_idx):

tests/integration_tests/file_interface_openmc/test.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
import pytest
99
import openmc
1010

11+
from saltproc.openmc_depcode import _DELAYED_ENERGY_BOUNDS, _N_DELAYED_GROUPS
12+
13+
1114

1215
@pytest.fixture
1316
def setup(scope='module'):
@@ -109,7 +112,8 @@ def test_write_saltproc_openmc_tallies(setup, openmc_depcode):
109112
openmc_depcode.template_input_file_path['materials'])
110113
geo = openmc.Geometry.from_xml(
111114
openmc_depcode.geo_file_paths[0], mat)
112-
openmc_depcode.write_saltproc_openmc_tallies(mat, geo)
115+
openmc_depcode.write_saltproc_openmc_tallies(mat, geo,
116+
_DELAYED_ENERGY_BOUNDS, _N_DELAYED_GROUPS)
113117
del mat, geo
114118
tallies = openmc.Tallies.from_xml(openmc_depcode.runtime_inputfile['tallies'])
115119

@@ -160,7 +164,8 @@ def test_read_neutronics_parameters(setup, openmc_depcode):
160164
openmc_depcode.template_input_file_path['materials'])
161165
geo = openmc.Geometry.from_xml(
162166
openmc_depcode.geo_file_paths[0], mat)
163-
openmc_depcode.write_saltproc_openmc_tallies(mat, geo)
167+
openmc_depcode.write_saltproc_openmc_tallies(mat, geo,
168+
_DELAYED_ENERGY_BOUNDS, _N_DELAYED_GROUPS)
164169

165170
old_output_path = openmc_depcode.output_path
166171
openmc_depcode.output_path = Path(__file__).parents[2] / 'openmc_data/saltproc_runtime_ref'

0 commit comments

Comments
 (0)