Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into drewj/rotate-block-pa…
Browse files Browse the repository at this point in the history
…rams/1860

* origin/main:
  Adding ParameterCollection.where for conditional parameter iteration (#1899)
  Removing non-existent settings from test files (#1906)
  Removing reference to deprecated internal files (#1897)
  Fixing a problem with the latest release of h5py (#1907)
  Providing plugin hook getAxialExpansionChanger (#1870)
  Fixing typo in new settingsValidation imports (#1905)
  Startinf moving settingsValidation to the settings area (#1895)
  • Loading branch information
drewj-tp committed Sep 26, 2024
2 parents 8b81b3e + f4223b2 commit c5e52bb
Show file tree
Hide file tree
Showing 25 changed files with 1,108 additions and 916 deletions.
12 changes: 1 addition & 11 deletions armi/operators/operator.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@
from armi import runLog
from armi.bookkeeping import memoryProfiler
from armi.bookkeeping.report import reportingUtils
from armi.operators import settingsValidation
from armi.operators.runTypes import RunTypes
from armi.physics.fuelCycle.settings import CONF_SHUFFLE_LOGIC
from armi.physics.neutronics.globalFlux.globalFluxInterface import (
GlobalFluxInterfaceUsingExecuters,
)
from armi.settings import settingsValidation
from armi.settings.fwSettings.globalSettings import (
CONF_TIGHT_COUPLING,
CONF_TIGHT_COUPLING_MAX_ITERS,
Expand Down Expand Up @@ -1256,16 +1256,6 @@ def snapshotRequest(self, cycle, node, iteration=None):
pathTools.copyOrWarn(
"Loading definition for snapshot", self.cs[CONF_LOADING_FILE], newFolder
)
pathTools.copyOrWarn(
"Flow history for snapshot",
self.cs.caseTitle + ".flow_history.txt",
newFolder,
)
pathTools.copyOrWarn(
"Pressure history for snapshot",
self.cs.caseTitle + ".pressure_history.txt",
newFolder,
)

@staticmethod
def setStateToDefault(cs):
Expand Down
Loading

0 comments on commit c5e52bb

Please sign in to comment.