mineur

diff --git a/Vimmp/cata_CSAndCPS_v6.py b/Vimmp/cata_CSAndCPS_v6.py
index 53a199dd41ff1941ce1da210b5bc8c1c3379f574..d9cf9a5d9193e23a586d80b9aeee56143e5ae5bc 100644 (file)
--- a/Vimmp/cata_CSAndCPS_v6.py
+++ b/Vimmp/cata_CSAndCPS_v6.py
@@ -200,8 +200,8 @@ def champ(nomDelaContante, labels ,nbReels ) :
 
 def FactTermeSource(condition):
    return BLOC (condition=condition, 
-      OriginOfSourceTerm =  SIMP( statut='o', typ='TXM',into=['Interaction', 'Chemical Reaction', 'Other Scalar']
-   ))
+      OriginOfSourceTerm =  SIMP( statut='o', typ='TXM',into=['Interaction', 'Chemical Reaction', 'Other Scalar']),
+   )
 
 
 def FactTurbulence(statut, ajout=None):
@@ -463,20 +463,10 @@ def bloc_FluideMacro():
         TurbulenceForFlowDynamics = FactTurbulence('o'), 
       ), #------ fin bloc_FlowNature_Turbulent
 
-#     ConstitutiveRelation =  FACT(statut ='o',max='**',
-#         Name = SIMP(statut='o', typ=(constitutiveRelation,'createObject'),),
-#         Nature = SIMP( statut='o', into =['Equation Of State', 'Force Field Relation'], typ ='TXM'),
-#     ),
 # ---------------------- Effets thermiques
-         #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 
-
      Thermal = FACT (statut ='o',
       ThermalEffects = SIMP(typ='TXM', statut='o', into =['Non thermal', 
                             'Passive on flow dynamics', 'Active on flow dynamics'], defaut='Non thermal', position='global' ),
-
-      
       TemperatureInitialisation = FACT( statut ='o',
           bloc_NonThermalEffects  = BLOC(condition = ' ThermalEffects == "Non thermal"',
               InitialTemperature = SIMP(typ='R', statut='o', val_min=-273.15 ),
@@ -484,9 +474,8 @@ 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),
-              ),
-         ),
-      ),
+          ),
+       ),
 
       bloc_ThermalEffects_Active = BLOC(condition = ' ThermalEffects == "Active on flow dynamics"',
          ActiveOnFlowEffect = FACT(statut = 'o', max='**',
@@ -520,34 +509,6 @@ def bloc_FluideMacro():
 
     ),# fin Fact Thermal
 
-# ---------------------- 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'),
-#
-#      bloc_NonThermalEffects   = BLOC(condition = ' ThermalEffects == "Non thermal" or ThermalEffects == "Passive on flow dynamics"',
-#          InitialTemperature = SIMP(typ='R', statut='o', val_min=-273.15 ),
-#          ), # fin bloc_NonThermal
-#
-#      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 
-#
-#      bloc_ThermalEffects_Active = BLOC(condition = ' ThermalEffects == "Active on flow dynamics"',
-#          DensityEquationOfState = SIMP(typ='TXM', statut='o', into =['Variable density', 'Compressible']),
-## PNJPM est ce suffisant ?
-#          ), # fin bloc_ThermalEffects_Active
-#
-#      bloc_ThermalEffects   = BLOC(condition = ' ThermalEffects == "Active on flow dynamics" or ThermalEffects == "Passive on flow dynamics"',
-#           bloc_scalar_thermal_flux = BLOC (condition = "FlowNature == 'Turbulent'",
-#               ThermalFluxModel = FactTurbulence('f'),
-#           ),# fin bloc_scalar_thermal_flux
-#          WithChemicalReactions  = SIMP(typ=bool, statut ='o', defaut = False),
-#          ), # fin bloc_ThermalEffects
-#    ),# fin Fact Thermal
-
-# ---------------------- Scalaire additional 
       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"',