therma

diff --git a/Vimmp/cata_CSAndCPS_v7.py b/Vimmp/cata_CSAndCPS_v7.py
index df8b07d50d78cee7aeab28f27ab314f3f6ecbf8c..d9b04580f787e30f78193139b68ff2d9bff6c9ad 100644 (file)
--- a/Vimmp/cata_CSAndCPS_v7.py
+++ b/Vimmp/cata_CSAndCPS_v7.py
@@ -515,16 +515,9 @@ def bloc_FluideMacro():
      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"',
-              ReferenceTemperature  = SIMP(typ='R', statut='o', val_min=-273.15 ),
-           ), # fin bloc_NonThermal
-           bloc_NonNonThermalEffects   = BLOC(condition = 'not(ThermalEffects == "Non thermal")',
-              OriginOfThermalFluxField = SIMP( statut='o', into =['Given', 'Interaction', 'to be simulated'], typ ='TXM'),
-              BlocGiven = creeBlocPourLesFichiers('OriginOfThermalFluxField == "Given"', 'FileName', ('Med', 'cgns' ), FieldName=1),
-          ),  # fin bloc_NonNonThermalEffects
-         ),# fin TemperatureInitialisation
-
+        bloc_NonThermalEffects = BLOC(condition = ' ThermalEffects == "Non thermal"',
+            ReferenceTemperature  = SIMP(typ='R', statut='o', val_min=-273.15 ),
+        ), # fin bloc_NonThermal
         bloc_ThermalEffects_Active = BLOC(condition = ' ThermalEffects == "Active on flow dynamics"',
            ActiveOnFlowEffect = FACT(statut = 'o', max='**',
             RelationType  = SIMP(statut = 'o', into =['Equation Of State', 'Force-Flux Relation'], typ ='TXM'),
@@ -579,8 +572,12 @@ def bloc_FluideMacro():
                 Name = SIMP(typ=(scalar,'createObject'), statut='o', defaut ='Temperature', homo='constant'),
                 SourceTerm=SIMP(typ=bool, statut='o', defaut=False),
                 blocSourceTerm = FactTermeSource('SourceTerm==True'),
+                TemperatureInitialisation = FACT( statut ='o',
+                    OriginOfThermalFluxField = SIMP( statut='o', into =['Given', 'Interaction', 'to be simulated'], typ ='TXM'),
+                    BlocGiven = creeBlocPourLesFichiers('OriginOfThermalFluxField == "Given"', 'FileName', ('Med', 'cgns' ), FieldName=1),
+                 ),# fin TemperatureInitialisation
              ),# TemperatureScalar 
-            ),
+            ), # fin bloc_ThermalEffects_On
             bloc_Turbulence_TWMChoice1 = BLOC(condition = 'TVMChoice == "K-Epsilon" or TVMChoice == "K-Omega"',
              KScalar =FACT(statut ='o',
                 Name = SIMP(typ=(scalar,'createObject'), statut='o', defaut ='K', homo='constant'),