thermal

diff --git a/Vimmp/cata_CSAndCPS_v5.py b/Vimmp/cata_CSAndCPS_v5.py
index 8328edfab46b89fef288f1af3ed8f9c75610d848..e8b0cfdc906e5758318a62784dacf51d190bf57a 100644 (file)
--- a/Vimmp/cata_CSAndCPS_v5.py
+++ b/Vimmp/cata_CSAndCPS_v5.py
@@ -490,7 +490,8 @@ def bloc_FluideMacro():
               InitialDensity =  SIMP(typ='R', statut='o',),
           ), # fin bloc_DensityNonThermal
           bloc_DensityAndThermalActive = BLOC(condition = ' ThermalEffects == "Active on flow dynamics"',
-              DensityEquationOfState = SIMP(typ='TXM', statut='o', into =['variable density', 'compressible'], ), 
+              OriginOfThermalEffects = SIMP( statut='o', into =['Given', ], typ ='TXM', defaut ='Given'),
+              BlocGiven =creeBlocPourLesFichiers (' OriginOfThermalEffects == "Given"', None, ('Med', 'cgns' ), FieldName=1),
           ),
       ), # fin DensityInitialisation
 
@@ -498,7 +499,7 @@ def bloc_FluideMacro():
          ActiveOnFlowEffect = FACT(statut = 'o', max='**',
            RelationType   = SIMP( statut='o', into =['Equation Of State', 'Force Field Relation'], typ ='TXM'),
            bloc_EOS=BLOC( condition = 'RelationType == "Equation Of State"',
-                TypeOfEquationOfState =  SIMP( statut='o', into =['variable', 'compressible'], typ ='TXM'),
+                TypeOfEquationOfState =  SIMP( statut='o', into =['variable density', 'compressible'], typ ='TXM'),
            ),
            bloc_NonEOSAndSimple=BLOC( condition = 'RelationType == "Force Field Relation" and ComplexFluid == False',
                 TypeOfEquationOfState =  SIMP( statut='o', into =['Newtonian', 'Fick Law', 'Fourier Law'], intoXML=['Newtonian', 'Fick Law', 'Fourier Law','Shear-stress closure', 'Scalar flux'], typ ='TXM'),