reactingTwoPhaseEulerFoam: Renamed saturationPressureModel -> saturationModel

In preparation for adding the Tsat function

applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/Make/files

@@ -11,10 +11,10 @@ interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.C
 interfaceCompositionModels/interfaceCompositionModel/newInterfaceCompositionModel.C
 interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModels.C
 
-saturationPressureModels/saturationPressureModel/saturationPressureModel.C
+saturationModels/saturationModel/saturationModel.C
-saturationPressureModels/saturationPressureModel/newSaturationPressureModel.C
+saturationModels/saturationModel/newSaturationPressureModel.C
-saturationPressureModels/Antoine/Antoine.C
+saturationModels/Antoine/Antoine.C
-saturationPressureModels/AntoineExtended/AntoineExtended.C
+saturationModels/AntoineExtended/AntoineExtended.C
-saturationPressureModels/ArdenBuck/ArdenBuck.C
+saturationModels/ArdenBuck/ArdenBuck.C
 
 LIB = $(FOAM_LIBBIN)/libreactingEulerianInterfacialCompositionModels

applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/NonRandomTwoLiquid/NonRandomTwoLiquid.C

@@ -109,16 +109,16 @@ NonRandomTwoLiquid
         dict.subDict(species2Name_).lookup("beta")
     );
 
-    saturationPressureModel12_.reset
+    saturationModel12_.reset
     (
-        saturationPressureModel::New
+        saturationModel::New
         (
             dict.subDict(species1Name_).subDict("interaction")
         ).ptr()
     );
-    saturationPressureModel21_.reset
+    saturationModel21_.reset
     (
-        saturationPressureModel::New
+        saturationModel::New
         (
             dict.subDict(species2Name_).subDict("interaction")
         ).ptr()
@@ -181,8 +181,8 @@ update
     volScalarField alpha12(alpha12_ + Tf*beta12_);
     volScalarField alpha21(alpha21_ + Tf*beta21_);
 
-    volScalarField tau12(saturationPressureModel12_->lnPSat(Tf));
+    volScalarField tau12(saturationModel12_->lnPSat(Tf));
-    volScalarField tau21(saturationPressureModel21_->lnPSat(Tf));
+    volScalarField tau21(saturationModel21_->lnPSat(Tf));
 
     volScalarField G12(exp(- alpha12*tau12));
     volScalarField G21(exp(- alpha21*tau21));

applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/NonRandomTwoLiquid/NonRandomTwoLiquid.H

@@ -41,7 +41,7 @@ SourceFiles
 #define NonRandomTwoLiquid_H
 
 #include "InterfaceCompositionModel.H"
-#include "saturationPressureModel.H"
+#include "saturationModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -97,10 +97,10 @@ private:
         dimensionedScalar beta21_;
 
         //- Interaction parameter model for species 1
-        autoPtr<saturationPressureModel> saturationPressureModel12_;
+        autoPtr<saturationModel> saturationModel12_;
 
         //- Interaction parameter model for species 2
-        autoPtr<saturationPressureModel> saturationPressureModel21_;
+        autoPtr<saturationModel> saturationModel21_;
 
         //- Composition model for species 1
         autoPtr<interfaceCompositionModel> speciesModel1_;

applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Saturated/Saturated.C

@@ -54,9 +54,9 @@ Foam::interfaceCompositionModels::Saturated<Thermo, OtherThermo>::Saturated
     (
         this->thermo_.composition().species()[saturatedName_]
     ),
-    saturationPressureModel_
+    saturationModel_
     (
-        saturationPressureModel::New
+        saturationModel::New
         (
             dict.subDict("saturationPressure")
         )
@@ -109,7 +109,7 @@ Foam::interfaceCompositionModels::Saturated<Thermo, OtherThermo>::Yf
 {
     if (saturatedName_ == speciesName)
     {
-        return wRatioByP()*saturationPressureModel_->pSat(Tf);
+        return wRatioByP()*saturationModel_->pSat(Tf);
     }
     else
     {
@@ -120,7 +120,7 @@ Foam::interfaceCompositionModels::Saturated<Thermo, OtherThermo>::Yf
 
         return
             this->thermo_.Y()[speciesIndex]
-           *(scalar(1) - wRatioByP()*saturationPressureModel_->pSat(Tf))
+           *(scalar(1) - wRatioByP()*saturationModel_->pSat(Tf))
            /max(scalar(1) - this->thermo_.Y()[saturatedIndex_], SMALL);
     }
 }
@@ -136,7 +136,7 @@ Foam::interfaceCompositionModels::Saturated<Thermo, OtherThermo>::YfPrime
 {
     if (saturatedName_ == speciesName)
     {
-        return wRatioByP()*saturationPressureModel_->pSatPrime(Tf);
+        return wRatioByP()*saturationModel_->pSatPrime(Tf);
     }
     else
     {
@@ -147,7 +147,7 @@ Foam::interfaceCompositionModels::Saturated<Thermo, OtherThermo>::YfPrime
 
         return
           - this->thermo_.Y()[speciesIndex]
-           *wRatioByP()*saturationPressureModel_->pSatPrime(Tf)
+           *wRatioByP()*saturationModel_->pSatPrime(Tf)
            /max(scalar(1) - this->thermo_.Y()[saturatedIndex_], SMALL);
     }
 }

applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Saturated/Saturated.H

@@ -37,7 +37,7 @@ SourceFiles
 #define Saturated_H
 
 #include "InterfaceCompositionModel.H"
-#include "saturationPressureModel.H"
+#include "saturationModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -69,7 +69,7 @@ protected:
         label saturatedIndex_;
 
         //- Saturation pressure model
-        autoPtr<saturationPressureModel> saturationPressureModel_;
+        autoPtr<saturationModel> saturationModel_;
 
 
     // Private Member Functions

applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/saturationModels/Antoine/Antoine.C

@@ -30,19 +30,19 @@ License
 
 namespace Foam
 {
-namespace saturationPressureModels
+namespace saturationModels
 {
     defineTypeNameAndDebug(Antoine, 0);
-    addToRunTimeSelectionTable(saturationPressureModel, Antoine, dictionary);
+    addToRunTimeSelectionTable(saturationModel, Antoine, dictionary);
 }
 }
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::saturationPressureModels::Antoine::Antoine(const dictionary& dict)
+Foam::saturationModels::Antoine::Antoine(const dictionary& dict)
 :
-    saturationPressureModel(),
+    saturationModel(),
     A_("A", dimless, dict.lookup("A")),
     B_("B", dimTemperature, dict.lookup("B")),
     C_("C", dimTemperature, dict.lookup("C"))
@@ -51,14 +51,14 @@ Foam::saturationPressureModels::Antoine::Antoine(const dictionary& dict)
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::saturationPressureModels::Antoine::~Antoine()
+Foam::saturationModels::Antoine::~Antoine()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 Foam::tmp<Foam::volScalarField>
-Foam::saturationPressureModels::Antoine::pSat
+Foam::saturationModels::Antoine::pSat
 (
     const volScalarField& T
 ) const
@@ -70,7 +70,7 @@ Foam::saturationPressureModels::Antoine::pSat
 
 
 Foam::tmp<Foam::volScalarField>
-Foam::saturationPressureModels::Antoine::pSatPrime
+Foam::saturationModels::Antoine::pSatPrime
 (
     const volScalarField& T
 ) const
@@ -80,7 +80,7 @@ Foam::saturationPressureModels::Antoine::pSatPrime
 
 
 Foam::tmp<Foam::volScalarField>
-Foam::saturationPressureModels::Antoine::lnPSat
+Foam::saturationModels::Antoine::lnPSat
 (
     const volScalarField& T
 ) const

applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/saturationModels/Antoine/Antoine.H

@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::saturationPressureModels::Antoine
+    Foam::saturationModels::Antoine
 
 Description
     Antoine equation for the vapour pressure.
@@ -42,13 +42,13 @@ SourceFiles
 #ifndef Antoine_H
 #define Antoine_H
 
-#include "saturationPressureModel.H"
+#include "saturationModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-namespace saturationPressureModels
+namespace saturationModels
 {
 
 /*---------------------------------------------------------------------------*\
@@ -57,7 +57,7 @@ namespace saturationPressureModels
 
 class Antoine
 :
-    public saturationPressureModel
+    public saturationModel
 {
 protected:
 
@@ -103,7 +103,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace saturationPressureModels
+} // End namespace saturationModels
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/saturationModels/AntoineExtended/AntoineExtended.C

@@ -30,12 +30,12 @@ License
 
 namespace Foam
 {
-namespace saturationPressureModels
+namespace saturationModels
 {
     defineTypeNameAndDebug(AntoineExtended, 0);
     addToRunTimeSelectionTable
     (
-        saturationPressureModel,
+        saturationModel,
         AntoineExtended,
         dictionary
     );
@@ -45,7 +45,7 @@ namespace saturationPressureModels
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::saturationPressureModels::AntoineExtended::AntoineExtended
+Foam::saturationModels::AntoineExtended::AntoineExtended
 (
     const dictionary& dict
 )
@@ -59,14 +59,14 @@ Foam::saturationPressureModels::AntoineExtended::AntoineExtended
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::saturationPressureModels::AntoineExtended::~AntoineExtended()
+Foam::saturationModels::AntoineExtended::~AntoineExtended()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 Foam::tmp<Foam::volScalarField>
-Foam::saturationPressureModels::AntoineExtended::pSat
+Foam::saturationModels::AntoineExtended::pSat
 (
     const volScalarField& T
 ) const
@@ -79,7 +79,7 @@ Foam::saturationPressureModels::AntoineExtended::pSat
 
 
 Foam::tmp<Foam::volScalarField>
-Foam::saturationPressureModels::AntoineExtended::pSatPrime
+Foam::saturationModels::AntoineExtended::pSatPrime
 (
     const volScalarField& T
 ) const
@@ -89,7 +89,7 @@ Foam::saturationPressureModels::AntoineExtended::pSatPrime
 
 
 Foam::tmp<Foam::volScalarField>
-Foam::saturationPressureModels::AntoineExtended::lnPSat
+Foam::saturationModels::AntoineExtended::lnPSat
 (
     const volScalarField& T
 ) const

applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/saturationModels/AntoineExtended/AntoineExtended.H

@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::saturationPressureModels::AntoineExtended
+    Foam::saturationModels::AntoineExtended
 
 Description
     Extended Antoine equation for the vapour pressure.
@@ -49,7 +49,7 @@ SourceFiles
 
 namespace Foam
 {
-namespace saturationPressureModels
+namespace saturationModels
 {
 
 /*---------------------------------------------------------------------------*\
@@ -105,7 +105,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace saturationPressureModels
+} // End namespace saturationModels
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/saturationModels/ArdenBuck/ArdenBuck.C

@@ -30,10 +30,10 @@ License
 
 namespace Foam
 {
-namespace saturationPressureModels
+namespace saturationModels
 {
     defineTypeNameAndDebug(ArdenBuck, 0);
-    addToRunTimeSelectionTable(saturationPressureModel, ArdenBuck, dictionary);
+    addToRunTimeSelectionTable(saturationModel, ArdenBuck, dictionary);
 }
 }
 
@@ -46,7 +46,7 @@ static const Foam::dimensionedScalar D("", Foam::dimTemperature, 257.14);
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 Foam::tmp<Foam::volScalarField>
-Foam::saturationPressureModels::ArdenBuck::xByTC
+Foam::saturationModels::ArdenBuck::xByTC
 (
     const volScalarField& TC
 ) const
@@ -57,22 +57,22 @@ Foam::saturationPressureModels::ArdenBuck::xByTC
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::saturationPressureModels::ArdenBuck::ArdenBuck(const dictionary& dict)
+Foam::saturationModels::ArdenBuck::ArdenBuck(const dictionary& dict)
 :
-    saturationPressureModel()
+    saturationModel()
 {}
 
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::saturationPressureModels::ArdenBuck::~ArdenBuck()
+Foam::saturationModels::ArdenBuck::~ArdenBuck()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 Foam::tmp<Foam::volScalarField>
-Foam::saturationPressureModels::ArdenBuck::pSat
+Foam::saturationModels::ArdenBuck::pSat
 (
     const volScalarField& T
 ) const
@@ -84,7 +84,7 @@ Foam::saturationPressureModels::ArdenBuck::pSat
 
 
 Foam::tmp<Foam::volScalarField>
-Foam::saturationPressureModels::ArdenBuck::pSatPrime
+Foam::saturationModels::ArdenBuck::pSatPrime
 (
     const volScalarField& T
 ) const
@@ -98,7 +98,7 @@ Foam::saturationPressureModels::ArdenBuck::pSatPrime
 
 
 Foam::tmp<Foam::volScalarField>
-Foam::saturationPressureModels::ArdenBuck::lnPSat
+Foam::saturationModels::ArdenBuck::lnPSat
 (
     const volScalarField& T
 ) const

applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/saturationModels/ArdenBuck/ArdenBuck.H

@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::saturationPressureModels::ArdenBuck
+    Foam::saturationModels::ArdenBuck
 
 Description
     ArdenBuck equation for the vapour pressure of steam.
@@ -35,13 +35,13 @@ SourceFiles
 #ifndef ArdenBuck_H
 #define ArdenBuck_H
 
-#include "saturationPressureModel.H"
+#include "saturationModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-namespace saturationPressureModels
+namespace saturationModels
 {
 
 /*---------------------------------------------------------------------------*\
@@ -50,7 +50,7 @@ namespace saturationPressureModels
 
 class ArdenBuck
 :
-    public saturationPressureModel
+    public saturationModel
 {
 private:
 
@@ -90,7 +90,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace saturationPressureModels
+} // End namespace saturationModels
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/saturationModels/saturationModel/newSaturationModel.C

@@ -23,29 +23,29 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "saturationPressureModel.H"
+#include "saturationModel.H"
 
 // * * * * * * * * * * * * * * * * Selector  * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::saturationPressureModel> Foam::saturationPressureModel::New
+Foam::autoPtr<Foam::saturationModel> Foam::saturationModel::New
 (
     const dictionary& dict
 )
 {
-    word saturationPressureModelType(dict.lookup("type"));
+    word saturationModelType(dict.lookup("type"));
 
-    Info<< "Selecting saturationPressureModel: "
+    Info<< "Selecting saturationModel: "
-        << saturationPressureModelType << endl;
+        << saturationModelType << endl;
 
     dictionaryConstructorTable::iterator cstrIter =
-        dictionaryConstructorTablePtr_->find(saturationPressureModelType);
+        dictionaryConstructorTablePtr_->find(saturationModelType);
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn("saturationPressureModel::New")
+        FatalErrorIn("saturationModel::New")
-            << "Unknown saturationPressureModelType type "
+            << "Unknown saturationModelType type "
-            << saturationPressureModelType << endl << endl
+            << saturationModelType << endl << endl
-            << "Valid saturationPressureModel types are : " << endl
+            << "Valid saturationModel types are : " << endl
             << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }

applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/saturationModels/saturationModel/saturationModel.C

@@ -23,26 +23,26 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "saturationPressureModel.H"
+#include "saturationModel.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
-    defineTypeNameAndDebug(saturationPressureModel, 0);
+    defineTypeNameAndDebug(saturationModel, 0);
-    defineRunTimeSelectionTable(saturationPressureModel, dictionary);
+    defineRunTimeSelectionTable(saturationModel, dictionary);
 }
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::saturationPressureModel::saturationPressureModel()
+Foam::saturationModel::saturationModel()
 {}
 
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::saturationPressureModel::~saturationPressureModel()
+Foam::saturationModel::~saturationModel()
 {}
 
 

applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/saturationModels/saturationModel/saturationModel.H

@@ -22,18 +22,18 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::saturationPressureModel
+    Foam::saturationModel
 
 Description
 
 SourceFiles
-    saturationPressureModel.C
+    saturationModel.C
     newSaturationPressureModel.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef saturationPressureModel_H
+#ifndef saturationModel_H
-#define saturationPressureModel_H
+#define saturationModel_H
 
 #include "volFields.H"
 #include "dictionary.H"
@@ -45,31 +45,31 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                         Class saturationPressureModel Declaration
+                         Class saturationModel Declaration
 \*---------------------------------------------------------------------------*/
 
-class saturationPressureModel
+class saturationModel
 {
     // Private Member Functions
 
         //- Disallow default bitwise copy construct
-        saturationPressureModel(const saturationPressureModel&);
+        saturationModel(const saturationModel&);
 
         //- Disallow default bitwise assignment
-        void operator=(const saturationPressureModel&);
+        void operator=(const saturationModel&);
 
 
 public:
 
     //- Runtime type information
-    TypeName("saturationPressureModel");
+    TypeName("saturationModel");
 
 
     //- Declare runtime construction
     declareRunTimeSelectionTable
     (
         autoPtr,
-        saturationPressureModel,
+        saturationModel,
         dictionary,
         (
             const dictionary& dict
@@ -81,17 +81,17 @@ public:
     // Constructors
 
         //- Construct null
-        saturationPressureModel();
+        saturationModel();
 
 
     // Selectors
 
         //- Select null constructed
-        static autoPtr<saturationPressureModel> New(const dictionary& dict);
+        static autoPtr<saturationModel> New(const dictionary& dict);
 
 
     //- Destructor
-    virtual ~saturationPressureModel();
+    virtual ~saturationModel();
 
 
     // Member Functions