diff --git a/armi/physics/fuelCycle/fuelHandlerInterface.py b/armi/physics/fuelCycle/fuelHandlerInterface.py index 299e1d9dc..881cc19c8 100644 --- a/armi/physics/fuelCycle/fuelHandlerInterface.py +++ b/armi/physics/fuelCycle/fuelHandlerInterface.py @@ -65,6 +65,7 @@ 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") if mc2 and self.cs[CONF_RUN_LATTICE_BEFORE_SHUFFLING]: runLog.extra( 'Running {0} lattice physics before fuel management due to the "{1}"' @@ -72,6 +73,7 @@ def interactBOC(self, cycle=None): mc2, CONF_RUN_LATTICE_BEFORE_SHUFFLING ) ) + xsgm.interactBOC(cycle=cycle) mc2.interactBOC(cycle=cycle) if self.enabled() and ( diff --git a/armi/physics/neutronics/crossSectionGroupManager.py b/armi/physics/neutronics/crossSectionGroupManager.py index 8af2d6862..cce04a7ad 100644 --- a/armi/physics/neutronics/crossSectionGroupManager.py +++ b/armi/physics/neutronics/crossSectionGroupManager.py @@ -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): diff --git a/armi/physics/neutronics/settings.py b/armi/physics/neutronics/settings.py index 90c13eb8c..b181234ef 100644 --- a/armi/physics/neutronics/settings.py +++ b/armi/physics/neutronics/settings.py @@ -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=[ diff --git a/doc/release/0.2.rst b/doc/release/0.2.rst index 0e683a7cf..a6adc2d48 100644 --- a/doc/release/0.2.rst +++ b/doc/release/0.2.rst @@ -12,6 +12,7 @@ What's new in ARMI #. Added ``Composite.sort()`` to allow the user to recursively sort any piece of the ``Reactor``. (`PR#1280 `_) # Revert "when using non-uniform mesh, detailed fission/activation products have cross sections generated to avoid blocks without xs data" and move capability to lattice physics (`PR#1280 `_) #. Add interactCoupled method for snapshotInterface (`PR#1294 `_) +#. Move cross section group manager interface stack position to be just before lattice physics. (`PR#1288 `_) Bug fixes ---------