Revert "Rotation (#19)" (#22)

This reverts commit f0c7b61.
terrapower · Sep 29, 2022 · 9836947 · 9836947
1 parent f0c7b61
commit 9836947
Show file tree

Hide file tree

Showing 13 changed files with 993 additions and 932 deletions.
diff --git a/armi/physics/fuelCycle/__init__.py b/armi/physics/fuelCycle/__init__.py
@@ -40,7 +40,7 @@
 from armi.operators import RunTypes
 
 
-from . import fuelHandlerInterface
+from . import fuelHandlers
 from . import settings
 
 ORDER = interfaces.STACK_ORDER.FUEL_MANAGEMENT
@@ -70,9 +70,7 @@ def exposeInterfaces(cs):
             enabled = cs["runType"] != operators.RunTypes.SNAPSHOTS
             return [
                 interfaces.InterfaceInfo(
-                    ORDER,
-                    fuelHandlerInterface.FuelHandlerInterface,
-                    {"enabled": enabled},
+                    ORDER, fuelHandlers.FuelHandlerInterface, {"enabled": enabled}
                 )
             ]
 

diff --git a/armi/physics/fuelCycle/fuelHandlerInterface.py b/armi/physics/fuelCycle/fuelHandlerInterface.py
@@ -154,45 +154,30 @@ def makeShuffleReport(self):
                 for (
                     fromLoc,
                     toLoc,
-                    _,
-                    _,
                     chargeEnrich,
                     assemblyType,
                     movingAssemName,
                 ) in movesThisCycle:
-                    if not fromLoc == toLoc:
-                        enrichLine = " ".join(
-                            ["{0:.8f}".format(enrich) for enrich in chargeEnrich]
-                        )
+                    enrichLine = " ".join(
+                        ["{0:.8f}".format(enrich) for enrich in chargeEnrich]
+                    )
+                    if fromLoc in ["ExCore", "SFP"]:
+                        # this is a re-entering assembly. Give extra info so repeat shuffles can handle it
                         out.write(
-                            "{0} moved from {1} to {2} with assembly type {3} with enrich list: {4}\n"
+                            "{0} moved to {1} with assembly type {2} ANAME={4} with enrich list: {3}\n"
                             "".format(
-                                movingAssemName,
                                 fromLoc,
                                 toLoc,
                                 assemblyType,
                                 enrichLine,
+                                movingAssemName,
                             )
                         )
-                for (
-                    _,
-                    toLoc,
-                    fromRot,
-                    toRot,
-                    _,
-                    _,
-                    movingAssemName,
-                ) in movesThisCycle:
-                    if not fromRot == toRot:
-                        # If assembly is entering the core, provide extra information
+                    else:
+                        # skip extra info. regular expression in readMoves will handle it just fine.
                         out.write(
-                            "{0} at {1} was rotated from {2} to {3}\n"
-                            "".format(
-                                movingAssemName,
-                                toLoc,
-                                fromRot,
-                                toRot,
-                            )
+                            "{0} moved to {1} with assembly type {2} with enrich list: {3}\n"
+                            "".format(fromLoc, toLoc, assemblyType, enrichLine)
                         )
             out.write("\n")
         out.close()