Skip to content

add export_model_xml arguments to Model.plot_geometry and Model.calculate_volumes #3190

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
paulromano merged 2 commits into from
Nov 9, 2024
Merged

add export_model_xml arguments to Model.plot_geometry and Model.calculate_volumes #3190

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
225a91d
add export_model_xml arguments
Nov 8, 2024
0f61b22
Make sure paths other than model.xml work
paulromano Nov 9, 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
41 changes: 33 additions & 8 deletions openmc/model/model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -719,7 +719,8 @@ def run(self, particles=None, threads=None, geometry_debug=False,

def calculate_volumes(self, threads=None, output=True, cwd='.',
openmc_exec='openmc', mpi_args=None,
apply_volumes=True):
apply_volumes=True, export_model_xml=True,
**export_kwargs):
"""Runs an OpenMC stochastic volume calculation and, if requested,
applies volumes to the model

Expand Down Expand Up @@ -748,6 +749,13 @@ def calculate_volumes(self, threads=None, output=True, cwd='.',
apply_volumes : bool, optional
Whether apply the volume calculation results from this calculation
to the model. Defaults to applying the volumes.
export_model_xml : bool, optional
Exports a single model.xml file rather than separate files. Defaults
to True.
**export_kwargs
Keyword arguments passed to either :meth:`Model.export_to_model_xml`
or :meth:`Model.export_to_xml`.

"""

if len(self.settings.volume_calculations) == 0:
Expand All @@ -769,10 +777,15 @@ def calculate_volumes(self, threads=None, output=True, cwd='.',
openmc.lib.calculate_volumes(output)

else:
self.export_to_xml()
openmc.calculate_volumes(threads=threads, output=output,
openmc_exec=openmc_exec,
mpi_args=mpi_args)
if export_model_xml:
self.export_to_model_xml(**export_kwargs)
else:
self.export_to_xml(**export_kwargs)
path_input = export_kwargs.get("path", None)
openmc.calculate_volumes(
threads=threads, output=output, openmc_exec=openmc_exec,
mpi_args=mpi_args, path_input=path_input
)

# Now we apply the volumes
if apply_volumes:
Expand Down Expand Up @@ -909,7 +922,8 @@ def sample_external_source(
n_samples=n_samples, prn_seed=prn_seed
)

def plot_geometry(self, output=True, cwd='.', openmc_exec='openmc'):
def plot_geometry(self, output=True, cwd='.', openmc_exec='openmc',
export_model_xml=True, **export_kwargs):
"""Creates plot images as specified by the Model.plots attribute

.. versionadded:: 0.13.0
Expand All @@ -924,6 +938,12 @@ def plot_geometry(self, output=True, cwd='.', openmc_exec='openmc'):
openmc_exec : str, optional
Path to OpenMC executable. Defaults to 'openmc'.
This only applies to the case when not using the C API.
export_model_xml : bool, optional
Exports a single model.xml file rather than separate files. Defaults
to True.
**export_kwargs
Keyword arguments passed to either :meth:`Model.export_to_model_xml`
or :meth:`Model.export_to_xml`.

"""

Expand All @@ -937,8 +957,13 @@ def plot_geometry(self, output=True, cwd='.', openmc_exec='openmc'):
# Compute the volumes
openmc.lib.plot_geometry(output)
else:
self.export_to_xml()
openmc.plot_geometry(output=output, openmc_exec=openmc_exec)
if export_model_xml:
self.export_to_model_xml(**export_kwargs)
else:
self.export_to_xml(**export_kwargs)
path_input = export_kwargs.get("path", None)
openmc.plot_geometry(output=output, openmc_exec=openmc_exec,
path_input=path_input)

def _change_py_lib_attribs(self, names_or_ids, value, obj_type,
attrib_name, density_units='atom/b-cm'):
Expand Down