Limit the possible absorbing material types in rod bank compositions

diff --git a/ReacteurNumerique/cata_RN_EDG.py b/ReacteurNumerique/cata_RN_EDG.py
index a53994f556d6742c21670ceb92c6efd543852ea7..41b37da25859f7a715fcb619854de019c09b1b6e 100644 (file)
--- a/ReacteurNumerique/cata_RN_EDG.py
+++ b/ReacteurNumerique/cata_RN_EDG.py
@@ -26,6 +26,13 @@ VERSION_CATALOGUE = "V_0"
 NMIN_CORE_FUEL_ELTS = 1
 NMAX_CORE_FUEL_ELTS = 18
 
+# Available absorbing material type in the rod clusters
+ROD_COMPOSITIONS = (
+    "Black",   # Full AIC rods
+    "Grey",    # Mix between AIC and steel rods
+    "B4C",     # Full B4C rods
+)
+
 class Tuple(_Tuple):
     """Organize the data into a fixed size tuple.
 
@@ -265,19 +272,29 @@ RodBank = OPER(
         fr="Description d'un groupe de grappes absorbantes homogènes axialement",
         ang="Axially homogeneous rod bank description",
         rod_composition=SIMP(
-            fr="Type de matériau absorbant des grappes absorbantes",
-            ang="Absorbing material type of the rod clusters",
+            fr=("Type de matériau absorbant des grappes absorbantes (Types "
+                "autorisés : {})").format(
+                    ", ".join(ROD_COMPOSITIONS)),
+            ang=("Absorbing material type of the rod clusters (Authorized "
+                 "types: {})").format(
+                     ", ".join(ROD_COMPOSITIONS)),
             statut="o",
-            typ="TXM")),
+            typ="TXM",
+            into=ROD_COMPOSITIONS)),
     description_HET=BLOC(
         condition="rod_type == 'heterogeneous'",
         fr="Description d'un groupe de grappes absorbantes hétérogène axialement",
         ang="Axially heterogeneous rod bank description",
         bottom_composition=SIMP(
-            fr="Type de matériau absorbant dans la partie basse des grappes absorantes",
-            ang="Absorbing material type in the lower part of the rod clusters",
+            fr=("Type de matériau absorbant dans la partie basse des grappes "
+                "absorantes (Types autorisés : {})").format(
+                    ", ".join(ROD_COMPOSITIONS)),
+            ang=("Absorbing material type in the lower part of the rod "
+                 "clusters (Authorized types: {})").format(
+                     ", ".join(ROD_COMPOSITIONS)),
             statut="o",
-            typ="TXM"),
+            typ="TXM",
+            into=ROD_COMPOSITIONS),
         splitting_heigh=SIMP(
             fr=("Altitude de séparation entre la partie haute et la partie "
                 "basse des grappes absorbantes"),
@@ -287,10 +304,15 @@ RodBank = OPER(
             statut="o",
             typ="R"),
         upper_composition=SIMP(
-            fr="Type de matériau absorbant dans la partie haute des grappes absorantes",
-            ang="Absorbing material type in the upper part of the rod clusters",
+            fr=("Type de matériau absorbant dans la partie haute des grappes "
+                "absorantes (Types autorisés : {})").format(
+                    ", ".join(ROD_COMPOSITIONS)),
+            ang=("Absorbing material type in the upper part of the rod "
+                 "clusters (Authorized types: {})").format(
+                     ", ".join(ROD_COMPOSITIONS)),
             statut="o",
-            typ="TXM")),
+            typ="TXM",
+            into=ROD_COMPOSITIONS)),
     step_height=SIMP(
         fr="Hauteur d'un pas",
         ang="Step height",

diff --git a/ReacteurNumerique/edg_REP1300_FULL.comm b/ReacteurNumerique/edg_REP1300_FULL.comm
index 09c0bf26e176eb3c9ea54c5e0d30e0ffd574fec6..819d325a2082649decce42ff361f0c327c0b47db 100644 (file)
--- a/ReacteurNumerique/edg_REP1300_FULL.comm
+++ b/ReacteurNumerique/edg_REP1300_FULL.comm
@@ -30,21 +30,21 @@ UGD=Assembly(assembly_type='UOX',
                                     size=0.033,),),);
 
 RB=RodBank(rod_type='heterogeneous',
-           bottom_composition='AIC',
+           bottom_composition='Black',
            splitting_heigh=1.4224,
            upper_composition='B4C',
            step_height=0.016,
            nsteps=260,);
 
 N1=RodBank(rod_type='heterogeneous',
-           bottom_composition='AIC',
+           bottom_composition='Black',
            splitting_heigh=1.4224,
            upper_composition='B4C',
            step_height=0.016,
            nsteps=260,);
 
 N2=RodBank(rod_type='heterogeneous',
-           bottom_composition='AIC',
+           bottom_composition='Black',
            splitting_heigh=1.4224,
            upper_composition='B4C',
            step_height=0.016,