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

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
fix indent issue, add some description
  • Loading branch information
@lewisgross1296
lewisgross1296 committed Mar 4, 2025
commit 09df7c1289b9c5a2d21a7788294059f7d91b202b
50 changes: 27 additions & 23 deletions openmc/deplete/abc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -659,29 +659,33 @@ def __init__(
seconds, source_rates = _normalize_timesteps(
timesteps, source_rates, timestep_units, operator)

# validate existing depletion steps are consistent with those passed to operator
if continue_timesteps:
completed_times = operator.prev_res.get_times(time_units=timestep_units)
completed_timesteps = completed_times[1:] - completed_times[:-1] # convert absolute t to dt
completed_source_rates = operator.prev_res.get_source_rates()
num_previous_steps_run = len(completed_timesteps)
if (np.array_equal(completed_timesteps, timesteps[:num_previous_steps_run])):
seconds = seconds[num_previous_steps_run:]
else:
raise ValueError(
"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."
)
if(np.array_equal(completed_source_rates, np.asarray(source_rates)[:num_previous_steps_run] )):
source_rates = source_rates[num_previous_steps_run:]
else:
raise ValueError(
"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."
)
# validate existing depletion steps are consistent with those passed to operator
# if the timesteps retrieved from operator.prev_res.get_times match the first set
# of time steps provided to the continue run, and the same is true for the source_rates
# retrieved from operator.prev_res.get_source_rates(), then run a depletion simulations
# with only the new time steps and source rates provided

@pshriwise pshriwise Mar 4, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
# retrieved from operator.prev_res.get_source_rates(), then run a depletion simulations
# with only the new time steps and source rates provided
# retrieved from operator.prev_res.get_source_rates(), then run a depletion simulation
# with only the new time steps and source rates provided

if continue_timesteps:
completed_times = operator.prev_res.get_times(time_units=timestep_units)
completed_timesteps = completed_times[1:] - completed_times[:-1] # convert absolute t to dt
completed_source_rates = operator.prev_res.get_source_rates()
Comment thread
pshriwise marked this conversation as resolved.
Resolved
num_previous_steps_run = len(completed_timesteps)
if (np.array_equal(completed_timesteps, timesteps[:num_previous_steps_run])):
seconds = seconds[num_previous_steps_run:]
else:
raise ValueError(
"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."
)
if(np.array_equal(completed_source_rates, np.asarray(source_rates)[:num_previous_steps_run] )):
source_rates = source_rates[num_previous_steps_run:]
else:
raise ValueError(
"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."
)
self.timesteps = np.asarray(seconds)
self.source_rates = np.asarray(source_rates)

Expand Down