Rationalised reactionThermo -> multicomponentThermo

Now that the reaction system, chemistry and combustion models are completely
separate from the multicomponent mixture thermophysical properties package that
supports them it is inconsistent that thermo is named reactionThermo and the
name multicomponentThermo better describes the purpose and functionality.

applications/solvers/combustion/XiFoam/Make/options

@@ -3,7 +3,7 @@ EXE_INC = \
     -I$(LIB_SRC)/physicalProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/multicomponentThermo/lnInclude \
     -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \
     -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \
     -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \
@@ -18,7 +18,7 @@ EXE_LIBS = \
     -lcompressibleMomentumTransportModels \
     -lthermophysicalTransportModels \
     -lfluidThermophysicalModels \
-    -lreactionThermophysicalModels \
+    -lmulticomponentThermophysicalModels \
     -lspecie \
     -llaminarFlameSpeedModels \
     -lfiniteVolume \

applications/solvers/combustion/XiFoam/PDRFoam/Make/options

@@ -24,7 +24,7 @@ EXE_INC = \
     -I$(LIB_SRC)/physicalProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/multicomponentThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/laminarFlameSpeed/lnInclude \
     -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \
     -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \
@@ -37,7 +37,7 @@ EXE_LIBS = \
     -lXiIgnition \
     -lmeshTools \
     -lfluidThermophysicalModels \
-    -lreactionThermophysicalModels \
+    -lmulticomponentThermophysicalModels \
     -lspecie \
     -lmomentumTransportModels \
     -lcompressibleMomentumTransportModels \

applications/solvers/combustion/XiFoam/PDRFoam/PDRFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -68,7 +68,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
-#include "psiuReactionThermo.H"
+#include "psiuMulticomponentThermo.H"
 #include "compressibleMomentumTransportModels.H"
 #include "fluidThermophysicalTransportModel.H"
 #include "laminarFlameSpeed.H"

applications/solvers/combustion/XiFoam/PDRFoam/PDRFoamAutoRefine.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -56,7 +56,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
-#include "psiuReactionThermo.H"
+#include "psiuMulticomponentThermo.H"
 #include "compressibleMomentumTransportModels.H"
 #include "fluidThermophysicalTransportModel.H"
 #include "laminarFlameSpeed.H"

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

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

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

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -104,7 +104,7 @@ public:
         basicSubGrid
         (
             const dictionary& XiEqProperties,
-            const psiuReactionThermo& thermo,
+            const psiuMulticomponentThermo& thermo,
             const compressible::RASModel& turbulence,
             const volScalarField& Su
         );

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

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

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

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -92,7 +92,7 @@ public:
         basicSubGrid
         (
             const dictionary& XiGProperties,
-            const psiuReactionThermo& thermo,
+            const psiuMulticomponentThermo& thermo,
             const compressible::RASModel& turbulence,
             const volScalarField& Su
         );

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

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

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

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

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

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -80,7 +80,7 @@ public:
         Gulder
         (
             const dictionary& XiEqProperties,
-            const psiuReactionThermo& thermo,
+            const psiuMulticomponentThermo& thermo,
             const compressible::RASModel& turbulence,
             const volScalarField& Su
         );

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

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

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

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -76,7 +76,7 @@ public:
         SCOPEBlend
         (
             const dictionary& XiEqProperties,
-            const psiuReactionThermo& thermo,
+            const psiuMulticomponentThermo& thermo,
             const compressible::RASModel& turbulence,
             const volScalarField& Su
         );

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

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

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

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -94,7 +94,7 @@ public:
         SCOPEXiEq
         (
             const dictionary& XiEqProperties,
-            const psiuReactionThermo& thermo,
+            const psiuMulticomponentThermo& thermo,
             const compressible::RASModel& turbulence,
             const volScalarField& Su
         );

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

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

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

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

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

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

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

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

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

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -75,7 +75,7 @@ public:
         instability
         (
             const dictionary& XiEqProperties,
-            const psiuReactionThermo& thermo,
+            const psiuMulticomponentThermo& thermo,
             const compressible::RASModel& turbulence,
             const volScalarField& Su
         );

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

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

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

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -70,7 +70,7 @@ public:
         KTS
         (
             const dictionary& XiGProperties,
-            const psiuReactionThermo& thermo,
+            const psiuMulticomponentThermo& thermo,
             const compressible::RASModel& turbulence,
             const volScalarField& Su
         );

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

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

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

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

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

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

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

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

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

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -79,7 +79,7 @@ public:
         instabilityG
         (
             const dictionary& XiGProperties,
-            const psiuReactionThermo& thermo,
+            const psiuMulticomponentThermo& thermo,
             const compressible::RASModel& turbulence,
             const volScalarField& Su
         );

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

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

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

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -91,7 +91,7 @@ SourceFiles
 #define XiModel_H
 
 #include "IOdictionary.H"
-#include "psiuReactionThermo.H"
+#include "psiuMulticomponentThermo.H"
 #include "compressibleMomentumTransportModels.H"
 #include "multivariateSurfaceInterpolationScheme.H"
 #include "fvcDiv.H"
@@ -115,7 +115,7 @@ protected:
 
         dictionary XiModelCoeffs_;
 
-        const psiuReactionThermo& thermo_;
+        const psiuMulticomponentThermo& thermo_;
         const compressible::RASModel& turbulence_;
         const volScalarField& Su_;
         const volScalarField& rho_;
@@ -141,7 +141,7 @@ public:
             dictionary,
             (
                 const dictionary& XiProperties,
-                const psiuReactionThermo& thermo,
+                const psiuMulticomponentThermo& thermo,
                 const compressible::RASModel& turbulence,
                 const volScalarField& Su,
                 const volScalarField& rho,
@@ -166,7 +166,7 @@ public:
         XiModel
         (
             const dictionary& XiProperties,
-            const psiuReactionThermo& thermo,
+            const psiuMulticomponentThermo& thermo,
             const compressible::RASModel& turbulence,
             const volScalarField& Su,
             const volScalarField& rho,
@@ -184,7 +184,7 @@ public:
         static autoPtr<XiModel> New
         (
             const dictionary& XiProperties,
-            const psiuReactionThermo& thermo,
+            const psiuMulticomponentThermo& thermo,
             const compressible::RASModel& turbulence,
             const volScalarField& Su,
             const volScalarField& rho,

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

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

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

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

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

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,7 +77,7 @@ public:
         algebraic
         (
             const dictionary& XiProperties,
-            const psiuReactionThermo& thermo,
+            const psiuMulticomponentThermo& thermo,
             const compressible::RASModel& turbulence,
             const volScalarField& Su,
             const volScalarField& rho,

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

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

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

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -65,7 +65,7 @@ public:
         fixed
         (
             const dictionary& XiProperties,
-            const psiuReactionThermo& thermo,
+            const psiuMulticomponentThermo& thermo,
             const compressible::RASModel& turbulence,
             const volScalarField& Su,
             const volScalarField& rho,

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

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

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

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,7 +77,7 @@ public:
         transport
         (
             const dictionary& XiProperties,
-            const psiuReactionThermo& thermo,
+            const psiuMulticomponentThermo& thermo,
             const compressible::RASModel& turbulence,
             const volScalarField& Su,
             const volScalarField& rho,

applications/solvers/combustion/XiFoam/PDRFoam/createFields.H

@@ -1,10 +1,10 @@
 Info<< "Reading thermophysical properties\n" << endl;
 
-autoPtr<psiuReactionThermo> pThermo
+autoPtr<psiuMulticomponentThermo> pThermo
 (
-    psiuReactionThermo::New(mesh)
+    psiuMulticomponentThermo::New(mesh)
 );
-psiuReactionThermo& thermo = pThermo();
+psiuMulticomponentThermo& thermo = pThermo();
 thermo.validate(args.executable(), "ha", "ea");
 
 basicCombustionMixture& composition = thermo.composition();

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

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -64,7 +64,7 @@ Foam::laminarFlameSpeedModels::SCOPE::polynomial::polynomial
 Foam::laminarFlameSpeedModels::SCOPE::SCOPE
 (
     const dictionary& dict,
-    const psiuReactionThermo& ct
+    const psiuMulticomponentThermo& ct
 )
 :
     laminarFlameSpeed(dict, ct),
@@ -368,9 +368,10 @@ Foam::tmp<Foam::volScalarField> Foam::laminarFlameSpeedModels::SCOPE::Ma
 Foam::tmp<Foam::volScalarField>
 Foam::laminarFlameSpeedModels::SCOPE::Ma() const
 {
-    if (psiuReactionThermo_.composition().contains("ft"))
+    if (psiuMulticomponentThermo_.composition().contains("ft"))
     {
-        const volScalarField& ft = psiuReactionThermo_.composition().Y("ft");
+        const volScalarField& ft =
+            psiuMulticomponentThermo_.composition().Y("ft");
 
         return Ma
         (
@@ -378,13 +379,13 @@ Foam::laminarFlameSpeedModels::SCOPE::Ma() const
             (
                 "stoichiometricAirFuelMassRatio",
                 dimless,
-                psiuReactionThermo_.properties()
+                psiuMulticomponentThermo_.properties()
             )*ft/(scalar(1) - ft)
         );
     }
     else
     {
-        const fvMesh& mesh = psiuReactionThermo_.p().mesh();
+        const fvMesh& mesh = psiuMulticomponentThermo_.p().mesh();
 
         return tmp<volScalarField>
         (
@@ -402,19 +403,20 @@ Foam::laminarFlameSpeedModels::SCOPE::Ma() const
 Foam::tmp<Foam::volScalarField>
 Foam::laminarFlameSpeedModels::SCOPE::operator()() const
 {
-    if (psiuReactionThermo_.composition().contains("ft"))
+    if (psiuMulticomponentThermo_.composition().contains("ft"))
     {
-        const volScalarField& ft = psiuReactionThermo_.composition().Y("ft");
+        const volScalarField& ft =
+            psiuMulticomponentThermo_.composition().Y("ft");
 
         return Su0pTphi
         (
-            psiuReactionThermo_.p(),
+            psiuMulticomponentThermo_.p(),
-            psiuReactionThermo_.Tu(),
+            psiuMulticomponentThermo_.Tu(),
             dimensionedScalar
             (
                 "stoichiometricAirFuelMassRatio",
                 dimless,
-                psiuReactionThermo_.properties()
+                psiuMulticomponentThermo_.properties()
             )*ft/(scalar(1) - ft)
         );
     }
@@ -422,8 +424,8 @@ Foam::laminarFlameSpeedModels::SCOPE::operator()() const
     {
         return Su0pTphi
         (
-            psiuReactionThermo_.p(),
+            psiuMulticomponentThermo_.p(),
-            psiuReactionThermo_.Tu(),
+            psiuMulticomponentThermo_.Tu(),
             equivalenceRatio_
         );
     }

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

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -181,11 +181,11 @@ public:
 
     // Constructors
 
-        //- Construct from dictionary and psiuReactionThermo
+        //- Construct from dictionary and psiuMulticomponentThermo
         SCOPE
         (
             const dictionary&,
-            const psiuReactionThermo&
+            const psiuMulticomponentThermo&
         );
 
         //- Disallow default bitwise copy construction

applications/solvers/combustion/XiFoam/XiFoam.C

@@ -50,7 +50,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
-#include "psiuReactionThermo.H"
+#include "psiuMulticomponentThermo.H"
 #include "compressibleMomentumTransportModels.H"
 #include "fluidThermophysicalTransportModel.H"
 #include "laminarFlameSpeed.H"

applications/solvers/combustion/XiFoam/createFields.H

@@ -1,10 +1,10 @@
 Info<< "Reading thermophysical properties\n" << endl;
 
-autoPtr<psiuReactionThermo> pThermo
+autoPtr<psiuMulticomponentThermo> pThermo
 (
-    psiuReactionThermo::New(mesh)
+    psiuMulticomponentThermo::New(mesh)
 );
-psiuReactionThermo& thermo = pThermo();
+psiuMulticomponentThermo& thermo = pThermo();
 thermo.validate(args.executable(), "ha", "ea");
 
 basicCombustionMixture& composition = thermo.composition();

applications/solvers/combustion/chemFoam/Make/options

@@ -1,7 +1,7 @@
 EXE_INC = \
     -I$(LIB_SRC)/physicalProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/multicomponentThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/ODE/lnInclude\
     -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \

applications/solvers/combustion/chemFoam/chemFoam.C

@@ -33,7 +33,7 @@ Description
 
 #include "fvCFD.H"
 #include "zeroDimensionalFvMesh.H"
-#include "fluidReactionThermo.H"
+#include "fluidMulticomponentThermo.H"
 #include "basicChemistryModel.H"
 #include "multiComponentMixture.H"
 #include "chemistrySolver.H"

applications/solvers/combustion/chemFoam/createFields.H

@@ -24,8 +24,11 @@
     #include "createBaseFields.H"
 
     Info<< "Reading thermophysical properties\n" << endl;
-    autoPtr<fluidReactionThermo> pThermo(fluidReactionThermo::New(mesh));
+    autoPtr<fluidMulticomponentThermo> pThermo
-    fluidReactionThermo& thermo = pThermo();
+    (
+        fluidMulticomponentThermo::New(mesh)
+    );
+    fluidMulticomponentThermo& thermo = pThermo();
     thermo.validate(args.executable(), "h");
 
     autoPtr<basicChemistryModel> pChemistry(basicChemistryModel::New(thermo));

applications/solvers/combustion/chemFoam/thermoTypeFunctions.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2018-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2018-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-scalarList W(const fluidReactionThermo& thermo)
+scalarList W(const fluidMulticomponentThermo& thermo)
 {
     const basicSpecieMixture& composition = thermo.composition();
 
@@ -40,7 +40,7 @@ scalarList W(const fluidReactionThermo& thermo)
 
 scalar h0
 (
-    const fluidReactionThermo& thermo,
+    const fluidMulticomponentThermo& thermo,
     const scalarList& Y,
     const scalar p,
     const scalar T

applications/solvers/combustion/reactingFoam/Make/options

@@ -2,10 +2,10 @@ EXE_INC = \
     -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \
     -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \
     -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \
-    -I$(LIB_SRC)/ThermophysicalTransportModels/fluidReactionThermo/lnInclude \
+    -I$(LIB_SRC)/ThermophysicalTransportModels/fluidMulticomponentThermo/lnInclude \
     -I$(LIB_SRC)/physicalProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/multicomponentThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \
     -I$(LIB_SRC)/ODE/lnInclude \
@@ -21,11 +21,11 @@ EXE_LIBS = \
     -lchemistryModel \
     -lODE \
     -lcombustionModels \
-    -lreactionThermophysicalModels \
+    -lmulticomponentThermophysicalModels \
     -lmomentumTransportModels \
     -lcompressibleMomentumTransportModels \
     -lthermophysicalTransportModels \
-    -lfluidReactionThermophysicalTransportModels \
+    -lfluidMulticomponentThermophysicalTransportModels \
     -lfiniteVolume \
     -lfvModels \
     -lfvConstraints \

applications/solvers/combustion/reactingFoam/buoyantReactingFoam/Make/options

@@ -4,10 +4,10 @@ EXE_INC = \
     -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \
     -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \
     -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \
-    -I$(LIB_SRC)/ThermophysicalTransportModels/fluidReactionThermo/lnInclude \
+    -I$(LIB_SRC)/ThermophysicalTransportModels/fluidMulticomponentThermo/lnInclude \
     -I$(LIB_SRC)/physicalProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/multicomponentThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \
     -I$(LIB_SRC)/ODE/lnInclude \
@@ -21,8 +21,8 @@ EXE_LIBS = \
     -lmomentumTransportModels \
     -lcompressibleMomentumTransportModels \
     -lthermophysicalTransportModels \
-    -lfluidReactionThermophysicalTransportModels \
+    -lfluidMulticomponentThermophysicalTransportModels \
-    -lreactionThermophysicalModels \
+    -lmulticomponentThermophysicalModels \
     -lspecie \
     -lfluidThermophysicalModels \
     -lchemistryModel \

applications/solvers/combustion/reactingFoam/buoyantReactingFoam/buoyantReactingFoam.C

@@ -35,10 +35,10 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
-#include "fluidReactionThermo.H"
+#include "fluidMulticomponentThermo.H"
 #include "combustionModel.H"
 #include "compressibleMomentumTransportModels.H"
-#include "fluidReactionThermophysicalTransportModel.H"
+#include "fluidMulticomponentThermophysicalTransportModel.H"
 #include "multivariateScheme.H"
 #include "pimpleControl.H"
 #include "pressureReference.H"

applications/solvers/combustion/reactingFoam/buoyantReactingFoam/createFields.H

@@ -1,8 +1,11 @@
 #include "createRDeltaT.H"
 
 Info<< "Reading thermophysical properties\n" << endl;
-autoPtr<fluidReactionThermo> pThermo(fluidReactionThermo::New(mesh));
+autoPtr<fluidMulticomponentThermo> pThermo
-fluidReactionThermo& thermo = pThermo();
+(
+    fluidMulticomponentThermo::New(mesh)
+);
+fluidMulticomponentThermo& thermo = pThermo();
 thermo.validate(args.executable(), "h", "e");
 
 basicSpecieMixture& composition = thermo.composition();
@@ -54,10 +57,10 @@ autoPtr<compressible::momentumTransportModel> turbulence
 );
 
 Info<< "Creating thermophysical transport model\n" << endl;
-autoPtr<fluidReactionThermophysicalTransportModel>
+autoPtr<fluidMulticomponentThermophysicalTransportModel>
 thermophysicalTransport
 (
-    fluidReactionThermophysicalTransportModel::New
+    fluidMulticomponentThermophysicalTransportModel::New
     (
         turbulence(),
         thermo

applications/solvers/combustion/reactingFoam/createFields.H

@@ -1,8 +1,11 @@
 #include "createRDeltaT.H"
 
 Info<< "Reading thermophysical properties\n" << endl;
-autoPtr<fluidReactionThermo> pThermo(fluidReactionThermo::New(mesh));
+autoPtr<fluidMulticomponentThermo> pThermo
-fluidReactionThermo& thermo = pThermo();
+(
+    fluidMulticomponentThermo::New(mesh)
+);
+fluidMulticomponentThermo& thermo = pThermo();
 thermo.validate(args.executable(), "h", "e");
 
 basicSpecieMixture& composition = thermo.composition();
@@ -56,10 +59,10 @@ autoPtr<compressible::momentumTransportModel> turbulence
 );
 
 Info<< "Creating thermophysical transport model\n" << endl;
-autoPtr<fluidReactionThermophysicalTransportModel>
+autoPtr<fluidMulticomponentThermophysicalTransportModel>
 thermophysicalTransport
 (
-    fluidReactionThermophysicalTransportModel::New
+    fluidMulticomponentThermophysicalTransportModel::New
     (
         turbulence(),
         thermo

applications/solvers/combustion/reactingFoam/reactingFoam.C

@@ -34,10 +34,10 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
-#include "fluidReactionThermo.H"
+#include "fluidMulticomponentThermo.H"
 #include "combustionModel.H"
 #include "compressibleMomentumTransportModels.H"
-#include "fluidReactionThermophysicalTransportModel.H"
+#include "fluidMulticomponentThermophysicalTransportModel.H"
 #include "multivariateScheme.H"
 #include "pimpleControl.H"
 #include "pressureReference.H"

applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options

@@ -12,7 +12,7 @@ EXE_INC = \
     -I$(LIB_SRC)/physicalProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/multicomponentThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \
     -I$(LIB_SRC)/ODE/lnInclude \
@@ -20,14 +20,14 @@ EXE_INC = \
     -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \
     -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \
     -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \
-    -I$(LIB_SRC)/ThermophysicalTransportModels/fluidReactionThermo/lnInclude \
+    -I$(LIB_SRC)/ThermophysicalTransportModels/fluidMulticomponentThermo/lnInclude \
     -I$(LIB_SRC)/regionModels/regionModel/lnInclude
 
 
 EXE_LIBS = \
     -lfluidThermophysicalModels \
     -lspecie \
-    -lreactionThermophysicalModels \
+    -lmulticomponentThermophysicalModels \
     -lsolidThermo \
     -lchemistryModel \
     -lODE \
@@ -35,7 +35,7 @@ EXE_LIBS = \
     -lmomentumTransportModels \
     -lcompressibleMomentumTransportModels \
     -lthermophysicalTransportModels \
-    -lfluidReactionThermophysicalTransportModels \
+    -lfluidMulticomponentThermophysicalTransportModels \
     -lmeshTools \
     -lfiniteVolume \
     -lfvModels \

applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C

@@ -33,8 +33,8 @@ Description
 
 #include "fvCFD.H"
 #include "compressibleMomentumTransportModels.H"
-#include "fluidReactionThermophysicalTransportModel.H"
+#include "fluidMulticomponentThermophysicalTransportModel.H"
-#include "fluidReactionThermo.H"
+#include "fluidMulticomponentThermo.H"
 #include "combustionModel.H"
 #include "fixedGradientFvPatchFields.H"
 #include "regionProperties.H"

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

@@ -1,5 +1,5 @@
 // Initialise fluid field pointer lists
-PtrList<fluidReactionThermo> thermoFluid(fluidRegions.size());
+PtrList<fluidMulticomponentThermo> thermoFluid(fluidRegions.size());
 PtrList<volScalarField> rhoFluid(fluidRegions.size());
 PtrList<volVectorField> UFluid(fluidRegions.size());
 PtrList<surfaceScalarField> phiFluid(fluidRegions.size());
@@ -10,7 +10,7 @@ PtrList<volScalarField> ghFluid(fluidRegions.size());
 PtrList<surfaceScalarField> ghfFluid(fluidRegions.size());
 PtrList<compressible::momentumTransportModel>
     turbulenceFluid(fluidRegions.size());
-PtrList<fluidReactionThermophysicalTransportModel>
+PtrList<fluidMulticomponentThermophysicalTransportModel>
     thermophysicalTransportFluid(fluidRegions.size());
 PtrList<combustionModel> reactionFluid(fluidRegions.size());
 PtrList<volScalarField> p_rghFluid(fluidRegions.size());
@@ -32,7 +32,7 @@ forAll(fluidRegions, i)
         << fluidRegions[i].name() << nl << endl;
 
     Info<< "    Adding to thermoFluid\n" << endl;
-    thermoFluid.set(i, fluidReactionThermo::New(fluidRegions[i]).ptr());
+    thermoFluid.set(i, fluidMulticomponentThermo::New(fluidRegions[i]).ptr());
 
     Info<< "    Adding to rhoFluid\n" << endl;
     rhoFluid.set
@@ -183,7 +183,7 @@ forAll(fluidRegions, i)
     thermophysicalTransportFluid.set
     (
         i,
-        fluidReactionThermophysicalTransportModel::New
+        fluidMulticomponentThermophysicalTransportModel::New
         (
             turbulenceFluid[i],
             thermoFluid[i]

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

@@ -2,7 +2,7 @@
 
     combustionModel& reaction = reactionFluid[i];
 
-    fluidReactionThermo& thermo = thermoFluid[i];
+    fluidMulticomponentThermo& thermo = thermoFluid[i];
     thermo.validate(args.executable(), "h", "e");
 
     basicSpecieMixture& composition = thermo.composition();
@@ -13,7 +13,7 @@
     surfaceScalarField& phi = phiFluid[i];
 
     compressible::momentumTransportModel& turbulence = turbulenceFluid[i];
-    fluidReactionThermophysicalTransportModel& thermophysicalTransport =
+    fluidMulticomponentThermophysicalTransportModel& thermophysicalTransport =
         thermophysicalTransportFluid[i];
 
     volScalarField& K = KFluid[i];

applications/solvers/lagrangian/denseParticleFoam/Make/options

@@ -4,7 +4,7 @@ EXE_INC = \
     -I$(LIB_SRC)/physicalProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/multicomponentThermo/lnInclude \
     -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \
     -I$(LIB_SRC)/MomentumTransportModels/incompressible/lnInclude \
     -I$(LIB_SRC)/MomentumTransportModels/phaseIncompressible/lnInclude \

applications/solvers/lagrangian/rhoParticleFoam/Make/options

@@ -4,7 +4,7 @@ EXE_INC = \
     -I$(LIB_SRC)/physicalProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/multicomponentThermo/lnInclude \
     -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \
     -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \

applications/solvers/multiphase/compressibleInterFoam/Make/options

@@ -7,7 +7,7 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/multicomponentThermo/lnInclude \
     -I$(LIB_SRC)/twoPhaseModels/twoPhaseMixture/lnInclude \
     -I$(LIB_SRC)/twoPhaseModels/interfaceProperties/lnInclude \
     -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \

applications/solvers/multiphase/multiphaseEulerFoam/interfacialCompositionModels/Make/options

@@ -4,7 +4,7 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/multicomponentThermo/lnInclude \
     -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \
     -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \
     -I$(LIB_SRC)/MomentumTransportModels/phaseCompressible/lnInclude \
@@ -14,5 +14,5 @@ EXE_INC = \
 
 LIB_LIBS = \
     -lfluidThermophysicalModels \
-    -lreactionThermophysicalModels \
+    -lmulticomponentThermophysicalModels \
     -lspecie

applications/solvers/multiphase/multiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.C

@@ -26,7 +26,7 @@ License
 #include "interfaceCompositionModel.H"
 #include "phaseModel.H"
 #include "phaseSystem.H"
-#include "rhoReactionThermo.H"
+#include "rhoMulticomponentThermo.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -52,7 +52,10 @@ Foam::interfaceCompositionModel::interfaceCompositionModel
     ),
     species_(dict.lookup("species")),
     Le_("Le", dimless, dict),
-    thermo_(refCast<const rhoReactionThermo>(interface_.phase().thermo())),
+    thermo_
+    (
+        refCast<const rhoMulticomponentThermo>(interface_.phase().thermo())
+    ),
     otherThermo_(interface_.otherPhase().thermo())
 {}
 

applications/solvers/multiphase/multiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.H

@@ -42,7 +42,7 @@ SourceFiles
 #include "volFields.H"
 #include "dictionary.H"
 #include "hashedWordList.H"
-#include "rhoReactionThermo.H"
+#include "rhoMulticomponentThermo.H"
 #include "runTimeSelectionTables.H"
 #include "sidedPhaseInterface.H"
 #include "SidedInterfacialModel.H"
@@ -68,7 +68,7 @@ class interfaceCompositionModel
         const dimensionedScalar Le_;
 
         //- Multi-component thermo model for this side of the interface
-        const rhoReactionThermo& thermo_;
+        const rhoMulticomponentThermo& thermo_;
 
         //- General thermo model for the other side of the interface
         const rhoThermo& otherThermo_;
@@ -130,7 +130,7 @@ public:
             inline const hashedWordList& species() const;
 
             //- Return the thermo
-            inline const rhoReactionThermo& thermo() const;
+            inline const rhoMulticomponentThermo& thermo() const;
 
             //- Return the composition
             inline const basicSpecieMixture& composition() const;

applications/solvers/multiphase/multiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModelI.H

@@ -40,7 +40,7 @@ const Foam::hashedWordList& Foam::interfaceCompositionModel::species() const
 }
 
 
-const Foam::rhoReactionThermo&
+const Foam::rhoMulticomponentThermo&
 Foam::interfaceCompositionModel::thermo() const
 {
     return thermo_;
@@ -62,14 +62,14 @@ const Foam::rhoThermo& Foam::interfaceCompositionModel::otherThermo() const
 
 bool Foam::interfaceCompositionModel::otherHasComposition() const
 {
-    return isA<rhoReactionThermo>(otherThermo_);
+    return isA<rhoMulticomponentThermo>(otherThermo_);
 }
 
 
 const Foam::basicSpecieMixture&
 Foam::interfaceCompositionModel::otherComposition() const
 {
-    return refCast<const rhoReactionThermo>(otherThermo_).composition();
+    return refCast<const rhoMulticomponentThermo>(otherThermo_).composition();
 }
 
 

applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/Make/options

@@ -5,7 +5,7 @@ EXE_INC = \
     -I$(LIB_SRC)/physicalProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/multicomponentThermo/lnInclude \
     -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \
     -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \
     -I$(LIB_SRC)/MomentumTransportModels/phaseCompressible/lnInclude \

applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C

@@ -29,7 +29,7 @@ License
 #include "compressibleMomentumTransportModels.H"
 #include "phaseCompressibleMomentumTransportModel.H"
 #include "saturationModel.H"
-#include "rhoReactionThermo.H"
+#include "rhoMulticomponentThermo.H"
 #include "addToRunTimeSelectionTable.H"
 
 using namespace Foam::constant::mathematical;

applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam/Make/options

@@ -21,7 +21,7 @@ EXE_LIBS = \
     -lmultiphaseReactions \
     -lmultiphaseProperties \
     -lphaseFluidThermophysicalTransportModels \
-    -lphaseFluidReactionThermophysicalTransportModels \
+    -lphaseFluidMulticomponentThermophysicalTransportModels \
     -lfiniteVolume \
     -lfvModels \
     -lfvConstraints \

applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam/multiphaseSystems/Make/options

@@ -6,7 +6,7 @@ EXE_INC = \
     -I$(LIB_SRC)/physicalProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/multicomponentThermo/lnInclude \
     -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \
     -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \
     -I$(LIB_SRC)/MomentumTransportModels/phaseCompressible/lnInclude \

applications/solvers/multiphase/multiphaseEulerFoam/multiphaseReactions/Make/options

@@ -2,7 +2,7 @@ EXE_INC = \
     -I$(LIB_SRC)/physicalProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/multicomponentThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
@@ -11,7 +11,7 @@ EXE_INC = \
 LIB_LIBS = \
     -lspecie \
     -lfluidThermophysicalModels \
-    -lreactionThermophysicalModels \
+    -lmulticomponentThermophysicalModels \
     -lchemistryModel \
     -lfiniteVolume \
     -lphaseSystem

applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/Make/options

@@ -6,7 +6,7 @@ EXE_INC = \
     -I$(LIB_SRC)/multiphaseModels/multiphaseProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/multicomponentThermo/lnInclude \
     -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \
     -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \
     -I$(LIB_SRC)/MomentumTransportModels/phaseCompressible/lnInclude \

applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.C

@@ -25,7 +25,7 @@ License
 
 #include "HeatTransferPhaseSystem.H"
 #include "fvmSup.H"
-#include "rhoReactionThermo.H"
+#include "rhoMulticomponentThermo.H"
 
 // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
 
@@ -92,12 +92,12 @@ void Foam::HeatTransferPhaseSystem<BasePhaseSystem>::addDmidtHefs
         const rhoThermo& thermo1 = phase1.thermo();
         const rhoThermo& thermo2 = phase2.thermo();
         const basicSpecieMixture* compositionPtr1 =
-            isA<rhoReactionThermo>(thermo1)
+            isA<rhoMulticomponentThermo>(thermo1)
-          ? &refCast<const rhoReactionThermo>(thermo1).composition()
+          ? &refCast<const rhoMulticomponentThermo>(thermo1).composition()
           : static_cast<const basicSpecieMixture*>(nullptr);
         const basicSpecieMixture* compositionPtr2 =
-            isA<rhoReactionThermo>(thermo2)
+            isA<rhoMulticomponentThermo>(thermo2)
-          ? &refCast<const rhoReactionThermo>(thermo2).composition()
+          ? &refCast<const rhoMulticomponentThermo>(thermo2).composition()
           : static_cast<const basicSpecieMixture*>(nullptr);
         const volScalarField& he1 = thermo1.he();
         const volScalarField& he2 = thermo2.he();
@@ -308,12 +308,12 @@ void Foam::HeatTransferPhaseSystem<BasePhaseSystem>::addDmidtHefsWithoutL
         const rhoThermo& thermo1 = phase1.thermo();
         const rhoThermo& thermo2 = phase2.thermo();
         const basicSpecieMixture* compositionPtr1 =
-            isA<rhoReactionThermo>(thermo1)
+            isA<rhoMulticomponentThermo>(thermo1)
-          ? &refCast<const rhoReactionThermo>(thermo1).composition()
+          ? &refCast<const rhoMulticomponentThermo>(thermo1).composition()
           : static_cast<const basicSpecieMixture*>(nullptr);
         const basicSpecieMixture* compositionPtr2 =
-            isA<rhoReactionThermo>(thermo2)
+            isA<rhoMulticomponentThermo>(thermo2)
-          ? &refCast<const rhoReactionThermo>(thermo2).composition()
+          ? &refCast<const rhoMulticomponentThermo>(thermo2).composition()
           : static_cast<const basicSpecieMixture*>(nullptr);
         const volScalarField& he1 = thermo1.he();
         const volScalarField& he2 = thermo2.he();
@@ -598,12 +598,12 @@ Foam::HeatTransferPhaseSystem<BasePhaseSystem>::Li
     const rhoThermo& thermo1 = interface.phase1().thermo();
     const rhoThermo& thermo2 = interface.phase2().thermo();
     const basicSpecieMixture* compositionPtr1 =
-        isA<rhoReactionThermo>(thermo1)
+        isA<rhoMulticomponentThermo>(thermo1)
-      ? &refCast<const rhoReactionThermo>(thermo1).composition()
+      ? &refCast<const rhoMulticomponentThermo>(thermo1).composition()
       : static_cast<const basicSpecieMixture*>(nullptr);
     const basicSpecieMixture* compositionPtr2 =
-        isA<rhoReactionThermo>(thermo2)
+        isA<rhoMulticomponentThermo>(thermo2)
-      ? &refCast<const rhoReactionThermo>(thermo2).composition()
+      ? &refCast<const rhoMulticomponentThermo>(thermo2).composition()
       : static_cast<const basicSpecieMixture*>(nullptr);
     const label speciei1 =
         compositionPtr1 ? compositionPtr1->species()[specie] : -1;
@@ -671,12 +671,12 @@ Foam::HeatTransferPhaseSystem<BasePhaseSystem>::Li
     const rhoThermo& thermo1 = interface.phase1().thermo();
     const rhoThermo& thermo2 = interface.phase2().thermo();
     const basicSpecieMixture* compositionPtr1 =
-        isA<rhoReactionThermo>(thermo1)
+        isA<rhoMulticomponentThermo>(thermo1)
-      ? &refCast<const rhoReactionThermo>(thermo1).composition()
+      ? &refCast<const rhoMulticomponentThermo>(thermo1).composition()
       : static_cast<const basicSpecieMixture*>(nullptr);
     const basicSpecieMixture* compositionPtr2 =
-        isA<rhoReactionThermo>(thermo2)
+        isA<rhoMulticomponentThermo>(thermo2)
-      ? &refCast<const rhoReactionThermo>(thermo2).composition()
+      ? &refCast<const rhoMulticomponentThermo>(thermo2).composition()
       : static_cast<const basicSpecieMixture*>(nullptr);
     const label speciei1 =
         compositionPtr1 ? compositionPtr1->species()[specie] : -1;

applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C

@@ -28,7 +28,7 @@ License
 #include "alphatPhaseChangeWallFunctionFvPatchScalarField.H"
 #include "fvcVolumeIntegrate.H"
 #include "fvmSup.H"
-#include "rhoReactionThermo.H"
+#include "rhoMulticomponentThermo.H"
 
 // * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * //
 

applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/PhaseSystems/TwoResistanceHeatTransferPhaseSystem/TwoResistanceHeatTransferPhaseSystem.C

@@ -26,7 +26,7 @@ License
 #include "TwoResistanceHeatTransferPhaseSystem.H"
 #include "heatTransferModel.H"
 #include "fvmSup.H"
-#include "rhoReactionThermo.H"
+#include "rhoMulticomponentThermo.H"
 
 // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
 

applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2015-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -67,9 +67,9 @@ struct MovingPhaseModelTransportThermoModel<rhoThermo>
 };
 
 template<>
-struct MovingPhaseModelTransportThermoModel<rhoReactionThermo>
+struct MovingPhaseModelTransportThermoModel<rhoMulticomponentThermo>
 {
-    typedef fluidReactionThermo type;
+    typedef fluidMulticomponentThermo type;
 };
 
 /*---------------------------------------------------------------------------*\

applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModels.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2015-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2015-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -26,7 +26,7 @@ License
 #include "addToRunTimeSelectionTable.H"
 
 #include "rhoThermo.H"
-#include "rhoReactionThermo.H"
+#include "rhoMulticomponentThermo.H"
 
 #include "combustionModel.H"
 
@@ -150,7 +150,7 @@ namespace Foam
                 <
                     MovingPhaseModel
                     <
-                        ThermoPhaseModel<phaseModel, rhoReactionThermo>
+                        ThermoPhaseModel<phaseModel, rhoMulticomponentThermo>
                     >
                 >
             >
@@ -174,7 +174,7 @@ namespace Foam
                 <
                     MovingPhaseModel
                     <
-                        ThermoPhaseModel<phaseModel, rhoReactionThermo>
+                        ThermoPhaseModel<phaseModel, rhoMulticomponentThermo>
                     >
                 >
             >
@@ -198,7 +198,7 @@ namespace Foam
                 <
                     MovingPhaseModel
                     <
-                        ThermoPhaseModel<phaseModel, rhoReactionThermo>
+                        ThermoPhaseModel<phaseModel, rhoMulticomponentThermo>
                     >
                 >
             >

applications/utilities/thermophysical/chemkinToFoam/Make/options

@@ -1,7 +1,7 @@
 EXE_INC = \
     -IchemkinReader \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude
+    -I$(LIB_SRC)/thermophysicalModels/multicomponentThermo/lnInclude
 
 EXE_LIBS = \
     -lchemistryModel

etc/codeTemplates/dynamicCode/basicChemistryModel

@@ -36,7 +36,7 @@ EXE_INC = \
     -I$(LIB_SRC)/physicalProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/multicomponentThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \
     -I$(LIB_SRC)/ODE/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \

etc/codeTemplates/dynamicCode/fluidMulticomponentThermo

@@ -9,7 +9,7 @@ FoamFile
 {
     format      ascii;
     class       dictionary;
-    object      fluidReactionThermo;
+    object      fluidMulticomponentThermo;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -21,8 +21,8 @@ type
 
 typeBase
 (
-    hePsiThermo psiReactionThermo
+    hePsiThermo psiMulticomponentThermo
-    heRhoThermo rhoReactionThermo
+    heRhoThermo rhoMulticomponentThermo
 );
 
 energy

etc/codeTemplates/dynamicCode/fluidMulticomponentThermoTemplate.C

@@ -24,7 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "forThermo.H"
-#include "makeReactionThermo.H"
+#include "makeMulticomponentThermo.H"
 
 #include "${specie}.H"
 
@@ -82,7 +82,7 @@ namespace Foam
         ${thermo}Thermo,
         ${equationOfState},
         ${specie},
-        makeReactionThermo,
+        makeMulticomponentThermo,
         ${typeBase},
         ${type},
         ${mixture}

etc/codeTemplates/dynamicCode/psiuMulticomponentThermo

@@ -9,7 +9,7 @@ FoamFile
 {
     format      ascii;
     class       dictionary;
-    object      psiuReactionThermo;
+    object      psiuMulticomponentThermo;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -20,7 +20,7 @@ type
 
 typeBase
 (
-    heheuPsiThermo psiuReactionThermo
+    heheuPsiThermo psiuMulticomponentThermo
 );
 
 energy

etc/codeTemplates/dynamicCode/psiuMulticomponentThermoTemplate.C

@@ -24,7 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "forThermo.H"
-#include "makeReactionThermo.H"
+#include "makeMulticomponentThermo.H"
 
 #include "${specie}.H"
 
@@ -82,7 +82,7 @@ namespace Foam
         ${thermo}Thermo,
         ${equationOfState},
         ${specie},
-        makePsiuReactionThermo,
+        makePsiuMulticomponentThermo,
         ${mixture}
     );
 }

src/OpenFOAM/global/runTimeSelectionToC/runTimeSelectionToC.C

@@ -33,8 +33,7 @@ Description
 
 bool Foam::debug::enableRunTimeSelectionToC = false;
 
-Foam::HashTable<Foam::Tuple2<Foam::word, Foam::wordHashSet>>
+Foam::debug::runTimeSelectionToCType Foam::debug::runTimeSelectionToC;
-    Foam::debug::runTimeSelectionToC;
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

src/OpenFOAM/global/runTimeSelectionToC/runTimeSelectionToC.H

@@ -47,8 +47,10 @@ namespace debug
     //- Switch to enable runTimeSelectionToC collection and caching
     extern bool enableRunTimeSelectionToC;
 
+    typedef HashTable<Tuple2<word, wordHashSet>> runTimeSelectionToCType;
+
     //- Run-time selectable objects
-    extern HashTable<Tuple2<word, wordHashSet>> runTimeSelectionToC;
+    extern runTimeSelectionToCType runTimeSelectionToC;
 
 } // End namespace debug
 } // End namespace Foam

src/ThermophysicalTransportModels/Allwmake

@@ -5,8 +5,8 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 
 wmake $targetType
-wmake $targetType fluidReactionThermo
+wmake $targetType fluidMulticomponentThermo
 wmake $targetType phaseFluidThermo
-wmake $targetType phaseFluidReactionThermo
+wmake $targetType phaseFluidMulticomponentThermo
 
 #------------------------------------------------------------------------------

src/ThermophysicalTransportModels/fluidMulticomponentThermo/Make/files

@@ -0,0 +1,3 @@
+fluidMulticomponentThermophysicalTransportModels.C
+
+LIB = $(FOAM_LIBBIN)/libfluidMulticomponentThermophysicalTransportModels

src/ThermophysicalTransportModels/fluidMulticomponentThermo/Make/options

@@ -5,13 +5,13 @@ EXE_INC = \
     -I$(LIB_SRC)/physicalProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/multicomponentThermo/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
 
 LIB_LIBS = \
     -lfluidThermophysicalModels \
-    -lreactionThermophysicalModels \
+    -lmulticomponentThermophysicalModels \
     -lmomentumTransportModels \
     -lspecie \
     -lfiniteVolume \

src/ThermophysicalTransportModels/fluidMulticomponentThermo/fluidMulticomponentThermophysicalTransportModel.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2020-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2020-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,14 +35,14 @@ Typedef
 
 Description
     Typedefs for laminar, RAS and LES thermophysical transport models
-    for fluidReactionThermo flow.
+    for fluidMulticomponentThermo flow.
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef fluidReactionThermophysicalTransportModel_H
+#ifndef fluidMulticomponentThermophysicalTransportModel_H
-#define fluidReactionThermophysicalTransportModel_H
+#define fluidMulticomponentThermophysicalTransportModel_H
 
-#include "fluidReactionThermo.H"
+#include "fluidMulticomponentThermo.H"
 #include "laminarThermophysicalTransportModel.H"
 #include "RASThermophysicalTransportModel.H"
 #include "LESThermophysicalTransportModel.H"
@@ -55,23 +55,23 @@ namespace Foam
     typedef ThermophysicalTransportModel
     <
         compressible::momentumTransportModel,
-        fluidReactionThermo
+        fluidMulticomponentThermo
-    > fluidReactionThermophysicalTransportModel;
+    > fluidMulticomponentThermophysicalTransportModel;
 
     typedef laminarThermophysicalTransportModel
     <
-        fluidReactionThermophysicalTransportModel
+        fluidMulticomponentThermophysicalTransportModel
-    > laminarFluidReactionThermophysicalTransportModel;
+    > laminarFluidMulticomponentThermophysicalTransportModel;
 
     typedef RASThermophysicalTransportModel
     <
-        fluidReactionThermophysicalTransportModel
+        fluidMulticomponentThermophysicalTransportModel
-    > RASFluidReactionThermophysicalTransportModel;
+    > RASFluidMulticomponentThermophysicalTransportModel;
 
     typedef LESThermophysicalTransportModel
     <
-        fluidReactionThermophysicalTransportModel
+        fluidMulticomponentThermophysicalTransportModel
-    > LESFluidReactionThermophysicalTransportModel;
+    > LESFluidMulticomponentThermophysicalTransportModel;
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/ThermophysicalTransportModels/fluidMulticomponentThermo/fluidMulticomponentThermophysicalTransportModels.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2020-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2020-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "fluidReactionThermophysicalTransportModels.H"
+#include "fluidMulticomponentThermophysicalTransportModels.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -31,7 +31,7 @@ makeThermophysicalTransportModels
 (
     ThermophysicalTransportModel,
     compressibleMomentumTransportModel,
-    fluidReactionThermo
+    fluidMulticomponentThermo
 );
 
 

src/ThermophysicalTransportModels/fluidMulticomponentThermo/fluidMulticomponentThermophysicalTransportModels.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2020-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2020-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "fluidReactionThermophysicalTransportModel.H"
+#include "fluidMulticomponentThermophysicalTransportModel.H"
 #include "compressibleMomentumTransportModels.H"
 #include "makeThermophysicalTransportModel.H"
 
@@ -33,7 +33,7 @@ makeThermophysicalTransportModelTypes
 (
     ThermophysicalTransportModel,
     compressibleMomentumTransportModel,
-    fluidReactionThermo
+    fluidMulticomponentThermo
 );
 
 
@@ -42,7 +42,7 @@ makeThermophysicalTransportModelTypes
     (                                                                          \
         ThermophysicalTransportModel,                                          \
         compressibleMomentumTransportModel,                                    \
-        fluidReactionThermo,                                                   \
+        fluidMulticomponentThermo,                                             \
         laminar,                                                               \
         Type                                                                   \
     )
@@ -52,7 +52,7 @@ makeThermophysicalTransportModelTypes
     (                                                                          \
         ThermophysicalTransportModel,                                          \
         compressibleMomentumTransportModel,                                    \
-        fluidReactionThermo,                                                   \
+        fluidMulticomponentThermo,                                             \
         SType,                                                                 \
         Type                                                                   \
     )
@@ -62,7 +62,7 @@ makeThermophysicalTransportModelTypes
     (                                                                          \
         ThermophysicalTransportModel,                                          \
         compressibleMomentumTransportModel,                                    \
-        fluidReactionThermo,                                                   \
+        fluidMulticomponentThermo,                                             \
         RAS,                                                                   \
         Type                                                                   \
     )
@@ -72,7 +72,7 @@ makeThermophysicalTransportModelTypes
     (                                                                          \
         ThermophysicalTransportModel,                                          \
         compressibleMomentumTransportModel,                                    \
-        fluidReactionThermo,                                                   \
+        fluidMulticomponentThermo,                                             \
         LES,                                                                   \
         Type                                                                   \
     )

src/ThermophysicalTransportModels/fluidReactionThermo/Make/files

@@ -1,3 +0,0 @@
-fluidReactionThermophysicalTransportModels.C
-
-LIB = $(FOAM_LIBBIN)/libfluidReactionThermophysicalTransportModels

src/ThermophysicalTransportModels/phaseFluidMulticomponentThermo/Make/files

@@ -0,0 +1,3 @@
+phaseFluidMulticomponentThermophysicalTransportModels.C
+
+LIB = $(FOAM_LIBBIN)/libphaseFluidMulticomponentThermophysicalTransportModels

src/ThermophysicalTransportModels/phaseFluidMulticomponentThermo/Make/options

@@ -6,13 +6,13 @@ EXE_INC = \
     -I$(LIB_SRC)/physicalProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/multicomponentThermo/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
 
 LIB_LIBS = \
     -lfluidThermophysicalModels \
-    -lreactionThermophysicalModels \
+    -lmulticomponentThermophysicalModels \
     -lmomentumTransportModels \
     -lspecie \
     -lfiniteVolume \

src/ThermophysicalTransportModels/phaseFluidMulticomponentThermo/phaseFluidMulticomponentThermophysicalTransportModel.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2020-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2020-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,14 +35,14 @@ Typedef
 
 Description
     Typedefs for laminar, RAS and LES thermophysical transport models
-    for fluidReactionThermo flow.
+    for fluidMulticomponentThermo flow.
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef phaseFluidReactionThermophysicalTransportModel_H
+#ifndef phaseFluidMulticomponentThermophysicalTransportModel_H
-#define phaseFluidReactionThermophysicalTransportModel_H
+#define phaseFluidMulticomponentThermophysicalTransportModel_H
 
-#include "fluidReactionThermo.H"
+#include "fluidMulticomponentThermo.H"
 #include "PhaseThermophysicalTransportModel.H"
 #include "laminarThermophysicalTransportModel.H"
 #include "RASThermophysicalTransportModel.H"
@@ -56,23 +56,23 @@ namespace Foam
     typedef PhaseThermophysicalTransportModel
     <
         phaseCompressible::momentumTransportModel,
-        fluidReactionThermo
+        fluidMulticomponentThermo
-    > phaseFluidReactionThermophysicalTransportModel;
+    > phaseFluidMulticomponentThermophysicalTransportModel;
 
     typedef laminarThermophysicalTransportModel
     <
-        phaseFluidReactionThermophysicalTransportModel
+        phaseFluidMulticomponentThermophysicalTransportModel
-    > laminarPhaseFluidReactionThermophysicalTransportModel;
+    > laminarPhaseFluidMulticomponentThermophysicalTransportModel;
 
     typedef RASThermophysicalTransportModel
     <
-        phaseFluidReactionThermophysicalTransportModel
+        phaseFluidMulticomponentThermophysicalTransportModel
-    > RASPhaseFluidReactionThermophysicalTransportModel;
+    > RASPhaseFluidMulticomponentThermophysicalTransportModel;
 
     typedef LESThermophysicalTransportModel
     <
-        phaseFluidReactionThermophysicalTransportModel
+        phaseFluidMulticomponentThermophysicalTransportModel
-    > LESPhaseFluidReactionThermophysicalTransportModel;
+    > LESPhaseFluidMulticomponentThermophysicalTransportModel;
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/ThermophysicalTransportModels/phaseFluidMulticomponentThermo/phaseFluidMulticomponentThermophysicalTransportModels.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2020-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2020-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "phaseFluidReactionThermophysicalTransportModels.H"
+#include "phaseFluidMulticomponentThermophysicalTransportModels.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -31,7 +31,7 @@ makeThermophysicalTransportModels
 (
     PhaseThermophysicalTransportModel,
     phaseCompressibleMomentumTransportModel,
-    fluidReactionThermo
+    fluidMulticomponentThermo
 );
 
 

src/ThermophysicalTransportModels/phaseFluidMulticomponentThermo/phaseFluidMulticomponentThermophysicalTransportModels.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2020-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2020-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "phaseFluidReactionThermophysicalTransportModel.H"
+#include "phaseFluidMulticomponentThermophysicalTransportModel.H"
 #include "phaseCompressibleMomentumTransportModels.H"
 #include "makeThermophysicalTransportModel.H"
 #include "addToRunTimeSelectionTable.H"
@@ -34,7 +34,7 @@ makeThermophysicalTransportModelTypes
 (
     PhaseThermophysicalTransportModel,
     phaseCompressibleMomentumTransportModel,
-    fluidReactionThermo
+    fluidMulticomponentThermo
 );
 
 
@@ -43,7 +43,7 @@ makeThermophysicalTransportModelTypes
     (                                                                          \
         PhaseThermophysicalTransportModel,                                     \
         phaseCompressibleMomentumTransportModel,                               \
-        fluidReactionThermo,                                                   \
+        fluidMulticomponentThermo,                                             \
         laminar,                                                               \
         Type                                                                   \
     )
@@ -53,7 +53,7 @@ makeThermophysicalTransportModelTypes
     (                                                                          \
         PhaseThermophysicalTransportModel,                                     \
         phaseCompressibleMomentumTransportModel,                               \
-        fluidReactionThermo,                                                   \
+        fluidMulticomponentThermo,                                             \
         SType,                                                                 \
         Type                                                                   \
     )
@@ -63,7 +63,7 @@ makeThermophysicalTransportModelTypes
     (                                                                          \
         PhaseThermophysicalTransportModel,                                     \
         phaseCompressibleMomentumTransportModel,                               \
-        fluidReactionThermo,                                                   \
+        fluidMulticomponentThermo,                                             \
         RAS,                                                                   \
         Type                                                                   \
     )
@@ -73,7 +73,7 @@ makeThermophysicalTransportModelTypes
     (                                                                          \
         PhaseThermophysicalTransportModel,                                     \
         phaseCompressibleMomentumTransportModel,                               \
-        fluidReactionThermo,                                                   \
+        fluidMulticomponentThermo,                                             \
         LES,                                                                   \
         Type                                                                   \
     )

src/ThermophysicalTransportModels/phaseFluidReactionThermo/Make/files

@@ -1,3 +0,0 @@
-phaseFluidReactionThermophysicalTransportModels.C
-
-LIB = $(FOAM_LIBBIN)/libphaseFluidReactionThermophysicalTransportModels

src/combustionModels/EDC/EDC.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2017-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2017-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -53,7 +53,7 @@ namespace combustionModels
 Foam::combustionModels::EDC::EDC
 (
     const word& modelType,
-    const fluidReactionThermo& thermo,
+    const fluidMulticomponentThermo& thermo,
     const compressibleMomentumTransportModel& turb,
     const word& combustionProperties
 )

src/combustionModels/EDC/EDC.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2017-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2017-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -182,7 +182,7 @@ public:
         EDC
         (
             const word& modelType,
-            const fluidReactionThermo& type,
+            const fluidMulticomponentThermo& type,
             const compressibleMomentumTransportModel& turb,
             const word& combustionProperties
         );

src/combustionModels/FSD/FSD.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -48,7 +48,7 @@ namespace combustionModels
 Foam::combustionModels::FSD::FSD
 (
     const word& modelType,
-    const fluidReactionThermo& thermo,
+    const fluidMulticomponentThermo& thermo,
     const compressibleMomentumTransportModel& turb,
     const word& combustionProperties
 )

src/combustionModels/FSD/FSD.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -132,7 +132,7 @@ public:
         FSD
         (
             const word& modelType,
-            const fluidReactionThermo& thermo,
+            const fluidMulticomponentThermo& thermo,
             const compressibleMomentumTransportModel& turb,
             const word& combustionProperties
         );