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

Change XSGM interface stack position to just before before MC2 #1288

Merged
merged 10 commits into from
Jun 14, 2023
Merged

Change XSGM interface stack position to just before before MC2 #1288

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
357eb89
Change XSGM interface stack position to just before before MC2
HunterPSmith May 12, 2023
62b5748
Fix min nuclide density bug
HunterPSmith May 16, 2023
58f1668
Set xs block averaging method to `average`
HunterPSmith May 16, 2023
91030af
Merge branch 'main' of https://github.com/terrapower/armi into xsgmIn…
HunterPSmith Jun 2, 2023
1b40c6b
Revert "Fix min nuclide density bug"
HunterPSmith Jun 6, 2023
a07a5b1
call xsgm when runLatticePhysicsBeforeShuffling is true
HunterPSmith Jun 7, 2023
2123e3c
Merge branch 'main' into xsgmInterfaceStackSwitch
HunterPSmith Jun 8, 2023
25f5939
Merge branch 'main' into xsgmInterfaceStackSwitch
HunterPSmith Jun 9, 2023
74cbc84
Merge branch 'main' into xsgmInterfaceStackSwitch
albeanth Jun 14, 2023
edca226
release notes
albeanth Jun 14, 2023
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
2 changes: 2 additions & 0 deletions armi/physics/fuelCycle/fuelHandlerInterface.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,15 @@ def interactBOC(self, cycle=None):
# if lattice physics is requested, compute it here instead of after fuel management.
# This enables XS to exist for branch searching, etc.
mc2 = self.o.getInterface(function="latticePhysics")
xsgm = self.o.getInterface("xsGroups")
john-science marked this conversation as resolved.
Show resolved Hide resolved
if mc2 and self.cs[CONF_RUN_LATTICE_BEFORE_SHUFFLING]:
runLog.extra(
'Running {0} lattice physics before fuel management due to the "{1}"'
" setting being activated.".format(
mc2, CONF_RUN_LATTICE_BEFORE_SHUFFLING
)
)
xsgm.interactBOC(cycle=cycle)
mc2.interactBOC(cycle=cycle)

if self.enabled() and (
Expand Down
2 changes: 1 addition & 1 deletion armi/physics/neutronics/crossSectionGroupManager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
from armi.utils.units import TRACE_NUMBER_DENSITY
from armi.physics.neutronics import LatticePhysicsFrequency

ORDER = interfaces.STACK_ORDER.BEFORE + interfaces.STACK_ORDER.FUEL_MANAGEMENT
ORDER = interfaces.STACK_ORDER.BEFORE + interfaces.STACK_ORDER.CROSS_SECTIONS


def describeInterfaces(cs):
Expand Down
2 changes: 1 addition & 1 deletion armi/physics/neutronics/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ def defineSettings():
),
setting.Setting(
CONF_XS_BLOCK_REPRESENTATION,
default="FluxWeightedAverage",
default="Average",
label="Cross Section Block Averaging Method",
description="The type of averaging to perform when creating cross sections for a group of blocks",
options=[
Expand Down