From 686f3ec9a5d81beb2f61f20e33a45d565bc00e5f Mon Sep 17 00:00:00 2001 From: "pascale.noyret" Date: Tue, 1 Dec 2020 14:56:03 +0100 Subject: [PATCH] mineur --- Vimmp/cata_CSAndCPS_v6.py | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/Vimmp/cata_CSAndCPS_v6.py b/Vimmp/cata_CSAndCPS_v6.py index d9cf9a5d..a93069df 100644 --- a/Vimmp/cata_CSAndCPS_v6.py +++ b/Vimmp/cata_CSAndCPS_v6.py @@ -498,7 +498,7 @@ def bloc_FluideMacro(): InitialDensity = SIMP(typ='R', statut='o',), ), # fin bloc_DensityNonThermal bloc_DensityAndThermalActive = BLOC(condition = ' ThermalEffects == "Active on flow dynamics"', - OriginOfThermalEffects = SIMP( statut='o', into =['Given', 'Constant density'], typ ='TXM', defaut ='Given'), + OriginOfThermalEffects = SIMP( statut='o', into =['Given', 'Constant density'], typ ='TXM', defaut ='Constant density'), BlocGiven =creeBlocPourLesFichiers (' OriginOfThermalEffects == "Given"', None, ('Med', 'cgns' ), FieldName=1), BlocConstant = BLOC(condition = 'OriginOfThermalEffects == "Constant density"', InitialDensity = SIMP(typ='R', statut='o',), @@ -512,8 +512,11 @@ def bloc_FluideMacro(): bloc_scalar_FluidTurbulentOrLaminar = BLOC(condition = "(ComplexFluid == False and FlowNature == 'Turbulent') or (ComplexFluid == False and FlowNature == 'Laminar')", Scalars = FACT(statut = 'o', bloc_FlowNature_Turbulent_For_Scalars = BLOC(condition = ' FlowNature == "Turbulent"', - ScalarsTurbulenceModelling = FactTurbulence('o', ajout='NoOne'), - ), + asTurbulenceForFlowDynamics = SIMP (statut='o', typ=bool, defaut=True), + BlocAsTFFD = BLOC(condition = "asTurbulenceForFlowDynamics == False", + ScalarsTurbulenceModelling = FactTurbulence('o',), + ), + ), bloc_ThermalEffects_On = BLOC(condition = ' ThermalEffects == "Active on flow dynamics" or ThermalEffects == "Passive on flow dynamics"', TemperatureScalar =FACT(statut ='o', Name = SIMP(typ=(scalar,'createObject'), statut='o', defaut ='Temperature', homo='constant'), @@ -533,15 +536,7 @@ def bloc_FluideMacro(): blocSourceTerm = FactTermeSource('SourceTerm==True'), ),# Scalar ),# AdditionalScalars - #UtiliseLesScalaires=SIMP(typ=scalar, statut='o',) ), # fin FluidTurbulentandNonComplexe - #bloc_scalar_FluidLaminaireandNonComplexe = BLOC (condition = "ComplexFluid == False and FlowNature == 'Laminar'", - # AdditionalScalars = FACT (statut = 'o', - # Scalar = FACT ( statut = 'f', max ='**', - # Name = SIMP(typ='TXM', statut='o',), - # ),# Scalar - # ),# AdditionalScalars - #), # fin FluidLaminaireandNonComplexe # il faut une validation de coherence entre l existence de tous les turbulencesModelling )# fin bloc_FluideMacro -- 2.39.2