From e1365bd0364862a018fe84397d2bcbe3982f3200 Mon Sep 17 00:00:00 2001 From: Adam Nelson <1037107+nelsonag@users.noreply.github.com> Date: Fri, 1 Oct 2021 06:09:24 -0500 Subject: [PATCH] Applied suggested changes per @paulromano's code review Co-authored-by: Paul Romano --- openmc/deplete/abc.py | 2 +- openmc/deplete/helpers.py | 2 +- openmc/deplete/operator.py | 2 +- openmc/deplete/results.py | 2 +- openmc/lib/core.py | 2 ++ openmc/model/model.py | 18 ++++++++---------- tests/unit_tests/test_deplete_chain.py | 2 +- tests/unit_tests/test_deplete_integrator.py | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/openmc/deplete/abc.py b/openmc/deplete/abc.py index bf9f4da827..b9198696d5 100644 --- a/openmc/deplete/abc.py +++ b/openmc/deplete/abc.py @@ -22,7 +22,7 @@ from uncertainties import ufloat from openmc.data import DataLibrary from openmc.lib import MaterialFilter, Tally from openmc.checkvalue import check_type, check_greater_than -from openmc import comm +from openmc.mpi import comm from .results import Results from .chain import Chain from .results_list import ResultsList diff --git a/openmc/deplete/helpers.py b/openmc/deplete/helpers.py index a8cf5212ee..f223829233 100644 --- a/openmc/deplete/helpers.py +++ b/openmc/deplete/helpers.py @@ -10,7 +10,7 @@ import sys from numpy import dot, zeros, newaxis, asarray -from openmc import comm +from openmc.mpi import comm from openmc.checkvalue import check_type, check_greater_than from openmc.data import JOULE_PER_EV, REACTION_MT from openmc.lib import ( diff --git a/openmc/deplete/operator.py b/openmc/deplete/operator.py index e4db13f95d..29370eb8cf 100644 --- a/openmc/deplete/operator.py +++ b/openmc/deplete/operator.py @@ -20,7 +20,7 @@ from uncertainties import ufloat import openmc from openmc.checkvalue import check_value import openmc.lib -from openmc import comm +from openmc.mpi import comm from .abc import TransportOperator, OperatorResult from .atom_number import AtomNumber from .reaction_rates import ReactionRates diff --git a/openmc/deplete/results.py b/openmc/deplete/results.py index 05d78f6293..111c8e638e 100644 --- a/openmc/deplete/results.py +++ b/openmc/deplete/results.py @@ -9,7 +9,7 @@ import copy import h5py import numpy as np -from openmc import comm, MPI +from openmc.mpi import comm, MPI from .reaction_rates import ReactionRates VERSION_RESULTS = (1, 1) diff --git a/openmc/lib/core.py b/openmc/lib/core.py index 3b691721c6..92cad33306 100644 --- a/openmc/lib/core.py +++ b/openmc/lib/core.py @@ -363,6 +363,7 @@ def plot_geometry(output=True): """Plot geometry .. versionchanged:: 0.13.0 + The *output* argument was added. Parameters ---------- @@ -388,6 +389,7 @@ def run(output=True): """Run simulation .. versionchanged:: 0.13.0 + The *output* argument was added. Parameters ---------- diff --git a/openmc/model/model.py b/openmc/model/model.py index 465ad30647..ac54763c4b 100644 --- a/openmc/model/model.py +++ b/openmc/model/model.py @@ -109,15 +109,13 @@ class Model: self._cells_by_name = {} for cell in cells.values(): if cell.name not in self._cells_by_name: - self._cells_by_name[cell.name] = [cell] - else: - self._cells_by_name[cell.name].append(cell) + self._cells_by_name[cell.name] = set() + self._cells_by_name[cell.name].add(cell) self._materials_by_name = {} for mat in mats: if mat.name not in self._materials_by_name: - self._materials_by_name[mat.name] = [mat] - else: - self._materials_by_name[mat.name].append(mat) + self._materials_by_name[mat.name] = set() + self._materials_by_name[mat.name].add(mat) @property def geometry(self): @@ -196,8 +194,7 @@ class Model: def from_xml(cls, geometry='geometry.xml', materials='materials.xml', settings='settings.xml'): """Create model from existing XML files - When initializing this way, the user must manually load plots, tallies, - the chain_file and fission_q attributes. + When initializing this way, the user must manually load plots and tallies. Parameters ---------- @@ -288,6 +285,8 @@ class Model: """Deplete model using specified timesteps/power .. versionchanged:: 0.13.0 + The *final_step*, *operator_kwargs*, *directory*, and *output* + arguments were added. Parameters ---------- @@ -319,8 +318,7 @@ class Model: elif isinstance(operator_kwargs, dict): op_kwargs = operator_kwargs else: - msg = "operator_kwargs must be a dict or None" - raise ValueError(msg) + raise ValueError("operator_kwargs must be a dict or None") # Import openmc.deplete here so the Model can be used even if the # shared library is unavailable. diff --git a/tests/unit_tests/test_deplete_chain.py b/tests/unit_tests/test_deplete_chain.py index 0904ff39ae..9769a49e3f 100644 --- a/tests/unit_tests/test_deplete_chain.py +++ b/tests/unit_tests/test_deplete_chain.py @@ -7,7 +7,7 @@ import os from pathlib import Path import numpy as np -from openmc import comm +from openmc.mpi import comm from openmc.deplete import Chain, reaction_rates, nuclide, cram, pool import pytest diff --git a/tests/unit_tests/test_deplete_integrator.py b/tests/unit_tests/test_deplete_integrator.py index ec424b05b8..a08d8738c5 100644 --- a/tests/unit_tests/test_deplete_integrator.py +++ b/tests/unit_tests/test_deplete_integrator.py @@ -14,7 +14,7 @@ import numpy as np from uncertainties import ufloat import pytest -from openmc import comm +from openmc.mpi import comm from openmc.deplete import ( ReactionRates, Results, ResultsList, OperatorResult, PredictorIntegrator, CECMIntegrator, CF4Integrator, CELIIntegrator, EPCRK4Integrator,