From: Yohann Pipeau <yohann.pipeau@edf.fr>
Date: Sat, 23 Apr 2022 06:40:58 +0000 (+0200)
Subject: Add Model_data.b_neutro_compo.cocagne_bloc.cocagne_options attribute to the data... 
X-Git-Tag: merge_uncertainty_odysee_1210~92^2~1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=02dc62388666b89acbce29739cc0e5aecac45810;p=tools%2Feficas.git

Add Model_data.b_neutro_compo.cocagne_bloc.cocagne_options attribute to the data model
---

diff --git a/ReacteurNumerique/cata_RN_EDG.py b/ReacteurNumerique/cata_RN_EDG.py
index 120b9812..b4f93593 100644
--- a/ReacteurNumerique/cata_RN_EDG.py
+++ b/ReacteurNumerique/cata_RN_EDG.py
@@ -596,6 +596,25 @@ Model_data = OPER(
             statut="o",
             typ="TXM",
             into=("COCAGNE", "APOLLO3")),
+        cocagne_bloc=BLOC(
+            condition="code == 'COCAGNE'",
+            cocagne_options=FACT(
+                fr="Options de modélisations spécifiques au code COCAGNE.",
+                ang="COCAGNE specific modeling options",
+                statut="o",
+                core_elements_vs_dklib=SIMP(
+                    fr=("Association des éléments du cœur aux bibliothèques neutroniques "
+                        "sous la forme (assemblage combustible, DKLib)"),
+                    ang=("Association between the core elements and the neutronic libraries "
+                        "in the form (fuel assembly, DKLib)"),
+                    statut="o",
+                    typ=Tuple(2),
+                    # TODO: Check if the attribute assembly_type of the
+                    #       Assembly object is 'REF' then the type of the
+                    #       DKLibFile must be ReflectorDKLibFile and, if not,
+                    #       the type of the DKLibFile must be AssemblyDKLibFile
+                    validators=VerifTypeTuple((_Assembly, (_AssemblyDKLibFile, _ReflectorDKLibFile))),
+                    max="**"))),
         # TODO: Implement the *4x4* mesh
         radial_meshing=FACT(
             fr="Maillage radial du cœur",
diff --git a/ReacteurNumerique/edg_REP1300_FULL.comm b/ReacteurNumerique/edg_REP1300_FULL.comm
index c47a2f89..89ed0bcc 100644
--- a/ReacteurNumerique/edg_REP1300_FULL.comm
+++ b/ReacteurNumerique/edg_REP1300_FULL.comm
@@ -176,7 +176,8 @@ REFL_PWR1300=ReflectorDKLibFile(filename='cocagne_data/dklib/Reflecteur_REP1300.
 
 neutro_model=Model_data(physics='Neutronics',
                         scale='component',
-                        code='APOLLO3',
+                        code='COCAGNE',
+                        cocagne_options=_F(core_elements_vs_dklib=((REF,REFL_PWR1300),(U1,AF3R_400),(UGD,AF3R_400_12G_GD80U071)),),
                         radial_meshing=_F(flux_solver='subdivision',
                                           flux_subdivision=2,
                                           feedback_solver='subdivision',
@@ -211,4 +212,4 @@ scenario_data=Scenario_data(initial_power=0.1,
                             complete_SCRAM_time=1.0,
                             post_processing=(('Fuel temperature@Thermalhydraulics','MAX'),('Neutronic power@Neutronics','SUM'),('Fuel temperature@Thermalhydraulics','MED'),('Neutronic power@Neutronics','MED')),);
 #VERSION_CATALOGUE:V_0:FIN VERSION_CATALOGUE
-#CHECKSUM:4a4101bf9abcdf69683620a7bfb47939:FIN CHECKSUM
\ No newline at end of file
+#CHECKSUM:c06d10ac9fa4f4f20cad8266b6f6455d:FIN CHECKSUM
\ No newline at end of file