Skip to content

Ensure that Model.run() works when specifying a custom XML path #2889

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pshriwise merged 3 commits into from
Mar 12, 2024
Merged

Ensure that Model.run() works when specifying a custom XML path #2889

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f51b954
Make sure path can be specified in Model.run()
paulromano Mar 4, 2024
1883c44
Ensure path works with Model.run when it is a directory
paulromano Mar 4, 2024
711dc48
Replace pytest.warns(None), no longer works in pytest 8.1
paulromano Mar 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Make sure path can be specified in Model.run()
  • Loading branch information
@paulromano
paulromano committed Mar 4, 2024
commit f51b954b26c7ff137a5acb6ffb752a5fcf6534b7
3 changes: 2 additions & 1 deletion openmc/model/model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -709,9 +709,10 @@ def run(self, particles=None, threads=None, geometry_debug=False,
self.export_to_model_xml(**export_kwargs)
else:
self.export_to_xml(**export_kwargs)
path_input = export_kwargs.get("path", None)
openmc.run(particles, threads, geometry_debug, restart_file,
tracks, output, Path('.'), openmc_exec, mpi_args,
event_based)
event_based, path_input)

# Get output directory and return the last statepoint written
if self.settings.output and 'path' in self.settings.output:
Expand Down
3 changes: 3 additions & 0 deletions tests/unit_tests/test_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,3 +585,6 @@ def test_single_xml_exec(run_in_tmpdir):

with pytest.raises(RuntimeError, match='input_dir'):
openmc.run(path_input='input_dir/pincell.xml')

# Make sure path can be specified with run
pincell_model.run(path='my_model.xml')