rhoPorousMRFSimpleFoam: Changed to rhoThermo

Also renamed addEnthalpySource -> addEnergySource

applications/solvers/compressible/rhoSimpleFoam/pEqn.H

@@ -1,3 +1,4 @@
+{
     rho = thermo.rho();
     rho = max(rho, rhoMin);
     rho = min(rho, rhoMax);
@@ -95,4 +96,7 @@ if (!simple.transonic())
         rho.relax();
     }
 
-Info<< "rho max/min : " << max(rho).value() << " " << min(rho).value() << endl;
+    Info<< "rho max/min : "
+        << max(rho).value() << " "
+        << min(rho).value() << endl;
+}

applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/createFields.H

@@ -0,0 +1,61 @@
+    Info<< "Reading thermophysical properties\n" << endl;
+
+    autoPtr<rhoThermo> pThermo
+    (
+        rhoThermo::New(mesh)
+    );
+    rhoThermo& thermo = pThermo();
+
+    volScalarField rho
+    (
+        IOobject
+        (
+            "rho",
+            runTime.timeName(),
+            mesh,
+            IOobject::READ_IF_PRESENT,
+            IOobject::AUTO_WRITE
+        ),
+        thermo.rho()
+    );
+
+    volScalarField& p = thermo.p();
+    volScalarField& e = thermo.he();
+
+    Info<< "Reading field U\n" << endl;
+    volVectorField U
+    (
+        IOobject
+        (
+            "U",
+            runTime.timeName(),
+            mesh,
+            IOobject::MUST_READ,
+            IOobject::AUTO_WRITE
+        ),
+        mesh
+    );
+
+    #include "compressibleCreatePhi.H"
+
+
+    label pRefCell = 0;
+    scalar pRefValue = 0.0;
+    setRefCell(p, simple.dict(), pRefCell, pRefValue);
+
+    dimensionedScalar rhoMax(simple.dict().lookup("rhoMax"));
+    dimensionedScalar rhoMin(simple.dict().lookup("rhoMin"));
+
+    Info<< "Creating turbulence model\n" << endl;
+    autoPtr<compressible::RASModel> turbulence
+    (
+        compressible::RASModel::New
+        (
+            rho,
+            U,
+            phi,
+            thermo
+        )
+    );
+
+    dimensionedScalar initialMass = fvc::domainIntegrate(rho);

applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/eEqn.H

@@ -1,4 +1,5 @@
 {
+    // Kinetic + pressure energy
     volScalarField Ekp("Ekp", 0.5*magSqr(U) + p/rho);
 
     fvScalarMatrix eEqn
@@ -10,7 +11,7 @@
         fvc::div(phi)*Ekp - fvc::div(phi, Ekp)
     );
 
-    //pZones.addEnergySource(thermo, rho, eEqn);
+    pZones.addEnergySource(thermo, rho, eEqn);
 
     eEqn.relax();
     eEqn.solve();

applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/pEqn.H

@@ -1,3 +1,9 @@
+{
+    rho = thermo.rho();
+    rho = max(rho, rhoMin);
+    rho = min(rho, rhoMax);
+    rho.relax();
+
     volVectorField HbyA("HbyA", U);
 
     if (pressureImplicitPorosity)
@@ -13,40 +19,6 @@ UEqn.clear();
 
     bool closedVolume = false;
 
-if (simple.transonic())
-{
-    surfaceScalarField phid
-    (
-        "phid",
-        fvc::interpolate(psi)*(fvc::interpolate(HbyA) & mesh.Sf())
-    );
-    mrfZones.relativeFlux(fvc::interpolate(psi), phid);
-
-    while (simple.correctNonOrthogonal())
-    {
-        tmp<fvScalarMatrix> tpEqn;
-
-        if (pressureImplicitPorosity)
-        {
-            tpEqn = (fvc::div(phid, p) - fvm::laplacian(rho*trTU(), p));
-        }
-        else
-        {
-            tpEqn = (fvc::div(phid, p) - fvm::laplacian(rho*trAU(), p));
-        }
-
-        tpEqn().setReference(pRefCell, pRefValue);
-
-        tpEqn().solve();
-
-        if (simple.finalNonOrthogonalIter())
-        {
-            phi == tpEqn().flux();
-        }
-    }
-}
-else
-{
     surfaceScalarField phiHbyA
     (
         "phiHbyA",
@@ -79,7 +51,6 @@ else
             phi = phiHbyA - tpEqn().flux();
         }
     }
-}
 
     #include "incompressible/continuityErrs.H"
 
@@ -101,6 +72,7 @@ U.correctBoundaryConditions();
     // to obey overall mass continuity
     if (closedVolume)
     {
+        const volScalarField& psi = thermo.psi();
         p += (initialMass - fvc::domainIntegrate(psi*p))
             /fvc::domainIntegrate(psi);
     }
@@ -109,4 +81,7 @@ rho = thermo.rho();
     rho = max(rho, rhoMin);
     rho = min(rho, rhoMax);
     rho.relax();
-Info<< "rho max/min : " << max(rho).value() << " " << min(rho).value() << endl;
+    Info<< "rho max/min : "
+        << max(rho).value() << " "
+        << min(rho).value() << endl;
+}

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

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

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

@@ -16,7 +16,6 @@ porousPhi =
 
 for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
 {
-
     fvScalarMatrix pEqn
     (
         fvm::laplacian(porousRho*rAUPorous, porousP) ==  fvc::div(porousPhi)

src/thermophysicalModels/basic/mixtures/basicMixture/basicMixtures.C

@@ -61,51 +61,6 @@ namespace Foam
 
 /* * * * * * * * * * * * * * * private static data * * * * * * * * * * * * * */
 
-makeBasicMixture
-(
-    pureMixture,
-    constTransport,
-    sensibleInternalEnergy,
-    eConstThermo,
-    perfectGas
-);
-
-makeBasicMixture
-(
-    pureMixture,
-    sutherlandTransport,
-    sensibleInternalEnergy,
-    eConstThermo,
-    perfectGas
-);
-
-makeBasicMixture
-(
-    pureMixture,
-    constTransport,
-    sensibleInternalEnergy,
-    hConstThermo,
-    perfectGas
-);
-
-makeBasicMixture
-(
-    pureMixture,
-    sutherlandTransport,
-    sensibleInternalEnergy,
-    hConstThermo,
-    perfectGas
-);
-
-makeBasicMixture
-(
-    pureMixture,
-    sutherlandTransport,
-    sensibleInternalEnergy,
-    janafThermo,
-    perfectGas
-);
-
 makeBasicMixture
 (
     pureMixture,
@@ -185,6 +140,87 @@ makeBasicMixture
 );
 
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makeBasicMixture
+(
+    pureMixture,
+    constTransport,
+    sensibleInternalEnergy,
+    hConstThermo,
+    perfectGas
+);
+
+makeBasicMixture
+(
+    pureMixture,
+    sutherlandTransport,
+    sensibleInternalEnergy,
+    hConstThermo,
+    perfectGas
+);
+
+makeBasicMixture
+(
+    pureMixture,
+    sutherlandTransport,
+    sensibleInternalEnergy,
+    janafThermo,
+    perfectGas
+);
+
+makeBasicMixture
+(
+    pureMixture,
+    constTransport,
+    sensibleInternalEnergy,
+    hConstThermo,
+    incompressible
+);
+
+makeBasicPolyMixture
+(
+    pureMixture,
+    3,
+    sensibleInternalEnergy
+);
+
+makeBasicPolyMixture
+(
+    pureMixture,
+    8,
+    sensibleInternalEnergy
+);
+
+
+makeBasicMixture
+(
+    pureMixture,
+    constTransport,
+    sensibleInternalEnergy,
+    hConstThermo,
+    isobaricPerfectGas
+);
+
+makeBasicMixture
+(
+    pureMixture,
+    sutherlandTransport,
+    sensibleInternalEnergy,
+    hConstThermo,
+    isobaricPerfectGas
+);
+
+makeBasicMixture
+(
+    pureMixture,
+    sutherlandTransport,
+    sensibleInternalEnergy,
+    janafThermo,
+    isobaricPerfectGas
+);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam

src/thermophysicalModels/basic/psiThermo/hePsiThermo/hePsiThermos.C

@@ -84,27 +84,27 @@ makeThermo
 
 /* * * * * * * * * * * * * * Internal-energy-based * * * * * * * * * * * * * */
 
-makeThermo
+// makeThermo
-(
+// (
-    psiThermo,
+//     psiThermo,
-    hePsiThermo,
+//     hePsiThermo,
-    pureMixture,
+//     pureMixture,
-    constTransport,
+//     constTransport,
-    sensibleInternalEnergy,
+//     sensibleInternalEnergy,
-    eConstThermo,
+//     eConstThermo,
-    perfectGas
+//     perfectGas
-);
+// );
 
-makeThermo
+// makeThermo
-(
+// (
-    psiThermo,
+//     psiThermo,
-    hePsiThermo,
+//     hePsiThermo,
-    pureMixture,
+//     pureMixture,
-    sutherlandTransport,
+//     sutherlandTransport,
-    sensibleInternalEnergy,
+//     sensibleInternalEnergy,
-    eConstThermo,
+//     eConstThermo,
-    perfectGas
+//     perfectGas
-);
+// );
 
 makeThermo
 (

src/thermophysicalModels/basic/rhoThermo/heRhoThermo/heRhoThermos.C

@@ -149,6 +149,104 @@ makeThermo
 );
 
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makeThermo
+(
+    rhoThermo,
+    heRhoThermo,
+    pureMixture,
+    constTransport,
+    sensibleInternalEnergy,
+    hConstThermo,
+    perfectGas
+);
+
+makeThermo
+(
+    rhoThermo,
+    heRhoThermo,
+    pureMixture,
+    sutherlandTransport,
+    sensibleInternalEnergy,
+    hConstThermo,
+    perfectGas
+);
+
+makeThermo
+(
+    rhoThermo,
+    heRhoThermo,
+    pureMixture,
+    sutherlandTransport,
+    sensibleInternalEnergy,
+    janafThermo,
+    perfectGas
+);
+
+makeThermo
+(
+    rhoThermo,
+    heRhoThermo,
+    pureMixture,
+    constTransport,
+    sensibleInternalEnergy,
+    hConstThermo,
+    incompressible
+);
+
+makePolyThermo
+(
+    rhoThermo,
+    heRhoThermo,
+    pureMixture,
+    3,
+    sensibleInternalEnergy
+);
+
+makePolyThermo
+(
+    rhoThermo,
+    heRhoThermo,
+    pureMixture,
+    8,
+    sensibleInternalEnergy
+);
+
+makeThermo
+(
+    rhoThermo,
+    heRhoThermo,
+    pureMixture,
+    constTransport,
+    sensibleInternalEnergy,
+    hConstThermo,
+    isobaricPerfectGas
+);
+
+makeThermo
+(
+    rhoThermo,
+    heRhoThermo,
+    pureMixture,
+    sutherlandTransport,
+    sensibleInternalEnergy,
+    hConstThermo,
+    isobaricPerfectGas
+);
+
+makeThermo
+(
+    rhoThermo,
+    heRhoThermo,
+    pureMixture,
+    sutherlandTransport,
+    sensibleInternalEnergy,
+    janafThermo,
+    isobaricPerfectGas
+);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam

src/thermophysicalModels/thermalPorousZone/thermalModel/fixedTemperature/fixedTemperature.C

@@ -64,7 +64,7 @@ Foam::porousMedia::fixedTemperature::~fixedTemperature()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::porousMedia::fixedTemperature::addEnthalpySource
+void Foam::porousMedia::fixedTemperature::addEnergySource
 (
     const basicThermo& thermo,
     const volScalarField& rho,

src/thermophysicalModels/thermalPorousZone/thermalModel/fixedTemperature/fixedTemperature.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -78,7 +78,7 @@ public:
     // Member Functions
 
         //- Add the thermal source to the enthalpy equation
-        virtual void addEnthalpySource
+        virtual void addEnergySource
         (
             const basicThermo&,
             const volScalarField& rho,
@@ -100,4 +100,3 @@ public:
 #endif
 
 // ************************************************************************* //
-

src/thermophysicalModels/thermalPorousZone/thermalModel/noThermalModel/noThermalModel.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -63,7 +63,7 @@ Foam::porousMedia::noThermalModel::~noThermalModel()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::porousMedia::noThermalModel::addEnthalpySource
+void Foam::porousMedia::noThermalModel::addEnergySource
 (
     const basicThermo&,
     const volScalarField&,

src/thermophysicalModels/thermalPorousZone/thermalModel/noThermalModel/noThermalModel.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -70,7 +70,7 @@ public:
     // Member Functions
 
         //- Add the thermal source to the enthalpy equation
-        virtual void addEnthalpySource
+        virtual void addEnergySource
         (
             const basicThermo&,
             const volScalarField& rho,
@@ -92,4 +92,3 @@ public:
 #endif
 
 // ************************************************************************* //
-

src/thermophysicalModels/thermalPorousZone/thermalModel/thermalModel/thermalModel.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -105,7 +105,7 @@ public:
     // Member Functions
 
         //- Add the thermal source to the enthalpy equation
-        virtual void addEnthalpySource
+        virtual void addEnergySource
         (
             const basicThermo&,
             const volScalarField& rho,
@@ -127,4 +127,3 @@ public:
 #endif
 
 // ************************************************************************* //
-

src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZone.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,7 +44,7 @@ Foam::thermalPorousZone::thermalPorousZone
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::thermalPorousZone::addEnthalpySource
+void Foam::thermalPorousZone::addEnergySource
 (
     const basicThermo& thermo,
     const volScalarField& rho,
@@ -53,7 +53,7 @@ void Foam::thermalPorousZone::addEnthalpySource
 {
     if (model_.valid())
     {
-        model_->addEnthalpySource(thermo, rho, hEqn);
+        model_->addEnergySource(thermo, rho, hEqn);
     }
 }
 

src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZone.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -125,7 +125,7 @@ public:
     // Member Functions
 
         //- Add the thermal source to the enthalpy equation
-        void addEnthalpySource
+        void addEnergySource
         (
             const basicThermo&,
             const volScalarField& rho,

src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZones.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -46,7 +46,7 @@ Foam::thermalPorousZones::thermalPorousZones
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::thermalPorousZones::addEnthalpySource
+void Foam::thermalPorousZones::addEnergySource
 (
     const basicThermo& thermo,
     const volScalarField& rho,
@@ -55,7 +55,7 @@ void Foam::thermalPorousZones::addEnthalpySource
 {
     forAll(*this, i)
     {
-        operator[](i).addEnthalpySource(thermo, rho, hEqn);
+        operator[](i).addEnergySource(thermo, rho, hEqn);
     }
 }
 

src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZones.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -93,7 +93,7 @@ public:
     // Member Functions
 
         //- Add the thermal source to the enthalpy equation
-        void addEnthalpySource
+        void addEnergySource
         (
             const basicThermo&,
             const volScalarField& rho,