Update of the edg_REP1300_FULL.comm file compared to the new catalog of the integrati...

diff --git a/ReacteurNumerique/edg_REP1300_FULL.comm b/ReacteurNumerique/edg_REP1300_FULL.comm
index 55be850385daf5101ad8b95b33db4d60706b6155..09c0bf26e176eb3c9ea54c5e0d30e0ffd574fec6 100644 (file)
--- a/ReacteurNumerique/edg_REP1300_FULL.comm
+++ b/ReacteurNumerique/edg_REP1300_FULL.comm
@@ -1,9 +1,7 @@
 
-REF=Assembly(assembly_name='REF',
-             assembly_type='REF',);
+REF=Assembly(assembly_type='REF',);
 
-U1=Assembly(assembly_name='U1',
-            assembly_type='UOX',
+U1=Assembly(assembly_type='UOX',
             assembly_width=0.21504,
             fuel_density=0.95,
             radial_description=_F(clad_outer_radius=0.00475,
@@ -17,8 +15,7 @@ U1=Assembly(assembly_name='U1',
                      non_mixing=_F(positions=(0.026,4.2412,),
                                    size=0.033,),),);
 
-UGD=Assembly(assembly_name='UGD',
-             assembly_type='UOX',
+UGD=Assembly(assembly_type='UOX',
              assembly_width=0.21504,
              fuel_density=0.95,
              radial_description=_F(clad_outer_radius=0.00475,
@@ -32,38 +29,33 @@ UGD=Assembly(assembly_name='UGD',
                       non_mixing=_F(positions=(0.026,),
                                     size=0.033,),),);
 
-RB=RodBank(rodbank_name='RB',
-           rod_type='heterogeneous',
+RB=RodBank(rod_type='heterogeneous',
            bottom_composition='AIC',
            splitting_heigh=1.4224,
            upper_composition='B4C',
            step_height=0.016,
            nsteps=260,);
 
-N1=RodBank(rodbank_name='N1',
-           rod_type='heterogeneous',
+N1=RodBank(rod_type='heterogeneous',
            bottom_composition='AIC',
            splitting_heigh=1.4224,
            upper_composition='B4C',
            step_height=0.016,
            nsteps=260,);
 
-N2=RodBank(rodbank_name='N2',
-           rod_type='heterogeneous',
+N2=RodBank(rod_type='heterogeneous',
            bottom_composition='AIC',
            splitting_heigh=1.4224,
            upper_composition='B4C',
            step_height=0.016,
            nsteps=260,);
 
-G1=RodBank(rodbank_name='G1',
-           rod_type='homogeneous',
+G1=RodBank(rod_type='homogeneous',
            rod_composition='Grey',
            step_height=0.016,
            nsteps=260,);
 
-G2=RodBank(rodbank_name='G2',
-           rod_type='homogeneous',
+G2=RodBank(rod_type='homogeneous',
            rod_composition='Grey',
            step_height=0.016,
            nsteps=260,);
@@ -76,37 +68,26 @@ techno_data=Techno_data(assembly_list=(REF,U1,UGD,),
                                               ('RS','15','14','13','12','11',
                                                       '10','09','08','07','06','05','04','03','02','01','RN',),
                                               assembly_map=
-                                              (['REF','REF','REF','REF',
-                                                             'REF','REF','REF','REF','REF','REF','REF','REF','REF',
-                                                             'REF','REF','REF','REF'],['REF','REF','REF','REF','REF',
-                                                             'U1','U1','U1','U1','U1','U1','U1','REF','REF','REF',
-                                                             'REF','REF'],['REF','REF','REF','UGD','U1','UGD','UGD',
-                                                             'U1','U1','U1','UGD','UGD','U1','UGD','REF','REF','REF'],
-                                                             ['REF','REF','UGD','U1','U1','U1','U1','UGD','U1','UGD',
-                                                             'U1','U1','U1','U1','UGD','REF','REF'],['REF','REF','U1',
-                                                             'U1','U1','UGD','U1','UGD','U1','UGD','U1','UGD','U1',
-                                                             'U1','U1','REF','REF'],['REF','U1','UGD','U1','UGD','U1',
-                                                             'U1','UGD','U1','UGD','U1','U1','UGD','U1','UGD','U1',
-                                                             'REF'],['REF','U1','UGD','U1','U1','U1','UGD','UGD','U1',
-                                                             'UGD','UGD','U1','U1','U1','UGD','U1','REF'],['REF','U1',
-                                                             'U1','UGD','UGD','UGD','UGD','U1','UGD','U1','UGD','UGD',
-                                                             'UGD','UGD','U1','U1','REF'],['REF','U1','U1','U1','U1',
-                                                             'U1','U1','UGD','UGD','UGD','U1','U1','U1','U1','U1','U1',
-                                                             'REF'],['REF','U1','U1','UGD','UGD','UGD','UGD','U1',
-                                                             'UGD','U1','UGD','UGD','UGD','UGD','U1','U1','REF'],
-                                                             ['REF','U1','UGD','U1','U1','U1','UGD','UGD','U1','UGD',
-                                                             'UGD','U1','U1','U1','UGD','U1','REF'],['REF','U1','UGD',
-                                                             'U1','UGD','U1','U1','UGD','U1','UGD','U1','U1','UGD',
-                                                             'U1','UGD','U1','REF'],['REF','REF','U1','U1','U1','UGD',
-                                                             'U1','UGD','U1','UGD','U1','UGD','U1','U1','U1','REF',
-                                                             'REF'],['REF','REF','UGD','U1','U1','U1','U1','UGD','U1',
-                                                             'UGD','U1','U1','U1','U1','UGD','REF','REF'],['REF','REF',
-                                                             'REF','UGD','U1','UGD','UGD','U1','U1','U1','UGD','UGD',
-                                                             'U1','UGD','REF','REF','REF'],['REF','REF','REF','REF',
-                                                             'REF','U1','U1','U1','U1','U1','U1','U1','REF','REF',
-                                                             'REF','REF','REF'],['REF','REF','REF','REF','REF','REF',
-                                                             'REF','REF','REF','REF','REF','REF','REF','REF','REF',
-                                                             'REF','REF'],),
+                                              ([REF,REF,REF,REF,REF,REF,
+                                                             REF,REF,REF,REF,REF,REF,REF,REF,REF,REF,REF,],[REF,REF,
+                                                             REF,REF,REF,U1,U1,U1,U1,U1,U1,U1,REF,REF,REF,REF,REF,],
+                                                             [REF,REF,REF,UGD,U1,UGD,UGD,U1,U1,U1,UGD,UGD,U1,UGD,REF,
+                                                             REF,REF,],[REF,REF,UGD,U1,U1,U1,U1,UGD,U1,UGD,U1,U1,U1,U1,
+                                                             UGD,REF,REF,],[REF,REF,U1,U1,U1,UGD,U1,UGD,U1,UGD,U1,UGD,
+                                                             U1,U1,U1,REF,REF,],[REF,U1,UGD,U1,UGD,U1,U1,UGD,U1,UGD,U1,
+                                                             U1,UGD,U1,UGD,U1,REF,],[REF,U1,UGD,U1,U1,U1,UGD,UGD,U1,
+                                                             UGD,UGD,U1,U1,U1,UGD,U1,REF,],[REF,U1,U1,UGD,UGD,UGD,UGD,
+                                                             U1,UGD,U1,UGD,UGD,UGD,UGD,U1,U1,REF,],[REF,U1,U1,U1,U1,U1,
+                                                             U1,UGD,UGD,UGD,U1,U1,U1,U1,U1,U1,REF,],[REF,U1,U1,UGD,UGD,
+                                                             UGD,UGD,U1,UGD,U1,UGD,UGD,UGD,UGD,U1,U1,REF,],[REF,U1,UGD,
+                                                             U1,U1,U1,UGD,UGD,U1,UGD,UGD,U1,U1,U1,UGD,U1,REF,],[REF,U1,
+                                                             UGD,U1,UGD,U1,U1,UGD,U1,UGD,U1,U1,UGD,U1,UGD,U1,REF,],
+                                                             [REF,REF,U1,U1,U1,UGD,U1,UGD,U1,UGD,U1,UGD,U1,U1,U1,REF,
+                                                             REF,],[REF,REF,UGD,U1,U1,U1,U1,UGD,U1,UGD,U1,U1,U1,U1,UGD,
+                                                             REF,REF,],[REF,REF,REF,UGD,U1,UGD,UGD,U1,U1,U1,UGD,UGD,U1,
+                                                             UGD,REF,REF,REF,],[REF,REF,REF,REF,REF,U1,U1,U1,U1,U1,U1,
+                                                             U1,REF,REF,REF,REF,REF,],[REF,REF,REF,REF,REF,REF,REF,REF,
+                                                             REF,REF,REF,REF,REF,REF,REF,REF,REF,],),
                                               rod_map=
                                               (['#','#','#','#','#','#','#',
                                                         '#','#','#','#','#','#','#','#','#','#'],['#','#','#','#','#','.',
@@ -129,38 +110,31 @@ techno_data=Techno_data(assembly_list=(REF,U1,UGD,),
                                                         '#','#'],['#','#','#','#','#','#','#','#','#','#','#','#','#','#',
                                                         '#','#','#'],),
                                               BU_map=
-                                              (['0.','0.','0.','0.','0.','0.',
-                                                       '0.','0.','0.','0.','0.','0.','0.','0.','0.','0.','0.'],['0.','0.',
-                                                       '0.','0.','0.','0.','0.','0.','0.','0.','0.','0.','0.','0.','0.','0.',
-                                                       '0.'],['0.','0.','0.','40.','0.','0.','40.','40.','20.','40.','40.',
-                                                       '0.','0.','40.','0.','0.','0.'],['0.','0.','40.','0.','40.','20.',
-                                                       '40.','0.','40.','0.','40.','20.','40.','0.','40.','0.','0.'],['0.',
-                                                       '0.','0.','40.','20.','20.','20.','40.','20.','40.','20.','20.','20.',
-                                                       '40.','0.','0.','0.'],['0.','0.','0.','20.','20.','20.','40.','0.',
-                                                       '40.','0.','40.','20.','20.','20.','0.','0.','0.'],['0.','0.','40.',
-                                                       '40.','20.','40.','20.','40.','20.','40.','20.','40.','20.','40.',
-                                                       '40.','0.','0.'],['0.','0.','40.','0.','40.','0.','40.','20.','20.',
-                                                       '20.','40.','0.','40.','0.','40.','0.','0.'],['0.','0.','20.','40.',
-                                                       '20.','40.','20.','20.','60.','20.','20.','40.','20.','40.','20.',
-                                                       '0.','0.'],['0.','0.','40.','0.','40.','0.','40.','20.','20.','20.',
-                                                       '40.','0.','40.','0.','40.','0.','0.'],['0.','0.','40.','40.','20.',
-                                                       '40.','20.','40.','20.','40.','20.','40.','20.','40.','40.','0.',
-                                                       '0.'],['0.','0.','0.','20.','20.','20.','40.','0.','40.','0.','40.',
-                                                       '20.','20.','20.','0.','0.','0.'],['0.','0.','0.','40.','20.','20.',
-                                                       '20.','40.','20.','40.','20.','20.','20.','40.','0.','0.','0.'],['0.',
-                                                       '0.','40.','0.','40.','20.','40.','0.','40.','0.','40.','20.','40.',
-                                                       '0.','40.','0.','0.'],['0.','0.','0.','40.','0.','0.','40.','40.',
-                                                       '20.','40.','40.','0.','0.','40.','0.','0.','0.'],['0.','0.','0.',
-                                                       '0.','0.','0.','0.','0.','0.','0.','0.','0.','0.','0.','0.','0.',
-                                                       '0.'],['0.','0.','0.','0.','0.','0.','0.','0.','0.','0.','0.','0.',
-                                                       '0.','0.','0.','0.','0.'],),),
+                                              ([0.0,0.0,0.0,0.0,0.0,0.0,0.0,
+                                                       0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0],[0.0,0.0,0.0,0.0,0.0,0.0,0.0,
+                                                       0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0],[0.0,0.0,0.0,40.0,0.0,0.0,
+                                                       40.0,40.0,20.0,40.0,40.0,0.0,0.0,40.0,0.0,0.0,0.0],[0.0,0.0,40.0,0.0,
+                                                       40.0,20.0,40.0,0.0,40.0,0.0,40.0,20.0,40.0,0.0,40.0,0.0,0.0],[0.0,0.0,
+                                                       0.0,40.0,20.0,20.0,20.0,40.0,20.0,40.0,20.0,20.0,20.0,40.0,0.0,0.0,
+                                                       0.0],[0.0,0.0,0.0,20.0,20.0,20.0,40.0,0.0,40.0,0.0,40.0,20.0,20.0,
+                                                       20.0,0.0,0.0,0.0],[0.0,0.0,40.0,40.0,20.0,40.0,20.0,40.0,20.0,40.0,
+                                                       20.0,40.0,20.0,40.0,40.0,0.0,0.0],[0.0,0.0,40.0,0.0,40.0,0.0,40.0,
+                                                       20.0,20.0,20.0,40.0,0.0,40.0,0.0,40.0,0.0,0.0],[0.0,0.0,20.0,40.0,
+                                                       20.0,40.0,20.0,20.0,60.0,20.0,20.0,40.0,20.0,40.0,20.0,0.0,0.0],[0.0,
+                                                       0.0,40.0,0.0,40.0,0.0,40.0,20.0,20.0,20.0,40.0,0.0,40.0,0.0,40.0,0.0,
+                                                       0.0],[0.0,0.0,40.0,40.0,20.0,40.0,20.0,40.0,20.0,40.0,20.0,40.0,20.0,
+                                                       40.0,40.0,0.0,0.0],[0.0,0.0,0.0,20.0,20.0,20.0,40.0,0.0,40.0,0.0,40.0,
+                                                       20.0,20.0,20.0,0.0,0.0,0.0],[0.0,0.0,0.0,40.0,20.0,20.0,20.0,40.0,
+                                                       20.0,40.0,20.0,20.0,20.0,40.0,0.0,0.0,0.0],[0.0,0.0,40.0,0.0,40.0,
+                                                       20.0,40.0,0.0,40.0,0.0,40.0,20.0,40.0,0.0,40.0,0.0,0.0],[0.0,0.0,0.0,
+                                                       40.0,0.0,0.0,40.0,40.0,20.0,40.0,40.0,0.0,0.0,40.0,0.0,0.0,0.0],[0.0,
+                                                       0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0],[0.0,
+                                                       0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0],),),
                         axial_description=_F(lower_refl_size=0.21,
                                              upper_refl_size=0.21,),
                         nominal_power=4000000000.0,
                         Fuel_power_fraction=0.974,
                         by_pass=0.07,
-                        inlet_pressure=160.2,
-                        outlet_pressure=157.2,
                         core_volumic_flowrate=90940.0,);
 
 neutro_model=Model_data(physics='Neutronics',
@@ -189,6 +163,8 @@ scenario_data=Scenario_data(initial_power=0.1,
                             initial_power_unit='% Nominal power',
                             initial_core_inlet_temperature=290.0,
                             initial_boron_concentration=1300.0,
+                            initial_inlet_pressure=160.2,
+                            initial_outlet_pressure=157.2,
                             initial_rod_positions=(('Rodbank@RB',201),('Rodbank@N1',96),('Rodbank@N2',260),('Rodbank@G1',260),('Rodbank@G2',260),('Rodcluster@H08',260)),
                             scenario_type='RIA',
                             ejected_rod='H02',
@@ -198,4 +174,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:6732ab23879f88de0b8f989f9a2dbc9d  -:FIN CHECKSUM
+#CHECKSUM:c6a0aa70858da55b318f3863e3458adc:FIN CHECKSUM
\ No newline at end of file