Skip to content

add continue feature for depletion #3272

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 17 commits into from
Mar 6, 2025
Merged

add continue feature for depletion #3272

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
1730c21
add continue feature for depletion and test new code
lewisgross1296 Jan 22, 2025
5ed5a59
added flags to SIIntegrator, convereted np.equal to np.array_equal, u…
lewisgross1296 Jan 28, 2025
48f8478
implement get_source_rates
lewisgross1296 Jan 28, 2025
136289c
split failure cases into two tests and added match param
lewisgross1296 Jan 28, 2025
46ab8b4
source_rate does not have index (scalar variable)
lewisgross1296 Jan 28, 2025
4fdf333
fix off by 1
lewisgross1296 Feb 19, 2025
3f96f1a
split checks, need to compute dts, need timestep_units in get_times call
lewisgross1296 Feb 19, 2025
f3358e4
make sure that continue runs with no previous results do not break
lewisgross1296 Feb 24, 2025
09df7c1
fix indent issue, add some description
lewisgross1296 Mar 4, 2025
020aff2
addressing some of Patrick's feedback
lewisgross1296 Mar 4, 2025
00e575d
remove comment in favor of docstring
lewisgross1296 Mar 4, 2025
220f1a9
imrove docstring
lewisgross1296 Mar 4, 2025
1915e6d
move completed_source_rates declaration after success of timestep check
Mar 5, 2025
384e99c
Style changes to test file
pshriwise Mar 5, 2025
471e5b6
Revert change to pugixml submodule
paulromano Mar 5, 2025
b27c9df
Small stylistic fixes
paulromano Mar 5, 2025
e2d0ad1
Simplify tests for continue run
paulromano Mar 5, 2025
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
Prev Previous commit
Next Next commit
make sure that continue runs with no previous results do not break
  • Loading branch information
@lewisgross1296
lewisgross1296 committed Mar 4, 2025
commit f3358e4034c7b2bf99f084dc3c5e782470ce03b3
3 changes: 3 additions & 0 deletions openmc/deplete/abc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,6 +638,9 @@ def __init__(
"this uses {}".format(
self.__class__.__name__, res.data.shape[0],
self._num_stages))
else:
# if the user specifies a continue run without a previous results, set the flag to False for them
continue_timesteps = False
self.operator = operator
self.chain = operator.chain

Expand Down
45 changes: 27 additions & 18 deletions tests/unit_tests/test_deplete_continue.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,27 @@ def test_continue(run_in_tmpdir, scheme):

operator = dummy_operator.DummyOperator()

# take first step
bundle.solver(operator, [0.75], 1.0).integrate()
# initial depletion
bundle.solver(operator, [1.0, 2.0], [1.0, 2.0]).integrate()

# restart
prev_res = openmc.deplete.Results(
operator.output_dir / "depletion_results.h5")
# set up continue run
prev_res = openmc.deplete.Results(operator.output_dir / "depletion_results.h5")
operator = dummy_operator.DummyOperator(prev_res)

# if continue run happens, test passes
bundle.solver(operator, [0.75, 0.75], [1.0, 1.0], continue_timesteps=True).integrate()
bundle.solver(operator, [1.0, 2.0, 3.0, 4.0], [1.0, 2.0, 3.0, 4.0], continue_timesteps=True).integrate()

@pytest.mark.parametrize("scheme", dummy_operator.SCHEMES)
def test_continue_for_null_previous(run_in_tmpdir, scheme):
"""Test to ensure that a continue run works even if there are no previous results"""
# set up the problem

bundle = dummy_operator.SCHEMES[scheme]

operator = dummy_operator.DummyOperator()

# initial depletion
bundle.solver(operator, [1.0, 2.0], [1.0, 2.0], continue_timesteps=True).integrate()

@pytest.mark.parametrize("scheme", dummy_operator.SCHEMES)
def test_mismatched_initial_times(run_in_tmpdir, scheme):
Expand All @@ -45,21 +56,20 @@ def test_mismatched_initial_times(run_in_tmpdir, scheme):
bundle.solver(operator, [0.75, 0.75], [1.0, 1.0]).integrate()

# restart
prev_res = openmc.deplete.Results(
operator.output_dir / "depletion_results.h5")
prev_res = openmc.deplete.Results(operator.output_dir / "depletion_results.h5")
operator = dummy_operator.DummyOperator(prev_res)

with pytest.raises(
ValueError,
match = "You are attempting to continue a run in which the previous "
"results do not have the same initial steps as those provided "
"to the Integrator. Please make sure you are using the correct "
"timesteps, powers or power densities, and previous results file.",
match="You are attempting to continue a run in which the previous timesteps "
"do not have the same initial timesteps as those provided to the "
"Integrator. Please make sure you are using the correct timesteps.",
):
bundle.solver(
operator, [0.75, 0.5, 0.75], [1.0, 1.0, 1.0], continue_timesteps=True
).integrate()


@pytest.mark.parametrize("scheme", dummy_operator.SCHEMES)
def test_mismatched_initial_source_rates(run_in_tmpdir, scheme):
"""Test to ensure that a continue run with different initial steps is properly caught"""
Expand All @@ -74,16 +84,15 @@ def test_mismatched_initial_source_rates(run_in_tmpdir, scheme):
bundle.solver(operator, [0.75, 0.75], [1.0, 1.0]).integrate()

# restart
prev_res = openmc.deplete.Results(
operator.output_dir / "depletion_results.h5")
prev_res = openmc.deplete.Results(operator.output_dir / "depletion_results.h5")
operator = dummy_operator.DummyOperator(prev_res)

with pytest.raises(
ValueError,
match = "You are attempting to continue a run in which the previous "
"results do not have the same initial steps as those provided "
"to the Integrator. Please make sure you are using the correct "
"timesteps, powers or power densities, and previous results file.",
match="You are attempting to continue a run in which the previous results "
"do not have the same initial source rates, powers, or power densities "
"as those provided to the Integrator. Please make sure you are using "
"the correct powers, power densities, or source rates and previous results file.",
):
bundle.solver(
operator, [0.75, 0.75, 0.75], [1.0, 2.0, 1.0], continue_timesteps=True
Expand Down