From 92fa308fae46ee3d00a77e2fa936783df622c3cb Mon Sep 17 00:00:00 2001 From: "pascale.noyret" Date: Mon, 30 Nov 2020 15:50:52 +0100 Subject: [PATCH] echange Eric --- Vimmp/cata_CSAndCPS_v5.py | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/Vimmp/cata_CSAndCPS_v5.py b/Vimmp/cata_CSAndCPS_v5.py index 36ce45a9..0396f897 100644 --- a/Vimmp/cata_CSAndCPS_v5.py +++ b/Vimmp/cata_CSAndCPS_v5.py @@ -18,6 +18,7 @@ class meshGroup(spatialRegion):pass class meshIdentifier(spatialRegion):pass class systemGeometry(UserASSD):pass class simulatedTime(UserASSD):pass +class constitutiveRelation(UserASSD):pass class scalar(UserASSD):pass @@ -449,17 +450,24 @@ def bloc_CPS(): def bloc_FluideMacro(): return BLOC(condition = 'SystemType == "Continuum system"', FluidComplexe = SIMP(typ=bool, statut='o', defaut = False,), - FlowNature = SIMP(typ='TXM', statut='o', into =['Laminar', 'Turbulent'], position='global'), bloc_FlowNature_Turbulent = BLOC(condition = ' FlowNature == "Turbulent"', TurbulenceForFlowDynamics = FactTurbulence('o'), ), #------ fin bloc_FlowNature_Turbulent + ConstitutiveRelation = FACT(statut ='o',max='**', + Name = SIMP(statut='o', typ=(constitutiveRelation,'createObject'),), + Nature = SIMP( statut='o', into =['EOS', 'FFR'], typ ='TXM'), + bloc_NonThermalEffectsAndNoEffect = BLOC(condition = ' ThermalEffects == "Non thermal" or ThermalEffects == "Passive on flow dynamics"', + DensityEquationOfState = SIMP(typ='TXM', statut='o', into =['Constant density'], defaut = 'Constant density'), + ), # fin bloc_NonThermalEffectsAndNoEffect + + ), # ---------------------- Effets thermiques Thermal = FACT (statut ='o', ThermalEffects = SIMP(typ='TXM', statut='o', into =['Non thermal', - 'Passive on flow dynamics', 'Active on flow dynamics'], defaut='Non thermal'), + 'Passive on flow dynamics', 'Active on flow dynamics'], defaut='Non thermal', position='global'), bloc_NonThermalEffects = BLOC(condition = ' ThermalEffects == "Non thermal"', InitialTemperature = SIMP(typ='R', statut='o', val_min=-273.15 ), @@ -473,12 +481,11 @@ def bloc_FluideMacro(): ), # fin bloc_ThermalEffects_Passive bloc_ThermalEffects_Active = BLOC(condition = ' ThermalEffects == "Active on flow dynamics"', + ActiveOnFlowEffect = FACT(statut = 'o', + onConstitutiveRelation = SIMP(statut='o', typ=constitutiveRelation, max='**',), + ), ), # fin bloc_ThermalEffects_Active - bloc_NonThermalEffectsAndNoEffect = BLOC(condition = ' ThermalEffects == "Non thermal" or ThermalEffects == "Passive on flow dynamics"', - DensityEquationOfState = SIMP(typ='TXM', statut='o', into =['Constant density'], defaut = 'Constant density'), - ), # fin bloc_NonThermalEffectsAndNoEffect - ),# fin Fact Thermal -- 2.39.2