diff --git a/applications/solvers/compressible/rhoSimpleFoam/pEqn.H b/applications/solvers/compressible/rhoSimpleFoam/pEqn.H
index 6c64056be2e8e2e11a00c5286515b93e277fa085..4d7334c5f8640b44f31a06802f845a7d7c730407 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/pEqn.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/pEqn.H
@@ -1,98 +1,102 @@
-rho = thermo.rho();
-rho = max(rho, rhoMin);
-rho = min(rho, rhoMax);
-rho.relax();
-
-volScalarField rAU(1.0/UEqn().A());
-volVectorField HbyA("HbyA", U);
-HbyA = rAU*UEqn().H();
+{
+ rho = thermo.rho();
+ rho = max(rho, rhoMin);
+ rho = min(rho, rhoMax);
+ rho.relax();
-UEqn.clear();
+ volScalarField rAU(1.0/UEqn().A());
+ volVectorField HbyA("HbyA", U);
+ HbyA = rAU*UEqn().H();
-bool closedVolume = false;
+ UEqn.clear();
-if (simple.transonic())
-{
- surfaceScalarField phid
- (
- "phid",
- fvc::interpolate(psi)*(fvc::interpolate(HbyA) & mesh.Sf())
- );
+ bool closedVolume = false;
- while (simple.correctNonOrthogonal())
+ if (simple.transonic())
{
- fvScalarMatrix pEqn
+ surfaceScalarField phid
(
- fvm::div(phid, p)
- - fvm::laplacian(rho*rAU, p)
+ "phid",
+ fvc::interpolate(psi)*(fvc::interpolate(HbyA) & mesh.Sf())
);
- // Relax the pressure equation to ensure diagonal-dominance
- pEqn.relax();
+ while (simple.correctNonOrthogonal())
+ {
+ fvScalarMatrix pEqn
+ (
+ fvm::div(phid, p)
+ - fvm::laplacian(rho*rAU, p)
+ );
- pEqn.setReference(pRefCell, pRefValue);
+ // Relax the pressure equation to ensure diagonal-dominance
+ pEqn.relax();
- pEqn.solve();
+ pEqn.setReference(pRefCell, pRefValue);
- if (simple.finalNonOrthogonalIter())
- {
- phi == pEqn.flux();
+ pEqn.solve();
+
+ if (simple.finalNonOrthogonalIter())
+ {
+ phi == pEqn.flux();
+ }
}
}
-}
-else
-{
- surfaceScalarField phiHbyA
- (
- "phiHbyA",
- fvc::interpolate(rho)*(fvc::interpolate(HbyA) & mesh.Sf())
- );
-
- closedVolume = adjustPhi(phiHbyA, U, p);
-
- while (simple.correctNonOrthogonal())
+ else
{
- fvScalarMatrix pEqn
+ surfaceScalarField phiHbyA
(
- fvc::div(phiHbyA)
- - fvm::laplacian(rho*rAU, p)
+ "phiHbyA",
+ fvc::interpolate(rho)*(fvc::interpolate(HbyA) & mesh.Sf())
);
- pEqn.setReference(pRefCell, pRefValue);
-
- pEqn.solve();
+ closedVolume = adjustPhi(phiHbyA, U, p);
- if (simple.finalNonOrthogonalIter())
+ while (simple.correctNonOrthogonal())
{
- phi = phiHbyA + pEqn.flux();
+ fvScalarMatrix pEqn
+ (
+ fvc::div(phiHbyA)
+ - fvm::laplacian(rho*rAU, p)
+ );
+
+ pEqn.setReference(pRefCell, pRefValue);
+
+ pEqn.solve();
+
+ if (simple.finalNonOrthogonalIter())
+ {
+ phi = phiHbyA + pEqn.flux();
+ }
}
}
-}
-#include "incompressible/continuityErrs.H"
+ #include "incompressible/continuityErrs.H"
-// Explicitly relax pressure for momentum corrector
-p.relax();
+ // Explicitly relax pressure for momentum corrector
+ p.relax();
-U = HbyA - rAU*fvc::grad(p);
-U.correctBoundaryConditions();
+ U = HbyA - rAU*fvc::grad(p);
+ U.correctBoundaryConditions();
-// For closed-volume cases adjust the pressure and density levels
-// to obey overall mass continuity
-if (closedVolume)
-{
- p += (initialMass - fvc::domainIntegrate(psi*p))
- /fvc::domainIntegrate(psi);
-}
+ // For closed-volume cases adjust the pressure and density levels
+ // to obey overall mass continuity
+ if (closedVolume)
+ {
+ p += (initialMass - fvc::domainIntegrate(psi*p))
+ /fvc::domainIntegrate(psi);
+ }
-rho = thermo.rho();
-rho = max(rho, rhoMin);
-rho = min(rho, rhoMax);
+ rho = thermo.rho();
+ rho = max(rho, rhoMin);
+ rho = min(rho, rhoMax);
-if (!simple.transonic())
-{
- rho.relax();
-}
+ 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;
+}
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/createFields.H b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/createFields.H
new file mode 100644
index 0000000000000000000000000000000000000000..96bdb2a122b0b346cb7f0602e90d0dfef6e2612b
--- /dev/null
+++ b/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);
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/eEqn.H b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/eEqn.H
index 4791062d35ac4c8031951ca123e2d215c9b6695f..5d0f174623b04cd20f8d643792d07dcf04ab3a25 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/eEqn.H
+++ b/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();
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/pEqn.H b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/pEqn.H
index c3e0a43a15a419bd2e40d8727b8b3095f1289096..81b194823cb3c22012db5117ce7b7f7f5382b604 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/pEqn.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/pEqn.H
@@ -1,52 +1,24 @@
-volVectorField HbyA("HbyA", U);
-
-if (pressureImplicitPorosity)
-{
- HbyA = trTU() & UEqn().H();
-}
-else
{
- HbyA = trAU()*UEqn().H();
-}
-
-UEqn.clear();
+ rho = thermo.rho();
+ rho = max(rho, rhoMin);
+ rho = min(rho, rhoMax);
+ rho.relax();
-bool closedVolume = false;
+ volVectorField HbyA("HbyA", U);
-if (simple.transonic())
-{
- surfaceScalarField phid
- (
- "phid",
- fvc::interpolate(psi)*(fvc::interpolate(HbyA) & mesh.Sf())
- );
- mrfZones.relativeFlux(fvc::interpolate(psi), phid);
-
- while (simple.correctNonOrthogonal())
+ if (pressureImplicitPorosity)
{
- tmp<fvScalarMatrix> tpEqn;
+ HbyA = trTU() & UEqn().H();
+ }
+ else
+ {
+ HbyA = trAU()*UEqn().H();
+ }
- if (pressureImplicitPorosity)
- {
- tpEqn = (fvc::div(phid, p) - fvm::laplacian(rho*trTU(), p));
- }
- else
- {
- tpEqn = (fvc::div(phid, p) - fvm::laplacian(rho*trAU(), p));
- }
+ UEqn.clear();
- tpEqn().setReference(pRefCell, pRefValue);
+ bool closedVolume = false;
- tpEqn().solve();
-
- if (simple.finalNonOrthogonalIter())
- {
- phi == tpEqn().flux();
- }
- }
-}
-else
-{
surfaceScalarField phiHbyA
(
"phiHbyA",
@@ -79,34 +51,37 @@ else
phi = phiHbyA - tpEqn().flux();
}
}
-}
-#include "incompressible/continuityErrs.H"
+ #include "incompressible/continuityErrs.H"
-// Explicitly relax pressure for momentum corrector
-p.relax();
+ // Explicitly relax pressure for momentum corrector
+ p.relax();
-if (pressureImplicitPorosity)
-{
- U = HbyA - (trTU() & fvc::grad(p));
-}
-else
-{
- U = HbyA - trAU()*fvc::grad(p);
-}
+ if (pressureImplicitPorosity)
+ {
+ U = HbyA - (trTU() & fvc::grad(p));
+ }
+ else
+ {
+ U = HbyA - trAU()*fvc::grad(p);
+ }
-U.correctBoundaryConditions();
+ U.correctBoundaryConditions();
-// For closed-volume cases adjust the pressure and density levels
-// to obey overall mass continuity
-if (closedVolume)
-{
- p += (initialMass - fvc::domainIntegrate(psi*p))
- /fvc::domainIntegrate(psi);
-}
+ // For closed-volume cases adjust the pressure and density levels
+ // to obey overall mass continuity
+ if (closedVolume)
+ {
+ const volScalarField& psi = thermo.psi();
+ p += (initialMass - fvc::domainIntegrate(psi*p))
+ /fvc::domainIntegrate(psi);
+ }
-rho = thermo.rho();
-rho = max(rho, rhoMin);
-rho = min(rho, rhoMax);
-rho.relax();
-Info<< "rho max/min : " << max(rho).value() << " " << min(rho).value() << endl;
+ rho = thermo.rho();
+ rho = max(rho, rhoMin);
+ rho = min(rho, rhoMax);
+ rho.relax();
+ Info<< "rho max/min : "
+ << max(rho).value() << " "
+ << min(rho).value() << endl;
+}
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/rhoPorousMRFSimpleFoam.C b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/rhoPorousMRFSimpleFoam.C
index 9238106885dd66fc94689acc7de1b5cb82435db3..22a58da1cc85f2fb159e7bcd7874ab34b6f6786a 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/rhoPorousMRFSimpleFoam.C
+++ b/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"
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/porousFluid/pPorousFluidEqn.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/porousFluid/pPorousFluidEqn.H
index ca338975fb1e3f1f7ec353d22e654f0efdecdf6f..9051805b87d2ef3ac383200a1d7940fcd800f4cc 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/porousFluid/pPorousFluidEqn.H
+++ b/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)
diff --git a/src/thermophysicalModels/basic/mixtures/basicMixture/basicMixtures.C b/src/thermophysicalModels/basic/mixtures/basicMixture/basicMixtures.C
index bb09e15803f2f21523c91e773c63da8a4d394905..248bbed9fe36d8e1e832ddd28c5b19f9a13731fb 100644
--- a/src/thermophysicalModels/basic/mixtures/basicMixture/basicMixtures.C
+++ b/src/thermophysicalModels/basic/mixtures/basicMixture/basicMixtures.C
@@ -65,8 +65,8 @@ makeBasicMixture
(
pureMixture,
constTransport,
- sensibleInternalEnergy,
- eConstThermo,
+ sensibleEnthalpy,
+ hConstThermo,
perfectGas
);
@@ -74,8 +74,17 @@ makeBasicMixture
(
pureMixture,
sutherlandTransport,
- sensibleInternalEnergy,
- eConstThermo,
+ sensibleEnthalpy,
+ hConstThermo,
+ perfectGas
+);
+
+makeBasicMixture
+(
+ pureMixture,
+ sutherlandTransport,
+ sensibleEnthalpy,
+ janafThermo,
perfectGas
);
@@ -83,34 +92,61 @@ makeBasicMixture
(
pureMixture,
constTransport,
- sensibleInternalEnergy,
+ sensibleEnthalpy,
hConstThermo,
- perfectGas
+ incompressible
+);
+
+makeBasicPolyMixture
+(
+ pureMixture,
+ 3,
+ sensibleEnthalpy
+);
+
+makeBasicPolyMixture
+(
+ pureMixture,
+ 8,
+ sensibleEnthalpy
+);
+
+
+makeBasicMixture
+(
+ pureMixture,
+ constTransport,
+ sensibleEnthalpy,
+ hConstThermo,
+ isobaricPerfectGas
);
makeBasicMixture
(
pureMixture,
sutherlandTransport,
- sensibleInternalEnergy,
+ sensibleEnthalpy,
hConstThermo,
- perfectGas
+ isobaricPerfectGas
);
makeBasicMixture
(
pureMixture,
sutherlandTransport,
- sensibleInternalEnergy,
+ sensibleEnthalpy,
janafThermo,
- perfectGas
+ isobaricPerfectGas
);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
makeBasicMixture
(
pureMixture,
constTransport,
- sensibleEnthalpy,
+ sensibleInternalEnergy,
hConstThermo,
perfectGas
);
@@ -119,7 +155,7 @@ makeBasicMixture
(
pureMixture,
sutherlandTransport,
- sensibleEnthalpy,
+ sensibleInternalEnergy,
hConstThermo,
perfectGas
);
@@ -128,7 +164,7 @@ makeBasicMixture
(
pureMixture,
sutherlandTransport,
- sensibleEnthalpy,
+ sensibleInternalEnergy,
janafThermo,
perfectGas
);
@@ -137,7 +173,7 @@ makeBasicMixture
(
pureMixture,
constTransport,
- sensibleEnthalpy,
+ sensibleInternalEnergy,
hConstThermo,
incompressible
);
@@ -146,14 +182,14 @@ makeBasicPolyMixture
(
pureMixture,
3,
- sensibleEnthalpy
+ sensibleInternalEnergy
);
makeBasicPolyMixture
(
pureMixture,
8,
- sensibleEnthalpy
+ sensibleInternalEnergy
);
@@ -161,7 +197,7 @@ makeBasicMixture
(
pureMixture,
constTransport,
- sensibleEnthalpy,
+ sensibleInternalEnergy,
hConstThermo,
isobaricPerfectGas
);
@@ -170,7 +206,7 @@ makeBasicMixture
(
pureMixture,
sutherlandTransport,
- sensibleEnthalpy,
+ sensibleInternalEnergy,
hConstThermo,
isobaricPerfectGas
);
@@ -179,7 +215,7 @@ makeBasicMixture
(
pureMixture,
sutherlandTransport,
- sensibleEnthalpy,
+ sensibleInternalEnergy,
janafThermo,
isobaricPerfectGas
);
diff --git a/src/thermophysicalModels/basic/psiThermo/hePsiThermo/hePsiThermos.C b/src/thermophysicalModels/basic/psiThermo/hePsiThermo/hePsiThermos.C
index b5a48fc315479656918a4a463f52a721a69e4e08..56baf3fa0bea99de957b70977791e37d3d17172a 100644
--- a/src/thermophysicalModels/basic/psiThermo/hePsiThermo/hePsiThermos.C
+++ b/src/thermophysicalModels/basic/psiThermo/hePsiThermo/hePsiThermos.C
@@ -84,27 +84,27 @@ makeThermo
/* * * * * * * * * * * * * * Internal-energy-based * * * * * * * * * * * * * */
-makeThermo
-(
- psiThermo,
- hePsiThermo,
- pureMixture,
- constTransport,
- sensibleInternalEnergy,
- eConstThermo,
- perfectGas
-);
-
-makeThermo
-(
- psiThermo,
- hePsiThermo,
- pureMixture,
- sutherlandTransport,
- sensibleInternalEnergy,
- eConstThermo,
- perfectGas
-);
+// makeThermo
+// (
+// psiThermo,
+// hePsiThermo,
+// pureMixture,
+// constTransport,
+// sensibleInternalEnergy,
+// eConstThermo,
+// perfectGas
+// );
+
+// makeThermo
+// (
+// psiThermo,
+// hePsiThermo,
+// pureMixture,
+// sutherlandTransport,
+// sensibleInternalEnergy,
+// eConstThermo,
+// perfectGas
+// );
makeThermo
(
diff --git a/src/thermophysicalModels/basic/rhoThermo/heRhoThermo/heRhoThermos.C b/src/thermophysicalModels/basic/rhoThermo/heRhoThermo/heRhoThermos.C
index c4045c70db2a02915f13f80e35acddad84fac928..e9272e97b84c679fb5d083409620530d2c4b0474 100644
--- a/src/thermophysicalModels/basic/rhoThermo/heRhoThermo/heRhoThermos.C
+++ b/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
diff --git a/src/thermophysicalModels/thermalPorousZone/thermalModel/fixedTemperature/fixedTemperature.C b/src/thermophysicalModels/thermalPorousZone/thermalModel/fixedTemperature/fixedTemperature.C
index 152c075bfef99d5a99a95d45c791fc6bebf90d37..47cfe67dcd489b6e6dfe4177b3cd45b77ae840ed 100644
--- a/src/thermophysicalModels/thermalPorousZone/thermalModel/fixedTemperature/fixedTemperature.C
+++ b/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,
diff --git a/src/thermophysicalModels/thermalPorousZone/thermalModel/fixedTemperature/fixedTemperature.H b/src/thermophysicalModels/thermalPorousZone/thermalModel/fixedTemperature/fixedTemperature.H
index a09e9eae89d2d9e28244f09911177b300d5a1045..b8932dd2e496ee08dab06d01b760edd915e390d8 100644
--- a/src/thermophysicalModels/thermalPorousZone/thermalModel/fixedTemperature/fixedTemperature.H
+++ b/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
// ************************************************************************* //
-
diff --git a/src/thermophysicalModels/thermalPorousZone/thermalModel/noThermalModel/noThermalModel.C b/src/thermophysicalModels/thermalPorousZone/thermalModel/noThermalModel/noThermalModel.C
index 3f172395cfc8dceb4efb60d4b8dff8baf63d5b1e..7a5a1be53e3594ddf7ad00e333a35f6dcc0833a0 100644
--- a/src/thermophysicalModels/thermalPorousZone/thermalModel/noThermalModel/noThermalModel.C
+++ b/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&,
diff --git a/src/thermophysicalModels/thermalPorousZone/thermalModel/noThermalModel/noThermalModel.H b/src/thermophysicalModels/thermalPorousZone/thermalModel/noThermalModel/noThermalModel.H
index 5fec230046126456592f03b9fa3a0e1ae4c58a40..bad8b4dae011c969b7a4aa29c2d56f8344b0f709 100644
--- a/src/thermophysicalModels/thermalPorousZone/thermalModel/noThermalModel/noThermalModel.H
+++ b/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
// ************************************************************************* //
-
diff --git a/src/thermophysicalModels/thermalPorousZone/thermalModel/thermalModel/thermalModel.H b/src/thermophysicalModels/thermalPorousZone/thermalModel/thermalModel/thermalModel.H
index b4ededc4522f10b56cf928dd8979ab7aaf864cab..35d2965a7a3120a952645f2b816aabdfffc3922c 100644
--- a/src/thermophysicalModels/thermalPorousZone/thermalModel/thermalModel/thermalModel.H
+++ b/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
// ************************************************************************* //
-
diff --git a/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZone.C b/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZone.C
index 79bdea0b4ca3be87f15fadf3d470311a7eb715bc..befa29b013c5daf7ef22884483ef0abcded23b5a 100644
--- a/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZone.C
+++ b/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);
}
}
diff --git a/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZone.H b/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZone.H
index 1ebf6d0f7d587ec2da4039a930eb1e30e199c808..4356f87cdfc8bb29ab69261b950f278fe4c811a2 100644
--- a/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZone.H
+++ b/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,
diff --git a/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZones.C b/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZones.C
index cb7d1f5902c247d0556eb37cddd54a777f5573bb..1e0da4b7a6f3b70418c2f4e5f4f6b74fc37000a5 100644
--- a/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZones.C
+++ b/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);
}
}
diff --git a/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZones.H b/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZones.H
index dacd4458303d31915d28f30157722dcffc25ac63..d30a38b29937ca5b6f6517cdf0aa3d56442ff74e 100644
--- a/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZones.H
+++ b/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,