From 0f422c2a5467ef8b98adde9058a1850a3ef1271d Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Thu, 25 Oct 2018 10:45:45 +0100 Subject: [PATCH] thermophysicalModels: Changed constFluidEThermoPhysics and constEThermoPhysics to use eConstThermo rather than hConstThermo to avoid the need to evaluate departure functions and simplify evaluation of the temperature. In general it makes more sense to use and e/Cv based thermodynamics when solving for internal energy rather than h/Cp and have convert between the energy forms. All related tutorials and test cases have also been updated. --- .../specie/include/thermoPhysicsTypes.H | 5 +++-- .../specie/thermo/eConst/eConstThermoI.H | 14 +++++++------- .../specie/thermo/thermo/EtoHthermo.H | 2 -- .../constant/thermophysicalProperties.water | 4 ++-- .../constant/thermophysicalProperties.water | 4 ++-- .../constant/thermophysicalProperties.water | 4 ++-- .../constant/thermophysicalProperties.water | 4 ++-- .../constant/thermophysicalProperties.liquid.orig | 6 +++--- .../constant/thermophysicalProperties.liquid | 4 ++-- .../drift/constant/thermophysicalProperties.air | 4 ++-- .../drift/constant/thermophysicalProperties.water | 4 ++-- .../constant/thermophysicalProperties.air | 4 ++-- .../constant/thermophysicalProperties.water | 4 ++-- .../constant/thermophysicalProperties | 4 ++-- .../materials/water/thermophysicalProperties | 4 ++-- .../constant/thermophysicalProperties.water | 4 ++-- .../constant/thermophysicalProperties.water | 4 ++-- .../constant/thermophysicalProperties.water | 4 ++-- .../constant/thermophysicalProperties.mercury | 4 ++-- .../constant/thermophysicalProperties.oil | 4 ++-- .../constant/thermophysicalProperties.water | 4 ++-- .../bed/constant/thermophysicalProperties.water | 4 ++-- .../constant/thermophysicalProperties.water | 4 ++-- .../constant/thermophysicalProperties.water | 4 ++-- .../constant/thermophysicalProperties.water | 4 ++-- .../constant/thermophysicalProperties.water | 4 ++-- .../constant/thermophysicalProperties.water | 4 ++-- .../constant/thermophysicalProperties.water | 4 ++-- .../constant/thermophysicalProperties.water | 4 ++-- .../constant/thermophysicalProperties.liquid | 6 +++--- .../constant/thermophysicalProperties.water | 4 ++-- .../constant/thermophysicalProperties.water | 4 ++-- .../constant/thermophysicalProperties.liquid | 6 +++--- .../constant/thermophysicalProperties.liquid | 6 +++--- .../constant/thermophysicalProperties.water | 4 ++-- .../constant/thermophysicalProperties.water | 4 ++-- .../constant/thermophysicalProperties.water | 4 ++-- .../constant/thermophysicalProperties.water | 4 ++-- .../constant/thermophysicalProperties.water | 4 ++-- .../constant/thermophysicalProperties.water | 4 ++-- .../constant/thermophysicalProperties.water | 4 ++-- .../constant/thermophysicalProperties.water | 4 ++-- .../constant/thermophysicalProperties.water | 4 ++-- 43 files changed, 94 insertions(+), 95 deletions(-) diff --git a/src/thermophysicalModels/specie/include/thermoPhysicsTypes.H b/src/thermophysicalModels/specie/include/thermoPhysicsTypes.H index 2e568aa9bd..ad46fc0608 100644 --- a/src/thermophysicalModels/specie/include/thermoPhysicsTypes.H +++ b/src/thermophysicalModels/specie/include/thermoPhysicsTypes.H @@ -39,6 +39,7 @@ Description #include "adiabaticPerfectFluid.H" #include "rhoConst.H" #include "hConstThermo.H" +#include "eConstThermo.H" #include "janafThermo.H" #include "sensibleEnthalpy.H" @@ -239,7 +240,7 @@ namespace Foam < species::thermo < - hConstThermo + eConstThermo < perfectFluid >, @@ -267,7 +268,7 @@ namespace Foam < species::thermo < - hConstThermo + eConstThermo < rhoConst >, diff --git a/src/thermophysicalModels/specie/thermo/eConst/eConstThermoI.H b/src/thermophysicalModels/specie/thermo/eConst/eConstThermoI.H index 7cd74f2388..882ba1a4c5 100644 --- a/src/thermophysicalModels/specie/thermo/eConst/eConstThermoI.H +++ b/src/thermophysicalModels/specie/thermo/eConst/eConstThermoI.H @@ -110,6 +110,13 @@ inline Foam::scalar Foam::eConstThermo::Es } +template +inline Foam::scalar Foam::eConstThermo::Hc() const +{ + return Hf_; +} + + template inline Foam::scalar Foam::eConstThermo::Ea ( @@ -121,13 +128,6 @@ inline Foam::scalar Foam::eConstThermo::Ea } -template -inline Foam::scalar Foam::eConstThermo::Hc() const -{ - return Hf_; -} - - template inline Foam::scalar Foam::eConstThermo::S ( diff --git a/src/thermophysicalModels/specie/thermo/thermo/EtoHthermo.H b/src/thermophysicalModels/specie/thermo/thermo/EtoHthermo.H index 8ff174df78..89d0a6d7d9 100644 --- a/src/thermophysicalModels/specie/thermo/thermo/EtoHthermo.H +++ b/src/thermophysicalModels/specie/thermo/thermo/EtoHthermo.H @@ -7,7 +7,6 @@ inline scalar Cp return Cv(p, T) + EquationOfState::CpMCv(p, T); } - inline scalar Hs ( const scalar p, @@ -17,7 +16,6 @@ inline scalar Hs return Es(p, T) + p/EquationOfState::rho(p, T); } - inline scalar Ha ( const scalar p, diff --git a/test/multiphase/reactingMultiphaseEulerFoam/populationBalanceModeling/binaryBreakup/constant/thermophysicalProperties.water b/test/multiphase/reactingMultiphaseEulerFoam/populationBalanceModeling/binaryBreakup/constant/thermophysicalProperties.water index ccf24d2465..38a3615fad 100644 --- a/test/multiphase/reactingMultiphaseEulerFoam/populationBalanceModeling/binaryBreakup/constant/thermophysicalProperties.water +++ b/test/multiphase/reactingMultiphaseEulerFoam/populationBalanceModeling/binaryBreakup/constant/thermophysicalProperties.water @@ -20,7 +20,7 @@ thermoType type heRhoThermo; mixture pureMixture; transport const; - thermo hConst; + thermo eConst; equationOfState rhoConst; specie specie; energy sensibleInternalEnergy; @@ -39,7 +39,7 @@ mixture } thermodynamics { - Cp 4195; + Cv 4195; Hf 0; } transport diff --git a/test/multiphase/reactingMultiphaseEulerFoam/populationBalanceModeling/breakup/constant/thermophysicalProperties.water b/test/multiphase/reactingMultiphaseEulerFoam/populationBalanceModeling/breakup/constant/thermophysicalProperties.water index ccf24d2465..38a3615fad 100644 --- a/test/multiphase/reactingMultiphaseEulerFoam/populationBalanceModeling/breakup/constant/thermophysicalProperties.water +++ b/test/multiphase/reactingMultiphaseEulerFoam/populationBalanceModeling/breakup/constant/thermophysicalProperties.water @@ -20,7 +20,7 @@ thermoType type heRhoThermo; mixture pureMixture; transport const; - thermo hConst; + thermo eConst; equationOfState rhoConst; specie specie; energy sensibleInternalEnergy; @@ -39,7 +39,7 @@ mixture } thermodynamics { - Cp 4195; + Cv 4195; Hf 0; } transport diff --git a/test/multiphase/reactingMultiphaseEulerFoam/populationBalanceModeling/coalescence/constant/thermophysicalProperties.water b/test/multiphase/reactingMultiphaseEulerFoam/populationBalanceModeling/coalescence/constant/thermophysicalProperties.water index ccf24d2465..38a3615fad 100644 --- a/test/multiphase/reactingMultiphaseEulerFoam/populationBalanceModeling/coalescence/constant/thermophysicalProperties.water +++ b/test/multiphase/reactingMultiphaseEulerFoam/populationBalanceModeling/coalescence/constant/thermophysicalProperties.water @@ -20,7 +20,7 @@ thermoType type heRhoThermo; mixture pureMixture; transport const; - thermo hConst; + thermo eConst; equationOfState rhoConst; specie specie; energy sensibleInternalEnergy; @@ -39,7 +39,7 @@ mixture } thermodynamics { - Cp 4195; + Cv 4195; Hf 0; } transport diff --git a/test/multiphase/reactingMultiphaseEulerFoam/populationBalanceModeling/simultaneousCoalescenceAndBreakup/constant/thermophysicalProperties.water b/test/multiphase/reactingMultiphaseEulerFoam/populationBalanceModeling/simultaneousCoalescenceAndBreakup/constant/thermophysicalProperties.water index ccf24d2465..38a3615fad 100644 --- a/test/multiphase/reactingMultiphaseEulerFoam/populationBalanceModeling/simultaneousCoalescenceAndBreakup/constant/thermophysicalProperties.water +++ b/test/multiphase/reactingMultiphaseEulerFoam/populationBalanceModeling/simultaneousCoalescenceAndBreakup/constant/thermophysicalProperties.water @@ -20,7 +20,7 @@ thermoType type heRhoThermo; mixture pureMixture; transport const; - thermo hConst; + thermo eConst; equationOfState rhoConst; specie specie; energy sensibleInternalEnergy; @@ -39,7 +39,7 @@ mixture } thermodynamics { - Cp 4195; + Cv 4195; Hf 0; } transport diff --git a/test/multiphase/reactingTwoPhaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/constant/thermophysicalProperties.liquid.orig b/test/multiphase/reactingTwoPhaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/constant/thermophysicalProperties.liquid.orig index 1c03d6d792..2794ebb16a 100644 --- a/test/multiphase/reactingTwoPhaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/constant/thermophysicalProperties.liquid.orig +++ b/test/multiphase/reactingTwoPhaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/constant/thermophysicalProperties.liquid.orig @@ -20,7 +20,7 @@ thermoType type heRhoThermo; mixture multiComponentMixture; transport const; - thermo hConst; + thermo eConst; equationOfState rhoConst; specie specie; energy sensibleInternalEnergy; @@ -47,7 +47,7 @@ H2O thermodynamics { Hf -1.5879e+07; - Cp 4195; + Cv 4195; } transport { @@ -71,7 +71,7 @@ C3H8O thermodynamics { Hf -5.303e+06; - Cp 2680; + Cv 2680; } transport { diff --git a/test/multiphase/reactingTwoPhaseEulerFoam/interfaceComposition/waterEvaporation/constant/thermophysicalProperties.liquid b/test/multiphase/reactingTwoPhaseEulerFoam/interfaceComposition/waterEvaporation/constant/thermophysicalProperties.liquid index 2b7432baea..90f691ab03 100644 --- a/test/multiphase/reactingTwoPhaseEulerFoam/interfaceComposition/waterEvaporation/constant/thermophysicalProperties.liquid +++ b/test/multiphase/reactingTwoPhaseEulerFoam/interfaceComposition/waterEvaporation/constant/thermophysicalProperties.liquid @@ -20,7 +20,7 @@ thermoType type heRhoThermo; mixture pureMixture; transport const; - thermo hConst; + thermo eConst; equationOfState rhoConst; specie specie; energy sensibleInternalEnergy; @@ -38,8 +38,8 @@ mixture } thermodynamics { + Cv 4195; Hf -1.5879e+07; - Cp 4195; } transport { diff --git a/test/multiphase/reactingTwoPhaseEulerFoam/populationBalanceModeling/drift/constant/thermophysicalProperties.air b/test/multiphase/reactingTwoPhaseEulerFoam/populationBalanceModeling/drift/constant/thermophysicalProperties.air index 164b55d95a..0a82e2af6b 100644 --- a/test/multiphase/reactingTwoPhaseEulerFoam/populationBalanceModeling/drift/constant/thermophysicalProperties.air +++ b/test/multiphase/reactingTwoPhaseEulerFoam/populationBalanceModeling/drift/constant/thermophysicalProperties.air @@ -20,7 +20,7 @@ thermoType type heRhoThermo; mixture pureMixture; transport const; - thermo hConst; + thermo eConst; equationOfState rhoConst; specie specie; energy sensibleInternalEnergy; @@ -38,7 +38,7 @@ mixture } thermodynamics { - Cp 1007; + Cv 1007; Hf 0; } transport diff --git a/test/multiphase/reactingTwoPhaseEulerFoam/populationBalanceModeling/drift/constant/thermophysicalProperties.water b/test/multiphase/reactingTwoPhaseEulerFoam/populationBalanceModeling/drift/constant/thermophysicalProperties.water index f204219bae..47a8599387 100644 --- a/test/multiphase/reactingTwoPhaseEulerFoam/populationBalanceModeling/drift/constant/thermophysicalProperties.water +++ b/test/multiphase/reactingTwoPhaseEulerFoam/populationBalanceModeling/drift/constant/thermophysicalProperties.water @@ -20,7 +20,7 @@ thermoType type heRhoThermo; mixture pureMixture; transport const; - thermo hConst; + thermo eConst; equationOfState rhoConst; specie specie; energy sensibleInternalEnergy; @@ -38,7 +38,7 @@ mixture } thermodynamics { - Cp 4195; + Cv 4195; Hf 0; } transport diff --git a/test/multiphase/reactingTwoPhaseEulerFoam/populationBalanceModeling/negativeDrift/constant/thermophysicalProperties.air b/test/multiphase/reactingTwoPhaseEulerFoam/populationBalanceModeling/negativeDrift/constant/thermophysicalProperties.air index 164b55d95a..0a82e2af6b 100644 --- a/test/multiphase/reactingTwoPhaseEulerFoam/populationBalanceModeling/negativeDrift/constant/thermophysicalProperties.air +++ b/test/multiphase/reactingTwoPhaseEulerFoam/populationBalanceModeling/negativeDrift/constant/thermophysicalProperties.air @@ -20,7 +20,7 @@ thermoType type heRhoThermo; mixture pureMixture; transport const; - thermo hConst; + thermo eConst; equationOfState rhoConst; specie specie; energy sensibleInternalEnergy; @@ -38,7 +38,7 @@ mixture } thermodynamics { - Cp 1007; + Cv 1007; Hf 0; } transport diff --git a/test/multiphase/reactingTwoPhaseEulerFoam/populationBalanceModeling/negativeDrift/constant/thermophysicalProperties.water b/test/multiphase/reactingTwoPhaseEulerFoam/populationBalanceModeling/negativeDrift/constant/thermophysicalProperties.water index f204219bae..47a8599387 100644 --- a/test/multiphase/reactingTwoPhaseEulerFoam/populationBalanceModeling/negativeDrift/constant/thermophysicalProperties.water +++ b/test/multiphase/reactingTwoPhaseEulerFoam/populationBalanceModeling/negativeDrift/constant/thermophysicalProperties.water @@ -20,7 +20,7 @@ thermoType type heRhoThermo; mixture pureMixture; transport const; - thermo hConst; + thermo eConst; equationOfState rhoConst; specie specie; energy sensibleInternalEnergy; @@ -38,7 +38,7 @@ mixture } thermodynamics { - Cp 4195; + Cv 4195; Hf 0; } transport diff --git a/tutorials/compressible/rhoPimpleFoam/laminar/decompressionTank/decompressionTank/constant/thermophysicalProperties b/tutorials/compressible/rhoPimpleFoam/laminar/decompressionTank/decompressionTank/constant/thermophysicalProperties index a096d6945b..9612a842d0 100644 --- a/tutorials/compressible/rhoPimpleFoam/laminar/decompressionTank/decompressionTank/constant/thermophysicalProperties +++ b/tutorials/compressible/rhoPimpleFoam/laminar/decompressionTank/decompressionTank/constant/thermophysicalProperties @@ -33,7 +33,7 @@ thermoType type heRhoThermo; mixture pureMixture; transport const; - thermo hConst; + thermo eConst; equationOfState perfectFluid; specie specie; energy sensibleInternalEnergy; @@ -52,7 +52,7 @@ mixture } thermodynamics { - Cp 4185; + Cv 4185; Hf 0; } transport diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/coolingSphere/templates/materials/water/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/coolingSphere/templates/materials/water/thermophysicalProperties index 8c62b69610..15bf4129bb 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/coolingSphere/templates/materials/water/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/coolingSphere/templates/materials/water/thermophysicalProperties @@ -19,7 +19,7 @@ thermoType type heRhoThermo; mixture pureMixture; transport const; - thermo hConst; + thermo eConst; equationOfState perfectFluid; specie specie; energy sensibleInternalEnergy; @@ -39,7 +39,7 @@ mixture } thermodynamics { - Cp 4181; // [J/(kg K)] at T = 293 K + Cv 4181; // [J/(kg K)] at T = 293 K Hf 0; } transport diff --git a/tutorials/multiphase/compressibleInterFoam/RAS/sloshingTank2D/constant/thermophysicalProperties.water b/tutorials/multiphase/compressibleInterFoam/RAS/sloshingTank2D/constant/thermophysicalProperties.water index 2a80327354..b3c3569ee5 100644 --- a/tutorials/multiphase/compressibleInterFoam/RAS/sloshingTank2D/constant/thermophysicalProperties.water +++ b/tutorials/multiphase/compressibleInterFoam/RAS/sloshingTank2D/constant/thermophysicalProperties.water @@ -20,7 +20,7 @@ thermoType type heRhoThermo; mixture pureMixture; transport const; - thermo hConst; + thermo eConst; equationOfState perfectFluid; specie specie; energy sensibleInternalEnergy; @@ -39,7 +39,7 @@ mixture } thermodynamics { - Cp 4195; + Cv 4195; Hf 0; } transport diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties.water b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties.water index 5aa2d33700..5c00778d05 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties.water +++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/thermophysicalProperties.water @@ -35,7 +35,7 @@ thermoType type heRhoThermo; mixture pureMixture; transport const; - thermo hConst; + thermo eConst; equationOfState perfectFluid; specie specie; energy sensibleInternalEnergy; @@ -54,7 +54,7 @@ mixture } thermodynamics { - Cp 4195; + Cv 4195; Hf 0; } transport diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties.water b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties.water index 2a80327354..b3c3569ee5 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties.water +++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/thermophysicalProperties.water @@ -20,7 +20,7 @@ thermoType type heRhoThermo; mixture pureMixture; transport const; - thermo hConst; + thermo eConst; equationOfState perfectFluid; specie specie; energy sensibleInternalEnergy; @@ -39,7 +39,7 @@ mixture } thermodynamics { - Cp 4195; + Cv 4195; Hf 0; } transport diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.mercury b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.mercury index 13a2726157..a133f79a3f 100644 --- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.mercury +++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.mercury @@ -20,7 +20,7 @@ thermoType type heRhoThermo; mixture pureMixture; transport const; - thermo hConst; + thermo eConst; equationOfState perfectFluid; specie specie; energy sensibleInternalEnergy; @@ -39,7 +39,7 @@ mixture } thermodynamics { - Cp 139; + Cv 139; Hf 0; } transport diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.oil b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.oil index 26fab755b4..d1f0a9606b 100644 --- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.oil +++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.oil @@ -20,7 +20,7 @@ thermoType type heRhoThermo; mixture pureMixture; transport const; - thermo hConst; + thermo eConst; equationOfState perfectFluid; specie specie; energy sensibleInternalEnergy; @@ -39,7 +39,7 @@ mixture } thermodynamics { - Cp 2240; + Cv 2240; Hf 0; } transport diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.water b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.water index e880f06aa7..cfddec97c3 100644 --- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.water +++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/thermophysicalProperties.water @@ -20,7 +20,7 @@ thermoType type heRhoThermo; mixture pureMixture; transport const; - thermo hConst; + thermo eConst; equationOfState perfectFluid; specie specie; energy sensibleInternalEnergy; @@ -39,7 +39,7 @@ mixture } thermodynamics { - Cp 4195; + Cv 4195; Hf 0; } transport diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bed/constant/thermophysicalProperties.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bed/constant/thermophysicalProperties.water index 6eabccd0cc..4578d356df 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bed/constant/thermophysicalProperties.water +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bed/constant/thermophysicalProperties.water @@ -20,7 +20,7 @@ thermoType type heRhoThermo; mixture pureMixture; transport const; - thermo hConst; + thermo eConst; equationOfState perfectFluid; specie specie; energy sensibleInternalEnergy; @@ -39,7 +39,7 @@ mixture } thermodynamics { - Cp 4195; + Cv 4195; Hf 0; } transport diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water index 6eabccd0cc..4578d356df 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water @@ -20,7 +20,7 @@ thermoType type heRhoThermo; mixture pureMixture; transport const; - thermo hConst; + thermo eConst; equationOfState perfectFluid; specie specie; energy sensibleInternalEnergy; @@ -39,7 +39,7 @@ mixture } thermodynamics { - Cp 4195; + Cv 4195; Hf 0; } transport diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnFixedPolydisperse/constant/thermophysicalProperties.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnFixedPolydisperse/constant/thermophysicalProperties.water index 6eabccd0cc..4578d356df 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnFixedPolydisperse/constant/thermophysicalProperties.water +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnFixedPolydisperse/constant/thermophysicalProperties.water @@ -20,7 +20,7 @@ thermoType type heRhoThermo; mixture pureMixture; transport const; - thermo hConst; + thermo eConst; equationOfState perfectFluid; specie specie; energy sensibleInternalEnergy; @@ -39,7 +39,7 @@ mixture } thermodynamics { - Cp 4195; + Cv 4195; Hf 0; } transport diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnPolydisperse/constant/thermophysicalProperties.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnPolydisperse/constant/thermophysicalProperties.water index 6eabccd0cc..4578d356df 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnPolydisperse/constant/thermophysicalProperties.water +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnPolydisperse/constant/thermophysicalProperties.water @@ -20,7 +20,7 @@ thermoType type heRhoThermo; mixture pureMixture; transport const; - thermo hConst; + thermo eConst; equationOfState perfectFluid; specie specie; energy sensibleInternalEnergy; @@ -39,7 +39,7 @@ mixture } thermodynamics { - Cp 4195; + Cv 4195; Hf 0; } transport diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water index 6eabccd0cc..4578d356df 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water @@ -20,7 +20,7 @@ thermoType type heRhoThermo; mixture pureMixture; transport const; - thermo hConst; + thermo eConst; equationOfState perfectFluid; specie specie; energy sensibleInternalEnergy; @@ -39,7 +39,7 @@ mixture } thermodynamics { - Cp 4195; + Cv 4195; Hf 0; } transport diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/trickleBed/constant/thermophysicalProperties.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/trickleBed/constant/thermophysicalProperties.water index 6eabccd0cc..4578d356df 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/trickleBed/constant/thermophysicalProperties.water +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/trickleBed/constant/thermophysicalProperties.water @@ -20,7 +20,7 @@ thermoType type heRhoThermo; mixture pureMixture; transport const; - thermo hConst; + thermo eConst; equationOfState perfectFluid; specie specie; energy sensibleInternalEnergy; @@ -39,7 +39,7 @@ mixture } thermodynamics { - Cp 4195; + Cv 4195; Hf 0; } transport diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.water index 6eabccd0cc..4578d356df 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.water +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.water @@ -20,7 +20,7 @@ thermoType type heRhoThermo; mixture pureMixture; transport const; - thermo hConst; + thermo eConst; equationOfState perfectFluid; specie specie; energy sensibleInternalEnergy; @@ -39,7 +39,7 @@ mixture } thermodynamics { - Cp 4195; + Cv 4195; Hf 0; } transport diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.water index 6eabccd0cc..4578d356df 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.water +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.water @@ -20,7 +20,7 @@ thermoType type heRhoThermo; mixture pureMixture; transport const; - thermo hConst; + thermo eConst; equationOfState perfectFluid; specie specie; energy sensibleInternalEnergy; @@ -39,7 +39,7 @@ mixture } thermodynamics { - Cp 4195; + Cv 4195; Hf 0; } transport diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/thermophysicalProperties.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/thermophysicalProperties.liquid index cadf0b49e6..44d4df9e44 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/thermophysicalProperties.liquid +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/thermophysicalProperties.liquid @@ -20,7 +20,7 @@ thermoType type heRhoThermo; mixture pureMixture; transport const; - thermo hConst; + thermo eConst; equationOfState perfectFluid; specie specie; energy sensibleInternalEnergy; @@ -48,7 +48,7 @@ inertSpecie H2O; thermodynamics { Hf -1.5879e+07; - Cp 4195; + Cv 4195; } transport { @@ -71,7 +71,7 @@ AIR thermodynamics { Hf 0; - Cp 4195; + Cv 4195; } transport { diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/thermophysicalProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/thermophysicalProperties.water index 6eabccd0cc..4578d356df 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/thermophysicalProperties.water +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/thermophysicalProperties.water @@ -20,7 +20,7 @@ thermoType type heRhoThermo; mixture pureMixture; transport const; - thermo hConst; + thermo eConst; equationOfState perfectFluid; specie specie; energy sensibleInternalEnergy; @@ -39,7 +39,7 @@ mixture } thermodynamics { - Cp 4195; + Cv 4195; Hf 0; } transport diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water index 6eabccd0cc..4578d356df 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water @@ -20,7 +20,7 @@ thermoType type heRhoThermo; mixture pureMixture; transport const; - thermo hConst; + thermo eConst; equationOfState perfectFluid; specie specie; energy sensibleInternalEnergy; @@ -39,7 +39,7 @@ mixture } thermodynamics { - Cp 4195; + Cv 4195; Hf 0; } transport diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/thermophysicalProperties.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/thermophysicalProperties.liquid index c79ea24e89..401e1a38f8 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/thermophysicalProperties.liquid +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/thermophysicalProperties.liquid @@ -20,7 +20,7 @@ thermoType type heRhoThermo; mixture pureMixture; transport const; - thermo hConst; + thermo eConst; equationOfState perfectFluid; specie specie; energy sensibleInternalEnergy; @@ -47,8 +47,8 @@ inertSpecie H2O; } thermodynamics { + Cv 4195; Hf -1.5879e+07; - Cp 4195; } transport { @@ -71,7 +71,7 @@ air thermodynamics { Hf 0; - Cp 4195; + Cv 4195; } transport { diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/thermophysicalProperties.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/thermophysicalProperties.liquid index ed6aee81b2..b8ab7621f0 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/thermophysicalProperties.liquid +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/thermophysicalProperties.liquid @@ -20,7 +20,7 @@ thermoType type heRhoThermo; mixture multiComponentMixture; transport const; - thermo hConst; + thermo eConst; equationOfState perfectFluid; specie specie; energy sensibleInternalEnergy; @@ -47,8 +47,8 @@ inertSpecie water; } thermodynamics { + Cv 4195; Hf -1.5879e+07; - Cp 4195; } transport { @@ -71,7 +71,7 @@ air thermodynamics { Hf 0; - Cp 4195; + Cv 4195; } transport { diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.water index 6eabccd0cc..4578d356df 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.water +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.water @@ -20,7 +20,7 @@ thermoType type heRhoThermo; mixture pureMixture; transport const; - thermo hConst; + thermo eConst; equationOfState perfectFluid; specie specie; energy sensibleInternalEnergy; @@ -39,7 +39,7 @@ mixture } thermodynamics { - Cp 4195; + Cv 4195; Hf 0; } transport diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.water index 6eabccd0cc..4578d356df 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.water +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.water @@ -20,7 +20,7 @@ thermoType type heRhoThermo; mixture pureMixture; transport const; - thermo hConst; + thermo eConst; equationOfState perfectFluid; specie specie; energy sensibleInternalEnergy; @@ -39,7 +39,7 @@ mixture } thermodynamics { - Cp 4195; + Cv 4195; Hf 0; } transport diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water index 6eabccd0cc..4578d356df 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water @@ -20,7 +20,7 @@ thermoType type heRhoThermo; mixture pureMixture; transport const; - thermo hConst; + thermo eConst; equationOfState perfectFluid; specie specie; energy sensibleInternalEnergy; @@ -39,7 +39,7 @@ mixture } thermodynamics { - Cp 4195; + Cv 4195; Hf 0; } transport diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.water b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.water index 6eabccd0cc..4578d356df 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.water +++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/thermophysicalProperties.water @@ -20,7 +20,7 @@ thermoType type heRhoThermo; mixture pureMixture; transport const; - thermo hConst; + thermo eConst; equationOfState perfectFluid; specie specie; energy sensibleInternalEnergy; @@ -39,7 +39,7 @@ mixture } thermodynamics { - Cp 4195; + Cv 4195; Hf 0; } transport diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.water b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.water index 6eabccd0cc..4578d356df 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.water +++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/thermophysicalProperties.water @@ -20,7 +20,7 @@ thermoType type heRhoThermo; mixture pureMixture; transport const; - thermo hConst; + thermo eConst; equationOfState perfectFluid; specie specie; energy sensibleInternalEnergy; @@ -39,7 +39,7 @@ mixture } thermodynamics { - Cp 4195; + Cv 4195; Hf 0; } transport diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water index 6eabccd0cc..4578d356df 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water @@ -20,7 +20,7 @@ thermoType type heRhoThermo; mixture pureMixture; transport const; - thermo hConst; + thermo eConst; equationOfState perfectFluid; specie specie; energy sensibleInternalEnergy; @@ -39,7 +39,7 @@ mixture } thermodynamics { - Cp 4195; + Cv 4195; Hf 0; } transport diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.water index 6eabccd0cc..4578d356df 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.water +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.water @@ -20,7 +20,7 @@ thermoType type heRhoThermo; mixture pureMixture; transport const; - thermo hConst; + thermo eConst; equationOfState perfectFluid; specie specie; energy sensibleInternalEnergy; @@ -39,7 +39,7 @@ mixture } thermodynamics { - Cp 4195; + Cv 4195; Hf 0; } transport diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.water index 6eabccd0cc..4578d356df 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.water +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.water @@ -20,7 +20,7 @@ thermoType type heRhoThermo; mixture pureMixture; transport const; - thermo hConst; + thermo eConst; equationOfState perfectFluid; specie specie; energy sensibleInternalEnergy; @@ -39,7 +39,7 @@ mixture } thermodynamics { - Cp 4195; + Cv 4195; Hf 0; } transport diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water index 6eabccd0cc..4578d356df 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water @@ -20,7 +20,7 @@ thermoType type heRhoThermo; mixture pureMixture; transport const; - thermo hConst; + thermo eConst; equationOfState perfectFluid; specie specie; energy sensibleInternalEnergy; @@ -39,7 +39,7 @@ mixture } thermodynamics { - Cp 4195; + Cv 4195; Hf 0; } transport