Skip to content
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

Separate x and root in return search_for_keff function #17

Merged
merged 1 commit into from
Oct 30, 2023
Merged

Separate x and root in return search_for_keff function #17

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions openmc/deplete/batchwise.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1547,24 +1547,24 @@ def search_for_keff(self, x, step_index):

# restart level and perform dilution
self.bw_geom._set_cell_attrib(self.restart_level)
x = self.bw_mat.search_for_keff(x, step_index)
x, root = self.bw_mat.search_for_keff(x, step_index)
#update dulution interval
#if step_index == self.dilute_interval:
# self.dilute_interval += self.step_interval


else:
x = self.bw_geom.search_for_keff(x, step_index)
x, root = self.bw_geom.search_for_keff(x, step_index)
# in this case if upper limit gets hit, stop directly
if self.bw_geom._get_cell_attrib() >= self.bw_geom.bracket_limit[1]:
if root >= self.bw_geom.bracket_limit[1]:
from pathlib import Path
print(f'Reached maximum of {self.bw_geom.bracket_limit[1]} cm'
' exit..')
Path('sim.done').touch()

for rank in range(comm.size):
comm.Abort()
return x
return x, root

class BatchwiseSchemeRefuel():
"""
Expand Down Expand Up @@ -1609,13 +1609,13 @@ def __init__(self, bw_list, restart_level):
raise ValueError(f'{bw_list} is not a list')

self.bw_list = bw_list

if not isinstance(restart_level, (float, int)):
raise ValueError(f'{restart_level} is of type {type(restart_level)},'
' while it should be int or float')
else:
self.restart_level = restart_level

def set_density_function(self, mats, density_func, oxidation_states):
for bw in self.bw_list:
bw.set_density_function(mats, density_func, oxidation_states)
Expand Down Expand Up @@ -1645,10 +1645,10 @@ def search_for_keff(self, x, step_index):
Updated total atoms concentrations
"""
#Start by doing a geometrical search§
x,root = self.bw_geom.search_for_keff(x, step_index)
x, root = self.bw_geom.search_for_keff(x, step_index)
#check if upper geometrical limit gets hit
if root >= self.bw_geom.bracket_limit[1]:
# Reset geometry and refuel
# Reset geometry and refuel
self.bw_geom._set_cell_attrib(self.restart_level)
x,root = self.bw_mat.search_for_keff(x, step_index)

Expand Down