From af603ba280ac4d3200cb00744dc68a22fed7a988 Mon Sep 17 00:00:00 2001 From: "pascale.noyret" Date: Tue, 1 Dec 2020 10:07:38 +0100 Subject: [PATCH] thermal --- Vimmp/cata_CSAndCPS_v5.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Vimmp/cata_CSAndCPS_v5.py b/Vimmp/cata_CSAndCPS_v5.py index 8328edfa..e8b0cfdc 100644 --- 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'), -- 2.39.2