Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev

applications/solvers/combustion/PDRFoam/PDRFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -68,7 +68,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
-#include "hhuCombustionThermo.H"
+#include "psiuReactionThermo.H"
 #include "RASModel.H"
 #include "laminarFlameSpeed.H"
 #include "XiModel.H"
@@ -123,12 +123,12 @@ int main(int argc, char *argv[])
             {
                 #include "bEqn.H"
                 #include "ftEqn.H"
-                #include "huEqn.H"
+                #include "hauEqn.H"
-                #include "hEqn.H"
+                #include "haEqn.H"
 
                 if (!ign.ignited())
                 {
-                    hu == h;
+                    hau == ha;
                 }
 
                 #include "pEqn.H"

applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -57,7 +57,7 @@ Description
 
 #include "fvCFD.H"
 #include "dynamicFvMesh.H"
-#include "hhuCombustionThermo.H"
+#include "psiuReactionThermo.H"
 #include "RASModel.H"
 #include "laminarFlameSpeed.H"
 #include "XiModel.H"

applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,7 +43,7 @@ namespace XiEqModels
 Foam::XiEqModels::basicSubGrid::basicSubGrid
 (
     const dictionary& XiEqProperties,
-    const hhuCombustionThermo& thermo,
+    const psiuReactionThermo& thermo,
     const compressible::RASModel& turbulence,
     const volScalarField& Su
 )

applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -113,7 +113,7 @@ public:
         basicSubGrid
         (
             const dictionary& XiEqProperties,
-            const hhuCombustionThermo& thermo,
+            const psiuReactionThermo& thermo,
             const compressible::RASModel& turbulence,
             const volScalarField& Su
         );

applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,7 +43,7 @@ namespace XiGModels
 Foam::XiGModels::basicSubGrid::basicSubGrid
 (
     const dictionary& XiGProperties,
-    const hhuCombustionThermo& thermo,
+    const psiuReactionThermo& thermo,
     const compressible::RASModel& turbulence,
     const volScalarField& Su
 )

applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -101,7 +101,7 @@ public:
         basicSubGrid
         (
             const dictionary& XiGProperties,
-            const hhuCombustionThermo& thermo,
+            const psiuReactionThermo& thermo,
             const compressible::RASModel& turbulence,
             const volScalarField& Su
         );

applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,7 +37,7 @@ SourceFiles
 #define PDRDragModel_H
 
 #include "IOdictionary.H"
-#include "hhuCombustionThermo.H"
+#include "psiuReactionThermo.H"
 #include "RASModel.H"
 #include "multivariateSurfaceInterpolationScheme.H"
 #include "runTimeSelectionTables.H"

applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,7 +43,7 @@ namespace XiEqModels
 Foam::XiEqModels::Gulder::Gulder
 (
     const dictionary& XiEqProperties,
-    const hhuCombustionThermo& thermo,
+    const psiuReactionThermo& thermo,
     const compressible::RASModel& turbulence,
     const volScalarField& Su
 )

applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -89,7 +89,7 @@ public:
         Gulder
         (
             const dictionary& XiEqProperties,
-            const hhuCombustionThermo& thermo,
+            const psiuReactionThermo& thermo,
             const compressible::RASModel& turbulence,
             const volScalarField& Su
         );

applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,7 +43,7 @@ namespace XiEqModels
 Foam::XiEqModels::SCOPEBlend::SCOPEBlend
 (
     const dictionary& XiEqProperties,
-    const hhuCombustionThermo& thermo,
+    const psiuReactionThermo& thermo,
     const compressible::RASModel& turbulence,
     const volScalarField& Su
 )

applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -85,7 +85,7 @@ public:
         SCOPEBlend
         (
             const dictionary& XiEqProperties,
-            const hhuCombustionThermo& thermo,
+            const psiuReactionThermo& thermo,
             const compressible::RASModel& turbulence,
             const volScalarField& Su
         );

applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,7 +43,7 @@ namespace XiEqModels
 Foam::XiEqModels::SCOPEXiEq::SCOPEXiEq
 (
     const dictionary& XiEqProperties,
-    const hhuCombustionThermo& thermo,
+    const psiuReactionThermo& thermo,
     const compressible::RASModel& turbulence,
     const volScalarField& Su
 )

applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -103,7 +103,7 @@ public:
         SCOPEXiEq
         (
             const dictionary& XiEqProperties,
-            const hhuCombustionThermo& thermo,
+            const psiuReactionThermo& thermo,
             const compressible::RASModel& turbulence,
             const volScalarField& Su
         );

applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,7 +39,7 @@ namespace Foam
 Foam::XiEqModel::XiEqModel
 (
     const dictionary& XiEqProperties,
-    const hhuCombustionThermo& thermo,
+    const psiuReactionThermo& thermo,
     const compressible::RASModel& turbulence,
     const volScalarField& Su
 )

applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -42,7 +42,7 @@ SourceFiles
 #define XiEqModel_H
 
 #include "IOdictionary.H"
-#include "hhuCombustionThermo.H"
+#include "psiuReactionThermo.H"
 #include "RASModel.H"
 #include "runTimeSelectionTables.H"
 
@@ -66,7 +66,7 @@ protected:
         dictionary XiEqModelCoeffs_;
 
         //- Thermo
-        const hhuCombustionThermo& thermo_;
+        const psiuReactionThermo& thermo_;
 
         //- Turbulence
         const compressible::RASModel& turbulence_;
@@ -107,7 +107,7 @@ public:
             dictionary,
             (
                 const dictionary& XiEqProperties,
-                const hhuCombustionThermo& thermo,
+                const psiuReactionThermo& thermo,
                 const compressible::RASModel& turbulence,
                 const volScalarField& Su
             ),
@@ -126,7 +126,7 @@ public:
         static autoPtr<XiEqModel> New
         (
             const dictionary& XiEqProperties,
-            const hhuCombustionThermo& thermo,
+            const psiuReactionThermo& thermo,
             const compressible::RASModel& turbulence,
             const volScalarField& Su
         );
@@ -138,7 +138,7 @@ public:
         XiEqModel
         (
             const dictionary& XiEqProperties,
-            const hhuCombustionThermo& thermo,
+            const psiuReactionThermo& thermo,
             const compressible::RASModel& turbulence,
             const volScalarField& Su
         );

applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModelNew.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,7 +30,7 @@ License
 Foam::autoPtr<Foam::XiEqModel> Foam::XiEqModel::New
 (
     const dictionary& propDict,
-    const hhuCombustionThermo& thermo,
+    const psiuReactionThermo& thermo,
     const compressible::RASModel& turbulence,
     const volScalarField& Su
 )
@@ -48,7 +48,7 @@ Foam::autoPtr<Foam::XiEqModel> Foam::XiEqModel::New
         (
             "XiEqModel::New"
             "("
-            "    const hhuCombustionThermo& thermo,"
+            "    const psiuReactionThermo& thermo,"
             "    const compressible::RASModel& turbulence,"
             "    const volScalarField& Su"
             ")"

applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,7 +43,7 @@ namespace XiEqModels
 Foam::XiEqModels::instability::instability
 (
     const dictionary& XiEqProperties,
-    const hhuCombustionThermo& thermo,
+    const psiuReactionThermo& thermo,
     const compressible::RASModel& turbulence,
     const volScalarField& Su
 )

applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -84,7 +84,7 @@ public:
         instability
         (
             const dictionary& XiEqProperties,
-            const hhuCombustionThermo& thermo,
+            const psiuReactionThermo& thermo,
             const compressible::RASModel& turbulence,
             const volScalarField& Su
         );

applications/solvers/combustion/PDRFoam/XiModels/XiGModels/KTS/KTS.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,7 +43,7 @@ namespace XiGModels
 Foam::XiGModels::KTS::KTS
 (
     const dictionary& XiGProperties,
-    const hhuCombustionThermo& thermo,
+    const psiuReactionThermo& thermo,
     const compressible::RASModel& turbulence,
     const volScalarField& Su
 )

applications/solvers/combustion/PDRFoam/XiModels/XiGModels/KTS/KTS.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -79,7 +79,7 @@ public:
         KTS
         (
             const dictionary& XiGProperties,
-            const hhuCombustionThermo& thermo,
+            const psiuReactionThermo& thermo,
             const compressible::RASModel& turbulence,
             const volScalarField& Su
         );

applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,7 +39,7 @@ namespace Foam
 Foam::XiGModel::XiGModel
 (
     const dictionary& XiGProperties,
-    const hhuCombustionThermo& thermo,
+    const psiuReactionThermo& thermo,
     const compressible::RASModel& turbulence,
     const volScalarField& Su
 )

applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,7 +39,7 @@ SourceFiles
 #define XiGModel_H
 
 #include "IOdictionary.H"
-#include "hhuCombustionThermo.H"
+#include "psiuReactionThermo.H"
 #include "RASModel.H"
 #include "runTimeSelectionTables.H"
 
@@ -61,7 +61,7 @@ protected:
 
         dictionary XiGModelCoeffs_;
 
-        const hhuCombustionThermo& thermo_;
+        const psiuReactionThermo& thermo_;
         const compressible::RASModel& turbulence_;
         const volScalarField& Su_;
 
@@ -92,7 +92,7 @@ public:
             dictionary,
             (
                 const dictionary& XiGProperties,
-                const hhuCombustionThermo& thermo,
+                const psiuReactionThermo& thermo,
                 const compressible::RASModel& turbulence,
                 const volScalarField& Su
             ),
@@ -111,7 +111,7 @@ public:
         static autoPtr<XiGModel> New
         (
             const dictionary& XiGProperties,
-            const hhuCombustionThermo& thermo,
+            const psiuReactionThermo& thermo,
             const compressible::RASModel& turbulence,
             const volScalarField& Su
         );
@@ -123,7 +123,7 @@ public:
         XiGModel
         (
             const dictionary& XiGProperties,
-            const hhuCombustionThermo& thermo,
+            const psiuReactionThermo& thermo,
             const compressible::RASModel& turbulence,
             const volScalarField& Su
         );

applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModelNew.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,7 +30,7 @@ License
 Foam::autoPtr<Foam::XiGModel> Foam::XiGModel::New
 (
     const dictionary& propDict,
-    const hhuCombustionThermo& thermo,
+    const psiuReactionThermo& thermo,
     const compressible::RASModel& turbulence,
     const volScalarField& Su
 )
@@ -48,7 +48,7 @@ Foam::autoPtr<Foam::XiGModel> Foam::XiGModel::New
         (
             "XiGModel::New"
             "("
-            "    const hhuCombustionThermo& thermo,"
+            "    const psiuReactionThermo& thermo,"
             "    const compressible::RASModel& turbulence,"
             "    const volScalarField& Su"
             ")"

applications/solvers/combustion/PDRFoam/XiModels/XiGModels/instabilityG/instabilityG.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,7 +43,7 @@ namespace XiGModels
 Foam::XiGModels::instabilityG::instabilityG
 (
     const dictionary& XiGProperties,
-    const hhuCombustionThermo& thermo,
+    const psiuReactionThermo& thermo,
     const compressible::RASModel& turbulence,
     const volScalarField& Su
 )

applications/solvers/combustion/PDRFoam/XiModels/XiGModels/instabilityG/instabilityG.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -88,7 +88,7 @@ public:
         instabilityG
         (
             const dictionary& XiGProperties,
-            const hhuCombustionThermo& thermo,
+            const psiuReactionThermo& thermo,
             const compressible::RASModel& turbulence,
             const volScalarField& Su
         );

applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,7 +39,7 @@ namespace Foam
 Foam::XiModel::XiModel
 (
     const dictionary& XiProperties,
-    const hhuCombustionThermo& thermo,
+    const psiuReactionThermo& thermo,
     const compressible::RASModel& turbulence,
     const volScalarField& Su,
     const volScalarField& rho,

applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -91,7 +91,7 @@ SourceFiles
 #define XiModel_H
 
 #include "IOdictionary.H"
-#include "hhuCombustionThermo.H"
+#include "psiuReactionThermo.H"
 #include "RASModel.H"
 #include "multivariateSurfaceInterpolationScheme.H"
 #include "runTimeSelectionTables.H"
@@ -114,7 +114,7 @@ protected:
 
         dictionary XiModelCoeffs_;
 
-        const hhuCombustionThermo& thermo_;
+        const psiuReactionThermo& thermo_;
         const compressible::RASModel& turbulence_;
         const volScalarField& Su_;
         const volScalarField& rho_;
@@ -151,7 +151,7 @@ public:
             dictionary,
             (
                 const dictionary& XiProperties,
-                const hhuCombustionThermo& thermo,
+                const psiuReactionThermo& thermo,
                 const compressible::RASModel& turbulence,
                 const volScalarField& Su,
                 const volScalarField& rho,
@@ -176,7 +176,7 @@ public:
         static autoPtr<XiModel> New
         (
             const dictionary& XiProperties,
-            const hhuCombustionThermo& thermo,
+            const psiuReactionThermo& thermo,
             const compressible::RASModel& turbulence,
             const volScalarField& Su,
             const volScalarField& rho,
@@ -191,7 +191,7 @@ public:
         XiModel
         (
             const dictionary& XiProperties,
-            const hhuCombustionThermo& thermo,
+            const psiuReactionThermo& thermo,
             const compressible::RASModel& turbulence,
             const volScalarField& Su,
             const volScalarField& rho,

applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModelNew.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,7 +30,7 @@ License
 Foam::autoPtr<Foam::XiModel> Foam::XiModel::New
 (
     const dictionary& propDict,
-    const hhuCombustionThermo& thermo,
+    const psiuReactionThermo& thermo,
     const compressible::RASModel& turbulence,
     const volScalarField& Su,
     const volScalarField& rho,

applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,7 +43,7 @@ namespace XiModels
 Foam::XiModels::algebraic::algebraic
 (
     const dictionary& XiProperties,
-    const hhuCombustionThermo& thermo,
+    const psiuReactionThermo& thermo,
     const compressible::RASModel& turbulence,
     const volScalarField& Su,
     const volScalarField& rho,

applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -86,7 +86,7 @@ public:
         algebraic
         (
             const dictionary& XiProperties,
-            const hhuCombustionThermo& thermo,
+            const psiuReactionThermo& thermo,
             const compressible::RASModel& turbulence,
             const volScalarField& Su,
             const volScalarField& rho,

applications/solvers/combustion/PDRFoam/XiModels/fixed/fixed.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,7 +43,7 @@ namespace XiModels
 Foam::XiModels::fixed::fixed
 (
     const dictionary& XiProperties,
-    const hhuCombustionThermo& thermo,
+    const psiuReactionThermo& thermo,
     const compressible::RASModel& turbulence,
     const volScalarField& Su,
     const volScalarField& rho,

applications/solvers/combustion/PDRFoam/XiModels/fixed/fixed.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -74,7 +74,7 @@ public:
         fixed
         (
             const dictionary& XiProperties,
-            const hhuCombustionThermo& thermo,
+            const psiuReactionThermo& thermo,
             const compressible::RASModel& turbulence,
             const volScalarField& Su,
             const volScalarField& rho,

applications/solvers/combustion/PDRFoam/XiModels/transport/transport.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,7 +43,7 @@ namespace XiModels
 Foam::XiModels::transport::transport
 (
     const dictionary& XiProperties,
-    const hhuCombustionThermo& thermo,
+    const psiuReactionThermo& thermo,
     const compressible::RASModel& turbulence,
     const volScalarField& Su,
     const volScalarField& rho,

applications/solvers/combustion/PDRFoam/XiModels/transport/transport.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -86,7 +86,7 @@ public:
         transport
         (
             const dictionary& XiProperties,
-            const hhuCombustionThermo& thermo,
+            const psiuReactionThermo& thermo,
             const compressible::RASModel& turbulence,
             const volScalarField& Su,
             const volScalarField& rho,

applications/solvers/combustion/PDRFoam/bEqn.H

@@ -5,7 +5,7 @@ tmp<fv::convectionScheme<scalar> > mvConvection
         mesh,
         fields,
         phi,
-        mesh.divScheme("div(phi,ft_b_h_hu)")
+        mesh.divScheme("div(phi,ft_b_ha_hau)")
     )
 );
 

applications/solvers/combustion/PDRFoam/createFields.H

@@ -1,10 +1,10 @@
     Info<< "Reading thermophysical properties\n" << endl;
 
-    autoPtr<hhuCombustionThermo> pThermo
+    autoPtr<psiuReactionThermo> pThermo
     (
-        hhuCombustionThermo::New(mesh)
+        psiuReactionThermo::New(mesh)
     );
-    hhuCombustionThermo& thermo = pThermo();
+    psiuReactionThermo& thermo = pThermo();
     basicMultiComponentMixture& composition = thermo.composition();
 
     volScalarField rho
@@ -22,8 +22,8 @@
 
     volScalarField& p = thermo.p();
     const volScalarField& psi = thermo.psi();
-    volScalarField& h = thermo.h();
+    volScalarField& ha = thermo.he();
-    volScalarField& hu = thermo.hu();
+    volScalarField& hau = thermo.heu();
 
     volScalarField& b = composition.Y("b");
     Info<< "min(b) = " << min(b).value() << endl;
@@ -186,6 +186,6 @@
     }
 
     fields.add(b);
-    fields.add(h);
+    fields.add(ha);
-    fields.add(hu);
+    fields.add(hau);
     flameWrinkling->addXi(fields);

applications/solvers/combustion/PDRFoam/haEqn.H

@@ -1,9 +1,9 @@
 {
     solve
     (
-        betav*fvm::ddt(rho, h)
+        betav*fvm::ddt(rho, ha)
-      + mvConvection->fvmDiv(phi, h)
+      + mvConvection->fvmDiv(phi, ha)
-      - fvm::laplacian(Db, h)
+      - fvm::laplacian(Db, ha)
      ==
         betav*dpdt
       - betav*(fvc::ddt(rho, K) + fvc::div(phi, K))

applications/solvers/combustion/PDRFoam/hauEqn.H

@@ -0,0 +1,18 @@
+if (ign.ignited())
+{
+    solve
+    (
+        betav*fvm::ddt(rho, hau)
+      + mvConvection->fvmDiv(phi, hau)
+      - fvm::laplacian(Db, hau)
+
+    // These terms cannot be used in partially-premixed combustion due to
+    // the resultant inconsistency between ft and hau transport.
+    // A possible solution would be to solve for ftu as well as ft.
+    //- fvm::div(muEff*fvc::grad(b)/(b + 0.001), hau)
+    //+ fvm::Sp(fvc::div(muEff*fvc::grad(b)/(b + 0.001)), hau)
+
+     ==
+        betav*(dpdt - (fvc::ddt(rho, K) + fvc::div(phi, K)))*rho/thermo.rhou()
+    );
+}

applications/solvers/combustion/PDRFoam/huEqn.H

@@ -1,18 +0,0 @@
-if (ign.ignited())
-{
-    solve
-    (
-        betav*fvm::ddt(rho, hu)
-      + mvConvection->fvmDiv(phi, hu)
-      - fvm::laplacian(Db, hu)
-
-    // These terms cannot be used in partially-premixed combustion due to
-    // the resultant inconsistency between ft and hu transport.
-    // A possible solution would be to solve for ftu as well as ft.
-    //- fvm::div(muEff*fvc::grad(b)/(b + 0.001), hu)
-    //+ fvm::Sp(fvc::div(muEff*fvc::grad(b)/(b + 0.001)), hu)
-
-     ==
-        betav*(dpdt - (fvc::ddt(rho, K) + fvc::div(phi, K)))*rho/thermo.rhou()
-    );
-}

applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -64,7 +64,7 @@ Foam::laminarFlameSpeedModels::SCOPE::polynomial::polynomial
 Foam::laminarFlameSpeedModels::SCOPE::SCOPE
 (
     const dictionary& dict,
-    const hhuCombustionThermo& ct
+    const psiuReactionThermo& ct
 )
 :
     laminarFlameSpeed(dict, ct),
@@ -383,21 +383,21 @@ Foam::tmp<Foam::volScalarField> Foam::laminarFlameSpeedModels::SCOPE::Ma
 Foam::tmp<Foam::volScalarField>
 Foam::laminarFlameSpeedModels::SCOPE::Ma() const
 {
-    if (hhuCombustionThermo_.composition().contains("ft"))
+    if (psiuReactionThermo_.composition().contains("ft"))
     {
-        const volScalarField& ft = hhuCombustionThermo_.composition().Y("ft");
+        const volScalarField& ft = psiuReactionThermo_.composition().Y("ft");
 
         return Ma
         (
             dimensionedScalar
             (
-                hhuCombustionThermo_.lookup("stoichiometricAirFuelMassRatio")
+                psiuReactionThermo_.lookup("stoichiometricAirFuelMassRatio")
             )*ft/(scalar(1) - ft)
         );
     }
     else
     {
-        const fvMesh& mesh = hhuCombustionThermo_.p().mesh();
+        const fvMesh& mesh = psiuReactionThermo_.p().mesh();
 
         return tmp<volScalarField>
         (
@@ -422,17 +422,17 @@ Foam::laminarFlameSpeedModels::SCOPE::Ma() const
 Foam::tmp<Foam::volScalarField>
 Foam::laminarFlameSpeedModels::SCOPE::operator()() const
 {
-    if (hhuCombustionThermo_.composition().contains("ft"))
+    if (psiuReactionThermo_.composition().contains("ft"))
     {
-        const volScalarField& ft = hhuCombustionThermo_.composition().Y("ft");
+        const volScalarField& ft = psiuReactionThermo_.composition().Y("ft");
 
         return Su0pTphi
         (
-            hhuCombustionThermo_.p(),
+            psiuReactionThermo_.p(),
-            hhuCombustionThermo_.Tu(),
+            psiuReactionThermo_.Tu(),
             dimensionedScalar
             (
-                hhuCombustionThermo_.lookup("stoichiometricAirFuelMassRatio")
+                psiuReactionThermo_.lookup("stoichiometricAirFuelMassRatio")
             )*ft/(scalar(1) - ft)
         );
     }
@@ -440,8 +440,8 @@ Foam::laminarFlameSpeedModels::SCOPE::operator()() const
     {
         return Su0pTphi
         (
-            hhuCombustionThermo_.p(),
+            psiuReactionThermo_.p(),
-            hhuCombustionThermo_.Tu(),
+            psiuReactionThermo_.Tu(),
             equivalenceRatio_
         );
     }

applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -186,11 +186,11 @@ public:
 
     // Constructors
 
-        //- Construct from dictionary and hhuCombustionThermo
+        //- Construct from dictionary and psiuReactionThermo
         SCOPE
         (
             const dictionary&,
-            const hhuCombustionThermo&
+            const psiuReactionThermo&
         );
 
 

applications/solvers/combustion/XiFoam/XiFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,7 +50,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
-#include "hhuCombustionThermo.H"
+#include "psiuReactionThermo.H"
 #include "turbulenceModel.H"
 #include "laminarFlameSpeed.H"
 #include "ignition.H"
@@ -97,12 +97,12 @@ int main(int argc, char *argv[])
 
             #include "ftEqn.H"
             #include "bEqn.H"
-            #include "huEqn.H"
+            #include "hauEqn.H"
-            #include "hEqn.H"
+            #include "haEqn.H"
 
             if (!ign.ignited())
             {
-                hu == h;
+                hau == ha;
             }
 
             // --- Pressure corrector loop

applications/solvers/combustion/XiFoam/createFields.H

@@ -1,10 +1,10 @@
     Info<< "Reading thermophysical properties\n" << endl;
 
-    autoPtr<hhuCombustionThermo> pThermo
+    autoPtr<psiuReactionThermo> pThermo
     (
-        hhuCombustionThermo::New(mesh)
+        psiuReactionThermo::New(mesh)
     );
-    hhuCombustionThermo& thermo = pThermo();
+    psiuReactionThermo& thermo = pThermo();
     basicMultiComponentMixture& composition = thermo.composition();
 
     volScalarField rho
@@ -22,8 +22,8 @@
 
     volScalarField& p = thermo.p();
     const volScalarField& psi = thermo.psi();
-    volScalarField& h = thermo.h();
+    volScalarField& ha = thermo.he();
-    volScalarField& hu = thermo.hu();
+    volScalarField& hau = thermo.heu();
 
     volScalarField& b = composition.Y("b");
     Info<< "min(b) = " << min(b).value() << endl;
@@ -128,5 +128,5 @@
     }
 
     fields.add(b);
-    fields.add(h);
+    fields.add(ha);
-    fields.add(hu);
+    fields.add(hau);

applications/solvers/combustion/XiFoam/ftEqn.H

@@ -5,7 +5,7 @@ tmp<fv::convectionScheme<scalar> > mvConvection
         mesh,
         fields,
         phi,
-        mesh.divScheme("div(phi,ft_b_h_hu)")
+        mesh.divScheme("div(phi,ft_b_ha_hau)")
     )
 );
 

applications/solvers/combustion/XiFoam/hEqn.H

@@ -1,16 +0,0 @@
-{
-    fvScalarMatrix hEqn
-    (
-        fvm::ddt(rho, h)
-      + mvConvection->fvmDiv(phi, h)
-      - fvm::laplacian(turbulence->alphaEff(), h)
-     ==
-        dpdt
-      - (fvc::ddt(rho, K) + fvc::div(phi, K))
-    );
-
-    hEqn.relax();
-    hEqn.solve();
-
-    thermo.correct();
-}

applications/solvers/combustion/XiFoam/haEqn.H

@@ -0,0 +1,16 @@
+{
+    fvScalarMatrix haEqn
+    (
+        fvm::ddt(rho, ha)
+      + mvConvection->fvmDiv(phi, ha)
+      - fvm::laplacian(turbulence->alphaEff(), ha)
+     ==
+        dpdt
+      - (fvc::ddt(rho, K) + fvc::div(phi, K))
+    );
+
+    haEqn.relax();
+    haEqn.solve();
+
+    thermo.correct();
+}

applications/solvers/combustion/XiFoam/hauEqn.H

@@ -0,0 +1,18 @@
+if (ign.ignited())
+{
+    solve
+    (
+        fvm::ddt(rho, hau)
+      + mvConvection->fvmDiv(phi, hau)
+      - fvm::laplacian(turbulence->alphaEff(), hau)
+
+    // These terms cannot be used in partially-premixed combustion due to
+    // the resultant inconsistency between ft and hau transport.
+    // A possible solution would be to solve for ftu as well as ft.
+    //- fvm::div(muEff*fvc::grad(b)/(b + 0.001), hau)
+    //+ fvm::Sp(fvc::div(muEff*fvc::grad(b)/(b + 0.001)), hau)
+
+    ==
+        (dpdt - (fvc::ddt(rho, K) + fvc::div(phi, K)))*rho/thermo.rhou()
+    );
+}

applications/solvers/combustion/XiFoam/huEqn.H

@@ -1,18 +0,0 @@
-if (ign.ignited())
-{
-    solve
-    (
-        fvm::ddt(rho, hu)
-      + mvConvection->fvmDiv(phi, hu)
-      - fvm::laplacian(turbulence->alphaEff(), hu)
-
-    // These terms cannot be used in partially-premixed combustion due to
-    // the resultant inconsistency between ft and hu transport.
-    // A possible solution would be to solve for ftu as well as ft.
-    //- fvm::div(muEff*fvc::grad(b)/(b + 0.001), hu)
-    //+ fvm::Sp(fvc::div(muEff*fvc::grad(b)/(b + 0.001)), hu)
-
-    ==
-        (dpdt - (fvc::ddt(rho, K) + fvc::div(phi, K)))*rho/thermo.rhou()
-    );
-}

applications/solvers/combustion/chemFoam/chemFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -34,7 +34,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
-#include "hCombustionThermo.H"
+#include "psiReactionThermo.H"
 #include "turbulenceModel.H"
 #include "psiChemistryModel.H"
 #include "chemistrySolver.H"

applications/solvers/combustion/chemFoam/createFields.H

@@ -29,7 +29,7 @@
     psiChemistryModel& chemistry = pChemistry();
     scalar dtChem = refCast<const psiChemistryModel>(chemistry).deltaTChem()[0];
 
-    hsCombustionThermo& thermo = chemistry.thermo();
+    psiReactionThermo& thermo = chemistry.thermo();
     basicMultiComponentMixture& composition = thermo.composition();
     PtrList<volScalarField>& Y = composition.Y();
 
@@ -47,7 +47,7 @@
     );
 
     volScalarField& p = thermo.p();
-    volScalarField& hs = thermo.hs();
+    volScalarField& hs = thermo.he();
 
     volScalarField Rspecific
     (

applications/solvers/combustion/chemFoam/readInitialConditions.H

@@ -90,7 +90,7 @@
         hs0 += Y0[i]*specieData[i].Hs(T0);
     }
 
-    hs = dimensionedScalar("hs", dimEnergy/dimMass, hs0);
+    hs = dimensionedScalar("h", dimEnergy/dimMass, hs0);
 
     thermo.correct();
 
@@ -107,5 +107,3 @@
         << " T   = " << thermo.T()[0] << " [K] " << nl
         << " rho = " << rho[0] << " [kg/m3]" << nl
         << endl;
-
-

applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,7 +32,7 @@ Description
 #include "fvCFD.H"
 #include "engineTime.H"
 #include "engineMesh.H"
-#include "basicPsiThermo.H"
+#include "psiThermo.H"
 #include "turbulenceModel.H"
 #include "OFstream.H"
 #include "pimpleControl.H"

applications/solvers/combustion/coldEngineFoam/createFields.H

@@ -1,10 +1,10 @@
     Info<< "Reading thermophysical properties\n" << endl;
 
-    autoPtr<basicPsiThermo> pThermo
+    autoPtr<psiThermo> pThermo
     (
-        basicPsiThermo::New(mesh)
+        psiThermo::New(mesh)
     );
-    basicPsiThermo& thermo = pThermo();
+    psiThermo& thermo = pThermo();
 
     volScalarField rho
     (
@@ -21,7 +21,7 @@
 
     volScalarField& p = thermo.p();
     const volScalarField& psi = thermo.psi();
-    volScalarField& h = thermo.h();
+    volScalarField& h = thermo.he();
     const volScalarField& T = thermo.T();
 
 

applications/solvers/combustion/engineFoam/engineFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,7 +51,7 @@ Description
 #include "fvCFD.H"
 #include "engineTime.H"
 #include "engineMesh.H"
-#include "hhuCombustionThermo.H"
+#include "psiuReactionThermo.H"
 #include "turbulenceModel.H"
 #include "laminarFlameSpeed.H"
 #include "ignition.H"
@@ -103,12 +103,12 @@ int main(int argc, char *argv[])
 
             #include "ftEqn.H"
             #include "bEqn.H"
-            #include "huEqn.H"
+            #include "hauEqn.H"
-            #include "hEqn.H"
+            #include "haEqn.H"
 
             if (!ign.ignited())
             {
-                hu == h;
+                hau == ha;
             }
 
             // --- Pressure corrector loop

applications/solvers/combustion/fireFoam/YhsEqn.H

@@ -5,7 +5,7 @@ tmp<fv::convectionScheme<scalar> > mvConvection
         mesh,
         fields,
         phi,
-        mesh.divScheme("div(phi,Yi_hs)")
+        mesh.divScheme("div(phi,Yi_h)")
     )
 );
 {
@@ -56,7 +56,7 @@ tmp<fv::convectionScheme<scalar> > mvConvection
         dpdt
       - (fvc::ddt(rho, K) + fvc::div(phi, K))
       + combustion->Sh()
-      + radiation->Shs(thermo)
+      + radiation->Sh(thermo)
       + parcels.Sh(hs)
       + surfaceFilm.Sh()
     );

applications/solvers/combustion/fireFoam/createFields.H

@@ -10,7 +10,7 @@
 
     Info<< "Reading thermophysical properties\n" << endl;
 
-    hsCombustionThermo& thermo = combustion->thermo();
+    psiReactionThermo& thermo = combustion->thermo();
 
     SLGThermo slgThermo(mesh, thermo);
 
@@ -34,7 +34,7 @@
     );
 
     volScalarField& p = thermo.p();
-    volScalarField& hs = thermo.hs();
+    volScalarField& hs = thermo.he();
     const volScalarField& T = thermo.T();
     const volScalarField& psi = thermo.psi();
 

applications/solvers/combustion/reactingFoam/YEqn.H

@@ -10,8 +10,8 @@ tmp<fv::convectionScheme<scalar> > mvConvection
 );
 
 {
-    combustion->correct();
+    reaction->correct();
-    dQ = combustion->dQ();
+    dQ = reaction->dQ();
     label inertIndex = -1;
     volScalarField Yt(0.0*Y[0]);
 
@@ -27,7 +27,7 @@ tmp<fv::convectionScheme<scalar> > mvConvection
               + mvConvection->fvmDiv(phi, Yi)
               - fvm::laplacian(turbulence->muEff(), Yi)
              ==
-                combustion->R(Yi)
+                reaction->R(Yi)
             );
 
             YiEqn.relax();

applications/solvers/combustion/reactingFoam/createFields.H

@@ -1,6 +1,6 @@
-Info<< "Creating combustion model\n" << endl;
+Info<< "Creating reaction model\n" << endl;
 
-autoPtr<combustionModels::psiChemistryCombustionModel> combustion
+autoPtr<combustionModels::psiChemistryCombustionModel> reaction
 (
     combustionModels::psiChemistryCombustionModel::New
     (
@@ -8,9 +8,9 @@ autoPtr<combustionModels::psiChemistryCombustionModel> combustion
     )
 );
 
-psiChemistryModel& chemistry = combustion->pChemistry();
+psiChemistryModel& chemistry = reaction->pChemistry();
 
-hsCombustionThermo& thermo = chemistry.thermo();
+psiReactionThermo& thermo = chemistry.thermo();
 
 basicMultiComponentMixture& composition = thermo.composition();
 PtrList<volScalarField>& Y = composition.Y();
@@ -45,7 +45,7 @@ volVectorField U
 
 volScalarField& p = thermo.p();
 const volScalarField& psi = thermo.psi();
-volScalarField& hs = thermo.hs();
+volScalarField& hs = thermo.he();
 const volScalarField& T = thermo.T();
 
 #include "compressibleCreatePhi.H"
@@ -62,8 +62,8 @@ autoPtr<compressible::turbulenceModel> turbulence
     )
 );
 
-// Set the turbulence into the combustion model
+// Set the turbulence into the reaction model
-combustion->setTurbulence(turbulence());
+reaction->setTurbulence(turbulence());
 
 
 Info<< "Creating field dpdt\n" << endl;

applications/solvers/combustion/reactingFoam/hsEqn.H

@@ -8,7 +8,7 @@
      ==
         dpdt
       - (fvc::ddt(rho, K) + fvc::div(phi, K))
-      + combustion->Sh()
+      + reaction->Sh()
     );
 
     hsEqn.relax();

applications/solvers/combustion/rhoReactingFoam/YEqn.H

@@ -10,8 +10,8 @@ tmp<fv::convectionScheme<scalar> > mvConvection
 );
 
 {
-    combustion->correct();
+    reaction->correct();
-    dQ = combustion->dQ();
+    dQ = reaction->dQ();
     label inertIndex = -1;
     volScalarField Yt(0.0*Y[0]);
 
@@ -27,7 +27,7 @@ tmp<fv::convectionScheme<scalar> > mvConvection
               + mvConvection->fvmDiv(phi, Yi)
               - fvm::laplacian(turbulence->muEff(), Yi)
              ==
-                combustion->R(Yi)
+                reaction->R(Yi)
             );
 
             YiEqn.relax();

applications/solvers/combustion/rhoReactingFoam/createFields.H

@@ -1,6 +1,6 @@
-Info<< "Creating combustion model\n" << endl;
+Info<< "Creating reaction model\n" << endl;
 
-autoPtr<combustionModels::rhoChemistryCombustionModel> combustion
+autoPtr<combustionModels::rhoChemistryCombustionModel> reaction
 (
     combustionModels::rhoChemistryCombustionModel::New
     (
@@ -8,9 +8,9 @@ autoPtr<combustionModels::rhoChemistryCombustionModel> combustion
     )
 );
 
-rhoChemistryModel& chemistry = combustion->pChemistry();
+rhoChemistryModel& chemistry = reaction->pChemistry();
 
-hsReactionThermo& thermo = chemistry.thermo();
+rhoReactionThermo& thermo = chemistry.thermo();
 
 basicMultiComponentMixture& composition = thermo.composition();
 PtrList<volScalarField>& Y = composition.Y();
@@ -45,7 +45,7 @@ volVectorField U
 
 volScalarField& p = thermo.p();
 const volScalarField& psi = thermo.psi();
-volScalarField& hs = thermo.hs();
+volScalarField& hs = thermo.he();
 const volScalarField& T = thermo.T();
 
 
@@ -64,8 +64,8 @@ autoPtr<compressible::turbulenceModel> turbulence
     )
 );
 
-// Set the turbulence into the combustion model
+// Set the turbulence into the reaction model
-combustion->setTurbulence(turbulence());
+reaction->setTurbulence(turbulence());
 
 
 Info<< "Creating field dpdt\n" << endl;

applications/solvers/combustion/rhoReactingFoam/hsEqn.H

@@ -8,7 +8,7 @@
      ==
         dpdt
       - (fvc::ddt(rho, K) + fvc::div(phi, K))
-      + combustion->Sh()
+      + reaction->Sh()
     );
 
     hsEqn.relax();

applications/solvers/compressible/rhoCentralFoam/createFields.H

@@ -1,13 +1,13 @@
 Info<< "Reading thermophysical properties\n" << endl;
 
-autoPtr<basicPsiThermo> pThermo
+autoPtr<psiThermo> pThermo
 (
-    basicPsiThermo::New(mesh)
+    psiThermo::New(mesh)
 );
-basicPsiThermo& thermo = pThermo();
+psiThermo& thermo = pThermo();
 
 volScalarField& p = thermo.p();
-volScalarField& e = thermo.e();
+volScalarField& e = thermo.he();
 const volScalarField& T = thermo.T();
 const volScalarField& psi = thermo.psi();
 const volScalarField& mu = thermo.mu();

applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,7 +31,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
-#include "basicPsiThermo.H"
+#include "psiThermo.H"
 #include "turbulenceModel.H"
 #include "zeroGradientFvPatchFields.H"
 #include "fixedRhoFvPatchScalarField.H"

applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,7 +31,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
-#include "basicPsiThermo.H"
+#include "psiThermo.H"
 #include "turbulenceModel.H"
 #include "zeroGradientFvPatchFields.H"
 #include "fixedRhoFvPatchScalarField.H"

applications/solvers/compressible/rhoPimpleFoam/createFields.H

@@ -1,13 +1,13 @@
     Info<< "Reading thermophysical properties\n" << endl;
 
-    autoPtr<basicPsiThermo> pThermo
+    autoPtr<psiThermo> pThermo
     (
-        basicPsiThermo::New(mesh)
+        psiThermo::New(mesh)
     );
-    basicPsiThermo& thermo = pThermo();
+    psiThermo& thermo = pThermo();
 
     volScalarField& p = thermo.p();
-    volScalarField& h = thermo.h();
+    volScalarField& h = thermo.he();
     const volScalarField& psi = thermo.psi();
 
     volScalarField rho

applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C

@@ -34,7 +34,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
-#include "basicPsiThermo.H"
+#include "psiThermo.H"
 #include "turbulenceModel.H"
 #include "bound.H"
 #include "pimpleControl.H"

applications/solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/rhoPimplecFoam.C

@@ -34,7 +34,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
-#include "basicPsiThermo.H"
+#include "psiThermo.H"
 #include "turbulenceModel.H"
 #include "bound.H"
 #include "pimpleControl.H"

applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFLTSPimpleFoam/rhoPorousMRFLTSPimpleFoam.C

@@ -35,7 +35,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
-#include "basicPsiThermo.H"
+#include "psiThermo.H"
 #include "turbulenceModel.H"
 #include "MRFZones.H"
 #include "porousZones.H"

applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/rhoPorousMRFPimpleFoam.C

@@ -34,7 +34,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
-#include "basicPsiThermo.H"
+#include "psiThermo.H"
 #include "turbulenceModel.H"
 #include "bound.H"
 #include "MRFZones.H"

applications/solvers/compressible/rhoSimpleFoam/createFields.H

@@ -1,10 +1,10 @@
     Info<< "Reading thermophysical properties\n" << endl;
 
-    autoPtr<basicPsiThermo> pThermo
+    autoPtr<psiThermo> pThermo
     (
-        basicPsiThermo::New(mesh)
+        psiThermo::New(mesh)
     );
-    basicPsiThermo& thermo = pThermo();
+    psiThermo& thermo = pThermo();
 
     volScalarField rho
     (
@@ -20,7 +20,7 @@
     );
 
     volScalarField& p = thermo.p();
-    volScalarField& e = thermo.e();
+    volScalarField& e = thermo.he();
     const volScalarField& psi = thermo.psi();
 
     Info<< "Reading field U\n" << endl;

applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/rhoPorousMRFSimpleFoam.C

@@ -32,7 +32,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
-#include "basicPsiThermo.H"
+#include "psiThermo.H"
 #include "RASModel.H"
 #include "MRFZones.H"
 #include "thermalPorousZones.H"

applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C

@@ -31,7 +31,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
-#include "basicPsiThermo.H"
+#include "psiThermo.H"
 #include "RASModel.H"
 #include "simpleControl.H"
 

applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/rhoSimplecFoam.C

@@ -31,7 +31,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
-#include "basicPsiThermo.H"
+#include "psiThermo.H"
 #include "RASModel.H"
 #include "mixedFvPatchFields.H"
 #include "bound.H"

applications/solvers/compressible/sonicFoam/createFields.H

@@ -1,13 +1,13 @@
     Info<< "Reading thermophysical properties\n" << endl;
 
-    autoPtr<basicPsiThermo> pThermo
+    autoPtr<psiThermo> pThermo
     (
-        basicPsiThermo::New(mesh)
+        psiThermo::New(mesh)
     );
-    basicPsiThermo& thermo = pThermo();
+    psiThermo& thermo = pThermo();
 
     volScalarField& p = thermo.p();
-    volScalarField& e = thermo.e();
+    volScalarField& e = thermo.he();
     const volScalarField& psi = thermo.psi();
 
     volScalarField rho

applications/solvers/compressible/sonicFoam/sonicDyMFoam/sonicDyMFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,7 +31,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
-#include "basicPsiThermo.H"
+#include "psiThermo.H"
 #include "turbulenceModel.H"
 #include "motionSolver.H"
 

applications/solvers/compressible/sonicFoam/sonicFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,7 +31,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
-#include "basicPsiThermo.H"
+#include "psiThermo.H"
 #include "turbulenceModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -34,7 +34,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
-#include "basicRhoThermo.H"
+#include "rhoThermo.H"
 #include "turbulenceModel.H"
 #include "fixedGradientFvPatchFields.H"
 #include "pimpleControl.H"

applications/solvers/heatTransfer/buoyantPimpleFoam/createFields.H

@@ -1,10 +1,10 @@
     Info<< "Reading thermophysical properties\n" << endl;
 
-    autoPtr<basicRhoThermo> pThermo
+    autoPtr<rhoThermo> pThermo
     (
-        basicRhoThermo::New(mesh)
+        rhoThermo::New(mesh)
     );
-    basicRhoThermo& thermo = pThermo();
+    rhoThermo& thermo = pThermo();
 
     volScalarField rho
     (
@@ -20,7 +20,7 @@
     );
 
     volScalarField& p = thermo.p();
-    volScalarField& h = thermo.h();
+    volScalarField& h = thermo.he();
     const volScalarField& psi = thermo.psi();
 
 

applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,7 +30,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
-#include "basicPsiThermo.H"
+#include "psiThermo.H"
 #include "RASModel.H"
 #include "fixedGradientFvPatchFields.H"
 #include "simpleControl.H"

applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H

@@ -1,10 +1,10 @@
     Info<< "Reading thermophysical properties\n" << endl;
 
-    autoPtr<basicPsiThermo> pThermo
+    autoPtr<psiThermo> pThermo
     (
-        basicPsiThermo::New(mesh)
+        psiThermo::New(mesh)
     );
-    basicPsiThermo& thermo = pThermo();
+    psiThermo& thermo = pThermo();
 
     volScalarField rho
     (
@@ -20,7 +20,7 @@
     );
 
     volScalarField& p = thermo.p();
-    volScalarField& h = thermo.h();
+    volScalarField& h = thermo.he();
     const volScalarField& psi = thermo.psi();
 
     Info<< "Reading field U\n" << endl;

applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/buoyantSimpleRadiationFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,7 +31,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
-#include "basicPsiThermo.H"
+#include "psiThermo.H"
 #include "RASModel.H"
 #include "fixedGradientFvPatchFields.H"
 #include "radiationModel.H"

applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,7 +37,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
-#include "basicRhoThermo.H"
+#include "rhoThermo.H"
 #include "turbulenceModel.H"
 #include "fixedGradientFvPatchFields.H"
 #include "regionProperties.H"

applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/chtMultiRegionSimpleFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,7 +30,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
-#include "basicRhoThermo.H"
+#include "rhoThermo.H"
 #include "turbulenceModel.H"
 #include "fixedGradientFvPatchFields.H"
 #include "regionProperties.H"

applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/createFluidFields.H

@@ -1,7 +1,6 @@
     // Initialise fluid field pointer lists
-    PtrList<basicRhoThermo> thermoFluid(fluidRegions.size());
+    PtrList<rhoThermo> thermoFluid(fluidRegions.size());
     PtrList<volScalarField> rhoFluid(fluidRegions.size());
-    PtrList<volScalarField> kappaFluid(fluidRegions.size());
     PtrList<volVectorField> UFluid(fluidRegions.size());
     PtrList<surfaceScalarField> phiFluid(fluidRegions.size());
     PtrList<uniformDimensionedVectorField> gFluid(fluidRegions.size());
@@ -32,7 +31,7 @@
         thermoFluid.set
         (
             i,
-            basicRhoThermo::New(fluidRegions[i]).ptr()
+            rhoThermo::New(fluidRegions[i]).ptr()
         );
 
         Info<< "    Adding to rhoFluid\n" << endl;
@@ -53,24 +52,6 @@
             )
         );
 
-        Info<< "    Adding to kappaFluid\n" << endl;
-        kappaFluid.set
-        (
-            i,
-            new volScalarField
-            (
-                IOobject
-                (
-                    "kappa",
-                    runTime.timeName(),
-                    fluidRegions[i],
-                    IOobject::NO_READ,
-                    IOobject::NO_WRITE
-                ),
-                thermoFluid[i].Cp()*thermoFluid[i].alpha()
-            )
-        );
-
         Info<< "    Adding to UFluid\n" << endl;
         UFluid.set
         (

applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/pEqn.H

@@ -69,7 +69,4 @@
 
     Info<< "Min/max rho:" << min(rho).value() << ' '
         << max(rho).value() << endl;
-
-    // Update thermal conductivity
-    kappa = thermo.Cp()*turb.alphaEff();
 }

applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/setRegionFluidFields.H

@@ -1,8 +1,7 @@
     const fvMesh& mesh = fluidRegions[i];
 
-    basicRhoThermo& thermo = thermoFluid[i];
+    rhoThermo& thermo = thermoFluid[i];
     volScalarField& rho = rhoFluid[i];
-    volScalarField& kappa = kappaFluid[i];
     volVectorField& U = UFluid[i];
     surfaceScalarField& phi = phiFluid[i];
 
@@ -10,7 +9,7 @@
 
     volScalarField& p = thermo.p();
     const volScalarField& psi = thermo.psi();
-    volScalarField& h = thermo.h();
+    volScalarField& h = thermo.he();
 
     IObasicSourceList& sources = heatSources[i];
 

applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/porousFluid/createPorousFluidFields.H

@@ -1,5 +1,5 @@
     // Initialise porous field pointer lists
-    PtrList<basicRhoThermo> thermoPorous(porousFluidRegions.size());
+    PtrList<rhoThermo> thermoPorous(porousFluidRegions.size());
     PtrList<volScalarField> rhoPorous(porousFluidRegions.size());
     PtrList<volScalarField> kappaPorous(porousFluidRegions.size());
     PtrList<volVectorField> UPorous(porousFluidRegions.size());
@@ -32,7 +32,7 @@
         thermoPorous.set
         (
             i,
-            basicRhoThermo::New(porousFluidRegions[i]).ptr()
+            rhoThermo::New(porousFluidRegions[i]).ptr()
         );
 
         Info<< "    Adding to rhoPorous\n" << endl;

applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/porousFluid/setPorousFluidFields.H

@@ -1,7 +1,6 @@
-
     const fvMesh& porousMesh = porousFluidRegions[i];
 
-    basicRhoThermo& porousThermo = thermoPorous[i];
+    rhoThermo& porousThermo = thermoPorous[i];
     volScalarField& porousRho = rhoPorous[i];
 
     volVectorField& porousU = UPorous[i];
@@ -11,7 +10,7 @@
 
     volScalarField& porousP = porousThermo.p();
     const volScalarField& porousPsi = porousThermo.psi();
-    volScalarField& porousH = porousThermo.h();
+    volScalarField& porousH = porousThermo.he();
 
     const dimensionedScalar initialMass
     (
@@ -27,5 +26,3 @@
 
     const scalar rhoMax = rhoMaxPorous[i].value();
     const scalar rhoMin = rhoMinPorous[i].value();
-
-

applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/porousSolid/setPorousRegionSolidFields.H

@@ -15,6 +15,9 @@
     const volScalarField& kappa = tkappa();
     //const volSymmTensorField& K = tK();
 
+    tmp<volScalarField> trhoCp = cp*rho;
+    const volScalarField& rhoCp = trhoCp();
+
     volScalarField& T = thermo.T();
 
     IObasicSourceList& sources = solidHeatSources[i];

applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/porousSolid/solvePorousSolid.H

@@ -4,7 +4,7 @@
         tmp<fvScalarMatrix> TEqn
         (
           - fvm::laplacian(betav*kappa, T, "laplacian(K,T)")
-          + sources(rho, T)
+          + sources(rhoCp, T)
         );
 
         TEqn().relax();

applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H

@@ -1,7 +1,6 @@
     // Initialise fluid field pointer lists
-    PtrList<basicRhoThermo> thermoFluid(fluidRegions.size());
+    PtrList<rhoThermo> thermoFluid(fluidRegions.size());
     PtrList<volScalarField> rhoFluid(fluidRegions.size());
-    PtrList<volScalarField> kappaFluid(fluidRegions.size());
     PtrList<volVectorField> UFluid(fluidRegions.size());
     PtrList<surfaceScalarField> phiFluid(fluidRegions.size());
     PtrList<uniformDimensionedVectorField> gFluid(fluidRegions.size());
@@ -29,7 +28,7 @@
         thermoFluid.set
         (
             i,
-            basicRhoThermo::New(fluidRegions[i]).ptr()
+            rhoThermo::New(fluidRegions[i]).ptr()
         );
 
         Info<< "    Adding to rhoFluid\n" << endl;
@@ -50,24 +49,6 @@
             )
         );
 
-        Info<< "    Adding to kappaFluid\n" << endl;
-        kappaFluid.set
-        (
-            i,
-            new volScalarField
-            (
-                IOobject
-                (
-                    "kappa",
-                    runTime.timeName(),
-                    fluidRegions[i],
-                    IOobject::NO_READ,
-                    IOobject::NO_WRITE
-                ),
-                thermoFluid[i].Cp()*thermoFluid[i].alpha()
-            )
-        );
-
         Info<< "    Adding to UFluid\n" << endl;
         UFluid.set
         (

applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/pEqn.H

@@ -92,7 +92,4 @@
         rho = thermo.rho();
         p_rgh = p - rho*gh;
     }
-
-    // Update thermal conductivity
-    kappa = thermoFluid[i].Cp()*turb.alphaEff();
 }

applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H

@@ -1,8 +1,7 @@
     fvMesh& mesh = fluidRegions[i];
 
-    basicRhoThermo& thermo = thermoFluid[i];
+    rhoThermo& thermo = thermoFluid[i];
     volScalarField& rho = rhoFluid[i];
-    volScalarField& kappa = kappaFluid[i];
     volVectorField& U = UFluid[i];
     surfaceScalarField& phi = phiFluid[i];
 
@@ -12,7 +11,7 @@
 
     volScalarField& p = thermo.p();
     const volScalarField& psi = thermo.psi();
-    volScalarField& h = thermo.h();
+    volScalarField& h = thermo.he();
 
     volScalarField& p_rgh = p_rghFluid[i];
     const volScalarField& gh = ghFluid[i];

applications/solvers/heatTransfer/chtMultiRegionFoam/porousFluid/createPorousFluidFields.H

@@ -1,5 +1,5 @@
     // Initialise porous field pointer lists
-    PtrList<basicRhoThermo> thermoPorous(porousFluidRegions.size());
+    PtrList<rhoThermo> thermoPorous(porousFluidRegions.size());
     PtrList<volScalarField> rhoPorous(porousFluidRegions.size());
     PtrList<volVectorField> UPorous(porousFluidRegions.size());
     PtrList<surfaceScalarField> phiPorous(porousFluidRegions.size());
@@ -27,7 +27,7 @@
         thermoPorous.set
         (
             i,
-            basicRhoThermo::New(porousFluidRegions[i]).ptr()
+            rhoThermo::New(porousFluidRegions[i]).ptr()
         );
 
         Info<< "    Adding to rhoPorous\n" << endl;

applications/solvers/heatTransfer/chtMultiRegionFoam/porousFluid/setPorousFluidFields.H

@@ -1,7 +1,6 @@
-
     fvMesh& porousMesh = porousFluidRegions[i];
 
-    basicRhoThermo& porousThermo = thermoPorous[i];
+    rhoThermo& porousThermo = thermoPorous[i];
     volScalarField& porousRho = rhoPorous[i];
 
     volVectorField& porousU = UPorous[i];
@@ -13,6 +12,6 @@
 
     volScalarField& porousP = porousThermo.p();
     const volScalarField& porousPsi = porousThermo.psi();
-    volScalarField& porousH = porousThermo.h();
+    volScalarField& porousH = porousThermo.he();
 
     IObasicSourceList& porousSources = heatPorousSources[i];

applications/solvers/heatTransfer/chtMultiRegionFoam/porousSolid/setPorousRegionSolidFields.H

@@ -15,6 +15,9 @@
     const volScalarField& kappa = tkappa();
     //const volSymmTensorField& K = tK();
 
+    tmp<volScalarField> trhoCp = cp*rho;
+    const volScalarField& rhoCp = trhoCp();
+
     volScalarField& T = thermo.T();
 
     IObasicSourceList& sources = solidHeatSources[i];

applications/solvers/heatTransfer/chtMultiRegionFoam/porousSolid/solvePorousSolid.H

@@ -10,7 +10,7 @@ if (finalIter)
         (
             fvm::ddt(betav*rho*cp, T)
           - fvm::laplacian(betav*kappa, T, "laplacian(K,T)")
-          + sources(rho, T)
+          + sources(rhoCp, T)
         );
 
         TEqn().relax();

applications/solvers/lagrangian/LTSReactingParcelFoam/createFields.H

@@ -10,7 +10,7 @@
 
     rhoChemistryModel& chemistry = combustion->pChemistry();
 
-    hsReactionThermo& thermo = chemistry.thermo();
+    rhoReactionThermo& thermo = chemistry.thermo();
 
     SLGThermo slgThermo(mesh, thermo);
 
@@ -28,7 +28,7 @@
     }
 
     volScalarField& p = thermo.p();
-    volScalarField& hs = thermo.hs();
+    volScalarField& hs = thermo.he();
     const volScalarField& T = thermo.T();
     const volScalarField& psi = thermo.psi();
 

applications/solvers/lagrangian/LTSReactingParcelFoam/hsEqn.H

@@ -7,7 +7,7 @@
      ==
       - fvc::div(phi, 0.5*magSqr(U), "div(phi,K)")
       + parcels.Sh(hs)
-      + radiation->Shs(thermo)
+      + radiation->Sh(thermo)
       + combustion->Sh()
       + sources(rho, hs)
     );