mineur

diff --git a/Vimmp/cata_CSAndCPS_v6.py b/Vimmp/cata_CSAndCPS_v6.py
index daef3375ebc2cdbe2df7968adb122d7c0ece745e..53a199dd41ff1941ce1da210b5bc8c1c3379f574 100644 (file)
--- a/Vimmp/cata_CSAndCPS_v6.py
+++ b/Vimmp/cata_CSAndCPS_v6.py
@@ -205,7 +205,7 @@ def FactTermeSource(condition):
 
 
 def FactTurbulence(statut, ajout=None):
-   listInto = ['Fully resolved', 'Spatial filtering (LES)', 'One-point moment', 'One-point PDF']
+   listInto = ['Fully resolved (DNS)', 'Spatial filtering (LES)', 'One-point moment', 'One-point PDF']
    if ajout != None : listInto.append(ajout)
    return FACT (statut=statut, 
           TurbulenceModellingType = SIMP(typ='TXM', statut='o', into =listInto, ),
@@ -228,7 +228,7 @@ def FactTurbulence(statut, ajout=None):
                 StochasticModel  = SIMP(typ='TXM', statut='o', into=['Langevin','Other'], defaut='Langevin'),
             )# fin lagrangian
             ), # fin bloc_one_point_pdf
-       bloc_no_model = BLOC(condition = "TurbulenceModellingType == 'Fully resolved'",
+       bloc_no_model = BLOC(condition = "TurbulenceModellingType == 'Fully resolved (DNS)'",
                 ChoiceOfApproach = SIMP(statut='o', typ='TXM', into=['Field-based DNS', 'N-Particle Method']),
                    bloc_Field = BLOC(condition = "ChoiceOfApproach == 'Field-based DNS'", 
                        NumericalMethod=SIMP(statut='o', typ='TXM', into=['FV', 'Spectral Method']),
@@ -484,8 +484,6 @@ def bloc_FluideMacro():
          bloc_NonNonThermalEffects   = BLOC(condition = 'not(ThermalEffects == "Non thermal")',
               OriginOfThermalFluxModel = SIMP( statut='o', into =['Given', 'Interaction', 'to be simulated'], typ ='TXM'),
               BlocGiven =creeBlocPourLesFichiers (' OriginOfThermalFluxModel == "Given"', None, ('Med', 'cgns' ), FieldName=1),
-              BlocSimulated =BLOC (condition = 'OriginOfThermalFluxModel == "to be simulated"',
-                AFaire = SIMP(typ='TXM', statut='o', defaut='C I'),
               ),
          ),
       ),
@@ -496,10 +494,10 @@ def bloc_FluideMacro():
            bloc_EOS=BLOC( condition = 'RelationType == "Equation Of State"',
                 TypeOfEquationOfState =  SIMP( statut='o', into =['variable density', 'compressible'], typ ='TXM'),
            ),
-           bloc_NonEOSAndSimple=BLOC( condition = 'RelationType == "Force Field Relation" and ComplexFluid == False',
+           bloc_NonEOSAndSimple=BLOC( condition = 'RelationType == "Force-Flux Relation" and ComplexFluid == False',
                 TypeOfForceFluxRelation =  SIMP( statut='o', into =['Viscosity', 'Diffusivity', 'Thermal Conductivity'], intoXML=['Viscosity', 'Diffusivity', 'Thermal Conductivity','Shear-stress closure', 'Scalar flux'], typ ='TXM'),
            ),
-           bloc_NonEOSAndComplex=BLOC( condition = 'RelationType == "Force Field Relation" and ComplexFluid == True',
+           bloc_NonEOSAndComplex=BLOC( condition = 'RelationType == "Force-Flux Relation" and ComplexFluid == True',
                 TypeOfForceFluxRelation =  SIMP( statut='o', into =['Shear-stress closure', 'Scalar flux'], typ ='TXM', intoXML=['Viscosity', 'Diffusivity', 'Thermal Conductivity','Shear-stress closure', 'Scalar flux']),
            ),
          ),