From 824e5eeb2b2515777e759044535d9e10dfcae87c Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Thu, 24 Jun 2010 09:25:12 +0200 Subject: [PATCH] ENH: add sutherlandTransport/hConstThermo combination --- .../mixtures/basicMixture/basicMixtures.C | 9 ++-- .../basic/psiThermo/ePsiThermo/ePsiThermos.C | 1 + .../hCombustionThermo/hCombustionThermos.C | 41 ++++++++++++++++++- 3 files changed, 46 insertions(+), 5 deletions(-) diff --git a/src/thermophysicalModels/basic/mixtures/basicMixture/basicMixtures.C b/src/thermophysicalModels/basic/mixtures/basicMixture/basicMixtures.C index 77ea290e62..0de4b2162a 100644 --- a/src/thermophysicalModels/basic/mixtures/basicMixture/basicMixtures.C +++ b/src/thermophysicalModels/basic/mixtures/basicMixture/basicMixtures.C @@ -57,7 +57,7 @@ makeBasicMixture ( pureMixture, constTransport, - hConstThermo, + eConstThermo, perfectGas ); @@ -65,15 +65,16 @@ makeBasicMixture ( pureMixture, sutherlandTransport, - hConstThermo, + eConstThermo, perfectGas ); + makeBasicMixture ( pureMixture, constTransport, - eConstThermo, + hConstThermo, perfectGas ); @@ -81,7 +82,7 @@ makeBasicMixture ( pureMixture, sutherlandTransport, - eConstThermo, + hConstThermo, perfectGas ); diff --git a/src/thermophysicalModels/basic/psiThermo/ePsiThermo/ePsiThermos.C b/src/thermophysicalModels/basic/psiThermo/ePsiThermo/ePsiThermos.C index 156de029b0..fc39529ff5 100644 --- a/src/thermophysicalModels/basic/psiThermo/ePsiThermo/ePsiThermos.C +++ b/src/thermophysicalModels/basic/psiThermo/ePsiThermo/ePsiThermos.C @@ -63,6 +63,7 @@ makeBasicPsiThermo perfectGas ); + makeBasicPsiThermo ( ePsiThermo, diff --git a/src/thermophysicalModels/reactionThermo/combustionThermo/hCombustionThermo/hCombustionThermos.C b/src/thermophysicalModels/reactionThermo/combustionThermo/hCombustionThermo/hCombustionThermos.C index 6e6cef2959..419e000f9b 100644 --- a/src/thermophysicalModels/reactionThermo/combustionThermo/hCombustionThermo/hCombustionThermos.C +++ b/src/thermophysicalModels/reactionThermo/combustionThermo/hCombustionThermo/hCombustionThermos.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd. + \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -53,6 +53,8 @@ namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +// constTransport, hConstThermo + makeCombustionThermo ( hCombustionThermo, @@ -83,6 +85,42 @@ makeCombustionThermo perfectGas ); + +// sutherlandTransport, hConstThermo + +makeCombustionThermo +( + hCombustionThermo, + hPsiMixtureThermo, + homogeneousMixture, + sutherlandTransport, + hConstThermo, + perfectGas +); + +makeCombustionThermo +( + hCombustionThermo, + hPsiMixtureThermo, + inhomogeneousMixture, + sutherlandTransport, + hConstThermo, + perfectGas +); + +makeCombustionThermo +( + hCombustionThermo, + hPsiMixtureThermo, + veryInhomogeneousMixture, + sutherlandTransport, + hConstThermo, + perfectGas +); + + +// sutherlandTransport, janafThermo + makeCombustionThermo ( hCombustionThermo, @@ -113,6 +151,7 @@ makeCombustionThermo perfectGas ); + makeCombustionThermo ( hCombustionThermo,