mineur

diff --git a/Vimmp/cata_CSAndCPS_v6.py b/Vimmp/cata_CSAndCPS_v6.py
index d9cf9a5d9193e23a586d80b9aeee56143e5ae5bc..a93069df89ce139bff4e126aa45fb8224b4e7440 100644 (file)
--- 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