From 41e51e61a92b2ce75e0526e34b82cafc494383f3 Mon Sep 17 00:00:00 2001 From: Eric Fayolle Date: Mon, 12 Sep 2022 15:19:40 +0200 Subject: [PATCH] =?utf8?q?Ajout=20de=20cata=5FRN.py=20plus=20g=C3=A9n?= =?utf8?q?=C3=A9raliste=20que=20cata=5FRN=5FEDG.py?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- ReacteurNumerique/GNUmakefile | 4 +++- .../{cata_RN_EDG_yp.py => cata_RN.py} | 14 -------------- ...st_driver_1.comm => cata_RN_test_driver_1.comm} | 3 +-- ...st_driver_2.comm => cata_RN_test_driver_2.comm} | 4 +--- ReacteurNumerique/edg_REP1300_FULL.comm | 1 - 5 files changed, 5 insertions(+), 21 deletions(-) rename ReacteurNumerique/{cata_RN_EDG_yp.py => cata_RN.py} (98%) rename ReacteurNumerique/{cata_RN_EDG_yp_test_driver_1.comm => cata_RN_test_driver_1.comm} (87%) rename ReacteurNumerique/{cata_RN_EDG_yp_test_driver_2.comm => cata_RN_test_driver_2.comm} (97%) diff --git a/ReacteurNumerique/GNUmakefile b/ReacteurNumerique/GNUmakefile index c5629c3b..eb527cc5 100644 --- a/ReacteurNumerique/GNUmakefile +++ b/ReacteurNumerique/GNUmakefile @@ -48,7 +48,9 @@ $(eval $(call cata_dependencies,.xsd)) # $(subst .py,.xsd,cata_dependencies) cata_files= \ -cata_RN_EDG.py +cata_RN.py \ +cata_RN_EDG.py \ +#cata_RN_pn.py cata_basename=$(cata_files:%.py=%) xsd_files = $(cata_files:%.py=%.xsd) diff --git a/ReacteurNumerique/cata_RN_EDG_yp.py b/ReacteurNumerique/cata_RN.py similarity index 98% rename from ReacteurNumerique/cata_RN_EDG_yp.py rename to ReacteurNumerique/cata_RN.py index 91b83fbf..a0958f07 100644 --- a/ReacteurNumerique/cata_RN_EDG_yp.py +++ b/ReacteurNumerique/cata_RN.py @@ -710,13 +710,6 @@ Model_data = OPER( statut="f", typ="I", val_min=1), - nprocs=SIMP( - fr="Nombre de processus alloués au solveur", - ang="Number of process allocated to the solvers", - statut="o", - typ="I", - defaut = 1, - homo='constant'), core_elements_vs_dklib=SIMP( fr=("Association des éléments du cœur aux bibliothèques neutroniques " "sous la forme (assemblage combustible, DKLib)"), @@ -796,13 +789,6 @@ Model_data = OPER( statut="f", typ="I", val_min=1))), - nprocs=SIMP( - fr="Nombre de processus alloués au solveur", - ang="Number of process allocated to the solvers", - statut="o", - typ="I", - defaut = 1, - homo='constant'), radial_meshing=FACT( fr="Description du maillage radial thermohydraulique à l'échelle du composant", ang="Thermalhydraulic radial meshing description at the component scale", diff --git a/ReacteurNumerique/cata_RN_EDG_yp_test_driver_1.comm b/ReacteurNumerique/cata_RN_test_driver_1.comm similarity index 87% rename from ReacteurNumerique/cata_RN_EDG_yp_test_driver_1.comm rename to ReacteurNumerique/cata_RN_test_driver_1.comm index cf864b5d..aa00599f 100644 --- a/ReacteurNumerique/cata_RN_EDG_yp_test_driver_1.comm +++ b/ReacteurNumerique/cata_RN_test_driver_1.comm @@ -3,7 +3,6 @@ thermo_model=Model_data(physics='Thermalhydraulics', scale='component', code='THYC', thyc_options=_F(n_threads=23,), - nprocs=2, radial_meshing=_F(fluid='subdivision', fluid_subdivision=1, pellet=8, @@ -12,4 +11,4 @@ thermo_model=Model_data(physics='Thermalhydraulics', fuel=40, upper_refl=1,),); #VERSION_CATALOGUE:V_0:FIN VERSION_CATALOGUE -#CHECKSUM:63c60c86f79fba9512ae3bc2f18c7249:FIN CHECKSUM \ No newline at end of file +#CHECKSUM:ea75a6791472ab21137d2c91d59f3362:FIN CHECKSUM \ No newline at end of file diff --git a/ReacteurNumerique/cata_RN_EDG_yp_test_driver_2.comm b/ReacteurNumerique/cata_RN_test_driver_2.comm similarity index 97% rename from ReacteurNumerique/cata_RN_EDG_yp_test_driver_2.comm rename to ReacteurNumerique/cata_RN_test_driver_2.comm index fc0c4567..aab6ebd2 100644 --- a/ReacteurNumerique/cata_RN_EDG_yp_test_driver_2.comm +++ b/ReacteurNumerique/cata_RN_test_driver_2.comm @@ -72,7 +72,6 @@ neutro_model=Model_data(physics='Neutronics', scale='component', code='COCAGNE', cocagne_options=_F(n_threads=6, - nprocs=1, core_elements_vs_dklib=((REF,REP1300),(U1,AF3R_400)),), radial_meshing=_F(flux_solver='subdivision', flux_subdivision=2, @@ -86,7 +85,6 @@ thermo_model=Model_data(physics='Thermalhydraulics', scale='component', code='THYC', thyc_options=_F(n_threads=6,), - nprocs=2, radial_meshing=_F(fluid='subdivision', fluid_subdivision=1, pellet=8, @@ -108,4 +106,4 @@ scenario_data=Scenario_data(initial_power=100.0, SCRAM='NO', post_processing=(('Fuel temperature','Thermalhydraulics','MAX'),('Neutronic power','Neutronics','SUM'),('Fuel temperature','Thermalhydraulics','MED'),('Rodbank@RB','Neutronics','VALUE'),('Rodcluster@B04','Neutronics','VALUE')),); #VERSION_CATALOGUE:V_0:FIN VERSION_CATALOGUE -#CHECKSUM:cd6b2c347ac3ee843b94b8ee510ce4b2:FIN CHECKSUM \ No newline at end of file +#CHECKSUM:2526bd3f58b4063ffd45db20987fad7d:FIN CHECKSUM \ No newline at end of file diff --git a/ReacteurNumerique/edg_REP1300_FULL.comm b/ReacteurNumerique/edg_REP1300_FULL.comm index 97d1b66a..a98fb086 100644 --- a/ReacteurNumerique/edg_REP1300_FULL.comm +++ b/ReacteurNumerique/edg_REP1300_FULL.comm @@ -211,4 +211,3 @@ scenario_data=Scenario_data(initial_power=0.1, SCRAM_power=1130.0, complete_SCRAM_time=1.0, post_processing=(('Fuel temperature@Thermalhydraulics','MAX'),('Neutronic power@Neutronics','SUM'),('Fuel temperature@Thermalhydraulics','MED'),('Neutronic power@Neutronics','MED')),); - -- 2.39.2