From 7d73dd31711c47f258321d2ee71b6f9653c4e3ec Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Mon, 15 Jun 2009 15:36:57 +0100
Subject: [PATCH] updates for new thermo and general code tidying
---
.../solvers/combustion/PDRFoam/PDRFoam.C | 50 ++++----
.../solvers/combustion/PDRFoam/StCourantNo.H | 28 +++--
.../solvers/combustion/PDRFoam/bEqn.H | 4 +-
.../solvers/combustion/PDRFoam/createFields.H | 17 +--
.../solvers/combustion/PDRFoam/hEqn.H | 2 +-
.../solvers/combustion/PDRFoam/huEqn.H | 2 +-
.../SCOPE/SCOPELaminarFlameSpeed.H | 3 +-
.../solvers/combustion/PDRFoam/pEqn.H | 6 +-
.../solvers/combustion/XiFoam/XiFoam.C | 2 +-
applications/solvers/combustion/XiFoam/bEqn.H | 6 +-
.../solvers/combustion/XiFoam/createFields.H | 19 +--
applications/solvers/combustion/XiFoam/hEqn.H | 2 +-
.../solvers/combustion/XiFoam/huEqn.H | 2 +-
applications/solvers/combustion/XiFoam/pEqn.H | 10 +-
.../coalChemistryFoam/createFields.H | 2 +-
.../coldEngineFoam/coldEngineFoam.C | 40 +++----
.../combustion/coldEngineFoam/createFields.H | 19 +--
.../solvers/combustion/coldEngineFoam/hEqn.H | 2 +-
.../dieselEngineFoam/createFields.H | 46 +++-----
.../combustion/dieselEngineFoam/createSpray.H | 7 +-
.../dieselEngineFoam/dieselEngineFoam.C | 55 ++++-----
.../combustion/dieselEngineFoam/hEqn.H | 29 +----
.../combustion/dieselEngineFoam/pEqn.H | 4 +-
.../combustion/dieselEngineFoam/rhoEqn.H | 2 +-
.../dieselEngineFoam/spraySummary.H | 48 ++++----
.../combustion/dieselFoam/dieselFoam.C | 49 ++++----
.../solvers/combustion/dieselFoam/pEqn.H | 10 +-
.../combustion/engineFoam/engineFoam.C | 52 ++++----
.../solvers/combustion/engineFoam/pEqn.H | 6 +-
.../engineFoam/readEngineTimeControls.H | 2 +-
.../solvers/combustion/reactingFoam/YEqn.H | 4 +-
.../combustion/reactingFoam/createFields.H | 43 ++-----
.../combustion/reactingFoam/reactingFoam.C | 50 ++++----
.../rhoCentralFoam/compressibleCourantNo.H | 8 +-
.../rhoCentralFoam/createFields.H | 17 +--
.../rhoCentralFoam/rhoBoundaryTypes.H | 5 +-
.../rhoCentralFoam/rhoCentralFoam.C | 37 +++---
.../compressible/rhoPimpleFoam/createFields.H | 15 +--
.../solvers/compressible/rhoPimpleFoam/hEqn.H | 2 +-
.../solvers/compressible/rhoPimpleFoam/pEqn.H | 10 +-
.../rhoPimpleFoam/rhoPimpleFoam.C | 2 +-
.../compressible/rhoPisoFoam/createFields.H | 15 +--
.../solvers/compressible/rhoPisoFoam/hEqn.H | 2 +-
.../solvers/compressible/rhoPisoFoam/pEqn.H | 6 +-
.../compressible/rhoPisoFoam/rhoPisoFoam.C | 4 +-
.../rhoPorousSimpleFoam/createFields.H | 16 +--
.../compressible/rhoPorousSimpleFoam/hEqn.H | 2 +-
.../compressible/rhoPorousSimpleFoam/pEqn.H | 6 +-
.../rhoPorousSimpleFoam/rhoPorousSimpleFoam.C | 4 +-
.../compressible/rhoSimpleFoam/createFields.H | 15 +--
.../solvers/compressible/rhoSimpleFoam/hEqn.H | 2 +-
.../solvers/compressible/rhoSimpleFoam/pEqn.H | 10 +-
.../rhoSimpleFoam/rhoSimpleFoam.C | 4 +-
.../sonicDyMFoam/compressibleContinuityErrs.H | 2 +-
.../compressible/sonicDyMFoam/createFields.H | 15 +--
.../compressible/sonicDyMFoam/sonicDyMFoam.C | 6 +-
.../compressible/sonicFoam/createFields.H | 15 +--
.../solvers/compressible/sonicFoam/hEqn.H | 2 +-
.../compressible/sonicFoam/sonicFoam.C | 4 +-
.../sonicLiquidFoam/createFields.H | 2 +-
.../sonicLiquidFoam/sonicLiquidFoam.C | 29 +++--
.../buoyantPisoFoam/buoyantPisoFoam.C | 2 +-
.../buoyantPisoFoam/createFields.H | 17 +--
.../heatTransfer/buoyantPisoFoam/hEqn.H | 2 +-
.../heatTransfer/buoyantPisoFoam/pEqn.H | 8 +-
.../buoyantSimpleFoam/buoyantSimpleFoam.C | 2 +-
.../buoyantSimpleFoam/createFields.H | 18 +--
.../heatTransfer/buoyantSimpleFoam/hEqn.H | 2 +-
.../buoyantSimpleFoam/initConvergenceCheck.H | 2 +-
.../heatTransfer/buoyantSimpleFoam/pEqn.H | 8 +-
.../buoyantSimpleRadiationFoam.C | 4 +-
.../buoyantSimpleRadiationFoam/hEqn.H | 4 +-
.../chtMultiRegionFoam/chtMultiRegionFoam.C | 47 ++++----
.../fluid/createFluidFields.H | 4 +-
.../fluid/setRegionFluidFields.H | 2 +-
.../reactingParcelFoam/Make/options | 4 +-
.../reactingParcelFoam/additionalOutput.H | 48 --------
.../reactingParcelFoam/createClouds.H | 4 +-
.../reactingParcelFoam/createFields.H | 32 +++--
.../lagrangian/reactingParcelFoam/hEqn.H | 4 +-
.../lagrangian/reactingParcelFoam/pEqn.H | 8 +-
.../reactingParcelFoam/reactingParcelFoam.C | 11 +-
.../lagrangian/reactingParcelFoam/rhoEqn.H | 2 +-
.../trackedReactingParcelFoam/Make/options | 3 +
.../trackedReactingParcelFoam/UEqn.H | 2 +-
.../trackedReactingParcelFoam/YEqn.H | 2 +-
.../additionalOutput.H | 48 --------
.../trackedReactingParcelFoam/chemistry.H | 25 ----
.../trackedReactingParcelFoam/createClouds.H | 4 +-
.../trackedReactingParcelFoam/createFields.H | 111 ------------------
.../createPorousZones.H | 21 ++++
.../trackedReactingParcelFoam/hEqn.H | 20 ----
.../trackedReactingParcelFoam/pEqn.H | 8 +-
.../readChemistryProperties.H | 22 ----
.../trackedReactingParcelFoam/rhoEqn.H | 4 +-
.../trackedReactingParcelFoam.C | 16 ++-
.../createFields.H | 11 +-
.../uncoupledKinematicParcelFoam.C | 2 +-
.../multiphase/bubbleFoam/bubbleFoam.C | 37 +++---
.../multiphase/bubbleFoam/createFields.H | 6 +-
.../solvers/multiphase/bubbleFoam/kEpsilon.H | 7 +-
.../cavitatingFoam/cavitatingFoam.C | 35 +++---
.../multiphase/cavitatingFoam/createFields.H | 4 +-
.../solvers/multiphase/cavitatingFoam/pEqn.H | 5 +-
.../multiphase/settlingFoam/createFields.H | 2 +-
.../multiphase/settlingFoam/settlingFoam.C | 34 +++---
.../twoLiquidMixingFoam/createFields.H | 2 +-
.../twoPhaseEulerFoam/twoPhaseEulerFoam.C | 45 ++++---
.../execFlowFunctionObjects.C | 4 +-
.../postProcessing/velocityField/Mach/Mach.C | 6 +-
.../velocityField/Mach/thermophysicalMach.H | 4 +-
.../postProcessing/velocityField/Pe/Pe.C | 6 +-
.../compressible/compressibleContinuityErrs.H | 14 +--
src/lagrangian/dieselSpray/spray/spray.C | 4 +-
src/lagrangian/dieselSpray/spray/spray.H | 8 +-
src/lagrangian/dieselSpray/spray/sprayI.H | 2 +-
.../sprayThermoTypes/sprayThermoTypes.H | 56 ---------
.../radiation/include/createRadiationModel.H | 2 +-
118 files changed, 661 insertions(+), 1036 deletions(-)
delete mode 100644 applications/solvers/lagrangian/reactingParcelFoam/additionalOutput.H
delete mode 100644 applications/solvers/lagrangian/trackedReactingParcelFoam/additionalOutput.H
delete mode 100644 applications/solvers/lagrangian/trackedReactingParcelFoam/chemistry.H
delete mode 100644 applications/solvers/lagrangian/trackedReactingParcelFoam/createFields.H
create mode 100644 applications/solvers/lagrangian/trackedReactingParcelFoam/createPorousZones.H
delete mode 100644 applications/solvers/lagrangian/trackedReactingParcelFoam/hEqn.H
delete mode 100644 applications/solvers/lagrangian/trackedReactingParcelFoam/readChemistryProperties.H
delete mode 100644 src/lagrangian/dieselSpray/sprayThermoTypes/sprayThermoTypes.H
diff --git a/applications/solvers/combustion/PDRFoam/PDRFoam.C b/applications/solvers/combustion/PDRFoam/PDRFoam.C
index 89a7b7f956d..daeed4ebf08 100644
--- a/applications/solvers/combustion/PDRFoam/PDRFoam.C
+++ b/applications/solvers/combustion/PDRFoam/PDRFoam.C
@@ -36,7 +36,7 @@ Description
to be appropriate by comparison with the results from the
spectral model.
- Strain effects are encorporated directly into the Xi equation
+ Strain effects are incorporated directly into the Xi equation
but not in the algebraic approximation. Further work need to be
done on this issue, particularly regarding the enhanced removal rate
caused by flame compression. Analysis using results of the spectral
@@ -70,53 +70,53 @@ Description
int main(int argc, char *argv[])
{
-# include "setRootCase.H"
+ #include "setRootCase.H"
-# include "createTime.H"
-# include "createMesh.H"
-# include "readCombustionProperties.H"
-# include "readEnvironmentalProperties.H"
-# include "createFields.H"
-# include "readPISOControls.H"
-# include "initContinuityErrs.H"
-# include "readTimeControls.H"
-# include "CourantNo.H"
-# include "setInitialDeltaT.H"
+ #include "createTime.H"
+ #include "createMesh.H"
+ #include "readCombustionProperties.H"
+ #include "readEnvironmentalProperties.H"
+ #include "createFields.H"
+ #include "readPISOControls.H"
+ #include "initContinuityErrs.H"
+ #include "readTimeControls.H"
+ #include "CourantNo.H"
+ #include "setInitialDeltaT.H"
-scalar StCoNum = 0.0;
+ scalar StCoNum = 0.0;
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+ // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
Info<< "\nStarting time loop\n" << endl;
while (runTime.run())
{
-# include "readTimeControls.H"
-# include "readPISOControls.H"
-# include "CourantNo.H"
-# include "setDeltaT.H"
+ #include "readTimeControls.H"
+ #include "readPISOControls.H"
+ #include "CourantNo.H"
+ #include "setDeltaT.H"
runTime++;
Info<< "\n\nTime = " << runTime.timeName() << endl;
-# include "rhoEqn.H"
-# include "UEqn.H"
+ #include "rhoEqn.H"
+ #include "UEqn.H"
// --- PISO loop
for (int corr=1; corr<=nCorr; corr++)
{
-# include "bEqn.H"
-# include "ftEqn.H"
-# include "huEqn.H"
-# include "hEqn.H"
+ #include "bEqn.H"
+ #include "ftEqn.H"
+ #include "huEqn.H"
+ #include "hEqn.H"
if (!ign.ignited())
{
hu == h;
}
-# include "pEqn.H"
+ #include "pEqn.H"
}
turbulence->correct();
diff --git a/applications/solvers/combustion/PDRFoam/StCourantNo.H b/applications/solvers/combustion/PDRFoam/StCourantNo.H
index e5294094754..18d6e86a941 100644
--- a/applications/solvers/combustion/PDRFoam/StCourantNo.H
+++ b/applications/solvers/combustion/PDRFoam/StCourantNo.H
@@ -31,23 +31,25 @@ Description
\*---------------------------------------------------------------------------*/
{
-scalar meanStCoNum = 0.0;
+ scalar meanStCoNum = 0.0;
-if (mesh.nInternalFaces())
-{
- surfaceScalarField SfUfbyDelta =
- mesh.surfaceInterpolation::deltaCoeffs()
- *mag(phiSt/fvc::interpolate(rho));
+ if (mesh.nInternalFaces())
+ {
+ surfaceScalarField SfUfbyDelta =
+ mesh.surfaceInterpolation::deltaCoeffs()
+ *mag(phiSt/fvc::interpolate(rho));
- StCoNum = max(SfUfbyDelta/mesh.magSf())
- .value()*runTime.deltaT().value();
+ StCoNum =
+ max(SfUfbyDelta/mesh.magSf()).value()
+ *runTime.deltaT().value();
- meanStCoNum = (sum(SfUfbyDelta)/sum(mesh.magSf()))
- .value()*runTime.deltaT().value();
-}
+ meanStCoNum =
+ (sum(SfUfbyDelta)/sum(mesh.magSf())).value()
+ *runTime.deltaT().value();
+ }
-Info<< "St courant Number mean: " << meanStCoNum
- << " max: " << StCoNum << endl;
+ Info<< "St courant Number mean: " << meanStCoNum
+ << " max: " << StCoNum << endl;
}
// ************************************************************************* //
diff --git a/applications/solvers/combustion/PDRFoam/bEqn.H b/applications/solvers/combustion/PDRFoam/bEqn.H
index 3fd99b65eae..cb449315403 100644
--- a/applications/solvers/combustion/PDRFoam/bEqn.H
+++ b/applications/solvers/combustion/PDRFoam/bEqn.H
@@ -1,7 +1,7 @@
tmp<fv::convectionScheme<scalar> > mvConvection
(
fv::convectionScheme<scalar>::New
- (
+ (
mesh,
fields,
phi,
@@ -25,7 +25,7 @@ if (ign.ignited())
// Unburnt gas density
// ~~~~~~~~~~~~~~~~~~~
- volScalarField rhou = thermo->rhou();
+ volScalarField rhou = thermo.rhou();
// Calculate flame normal etc.
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/applications/solvers/combustion/PDRFoam/createFields.H b/applications/solvers/combustion/PDRFoam/createFields.H
index ba07a6dd465..74a18ab6f5a 100644
--- a/applications/solvers/combustion/PDRFoam/createFields.H
+++ b/applications/solvers/combustion/PDRFoam/createFields.H
@@ -1,10 +1,11 @@
Info<< "Reading thermophysical properties\n" << endl;
- autoPtr<hhuCombustionThermo> thermo
+ autoPtr<hhuCombustionThermo> pThermo
(
hhuCombustionThermo::New(mesh)
);
- combustionMixture& composition = thermo->composition();
+ hhuCombustionThermo& thermo = pThermo();
+ basicMultiComponentMixture& composition = thermo.composition();
volScalarField rho
(
@@ -16,13 +17,13 @@
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
- thermo->rho()
+ thermo.rho()
);
- volScalarField& p = thermo->p();
- const volScalarField& psi = thermo->psi();
- volScalarField& h = thermo->h();
- volScalarField& hu = thermo->hu();
+ volScalarField& p = thermo.p();
+ const volScalarField& psi = thermo.psi();
+ volScalarField& h = thermo.h();
+ volScalarField& hu = thermo.hu();
volScalarField& b = composition.Y("b");
Info<< "min(b) = " << min(b).value() << endl;
@@ -54,7 +55,7 @@
rho,
U,
phi,
- thermo()
+ thermo
)
);
diff --git a/applications/solvers/combustion/PDRFoam/hEqn.H b/applications/solvers/combustion/PDRFoam/hEqn.H
index 80779294879..7f5292d01a9 100644
--- a/applications/solvers/combustion/PDRFoam/hEqn.H
+++ b/applications/solvers/combustion/PDRFoam/hEqn.H
@@ -8,5 +8,5 @@
betav*DpDt
);
- thermo->correct();
+ thermo.correct();
}
diff --git a/applications/solvers/combustion/PDRFoam/huEqn.H b/applications/solvers/combustion/PDRFoam/huEqn.H
index 462f271f4b7..3467bc6b751 100644
--- a/applications/solvers/combustion/PDRFoam/huEqn.H
+++ b/applications/solvers/combustion/PDRFoam/huEqn.H
@@ -13,6 +13,6 @@ if (ign.ignited())
//+ fvm::Sp(fvc::div(muEff*fvc::grad(b)/(b + 0.001)), hu)
==
- betav*DpDt*rho/thermo->rhou()
+ betav*DpDt*rho/thermo.rhou()
);
}
diff --git a/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.H b/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.H
index 1ff6f981bba..1931dbbb355 100644
--- a/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.H
+++ b/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.H
@@ -196,8 +196,7 @@ public:
// Destructor
-
- ~SCOPE();
+ ~SCOPE();
// Member functions
diff --git a/applications/solvers/combustion/PDRFoam/pEqn.H b/applications/solvers/combustion/PDRFoam/pEqn.H
index 312de8301a2..524c8eac749 100644
--- a/applications/solvers/combustion/PDRFoam/pEqn.H
+++ b/applications/solvers/combustion/PDRFoam/pEqn.H
@@ -1,4 +1,4 @@
-rho = thermo->rho();
+rho = thermo.rho();
volScalarField rUA = 1.0/UEqn.A();
U = invA & UEqn.H();
@@ -8,7 +8,7 @@ if (transonic)
surfaceScalarField phid
(
"phid",
- fvc::interpolate(thermo->psi())
+ fvc::interpolate(psi)
*(
(fvc::interpolate(U) & mesh.Sf())
+ fvc::ddtPhiCorr(rUA, rho, U, phi)
@@ -34,7 +34,7 @@ if (transonic)
}
else
{
- phi =
+ phi =
fvc::interpolate(rho)*
(
(fvc::interpolate(U) & mesh.Sf())
diff --git a/applications/solvers/combustion/XiFoam/XiFoam.C b/applications/solvers/combustion/XiFoam/XiFoam.C
index d18ef0d2f4b..cb7f7d2f959 100644
--- a/applications/solvers/combustion/XiFoam/XiFoam.C
+++ b/applications/solvers/combustion/XiFoam/XiFoam.C
@@ -109,7 +109,7 @@ int main(int argc, char *argv[])
turbulence->correct();
- rho = thermo->rho();
+ rho = thermo.rho();
runTime.write();
diff --git a/applications/solvers/combustion/XiFoam/bEqn.H b/applications/solvers/combustion/XiFoam/bEqn.H
index 739d6987e83..33ef24bfe65 100644
--- a/applications/solvers/combustion/XiFoam/bEqn.H
+++ b/applications/solvers/combustion/XiFoam/bEqn.H
@@ -6,7 +6,7 @@ if (ign.ignited())
// Unburnt gas density
// ~~~~~~~~~~~~~~~~~~~
- volScalarField rhou = thermo->rhou();
+ volScalarField rhou = thermo.rhou();
// Calculate flame normal etc.
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -76,7 +76,7 @@ if (ign.ignited())
volScalarField epsilon = pow(uPrimeCoef, 3)*turbulence->epsilon();
- volScalarField tauEta = sqrt(thermo->muu()/(rhou*epsilon));
+ volScalarField tauEta = sqrt(thermo.muu()/(rhou*epsilon));
volScalarField Reta = up/
(
@@ -180,7 +180,7 @@ if (ign.ignited())
// with a linear correction function to give a plausible profile for Xi
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- volScalarField XiEqStar =
+ volScalarField XiEqStar =
scalar(1.001) + XiCoef*sqrt(up/(Su + SuMin))*Reta;
volScalarField XiEq =
diff --git a/applications/solvers/combustion/XiFoam/createFields.H b/applications/solvers/combustion/XiFoam/createFields.H
index 81218864027..ef16bd615c9 100644
--- a/applications/solvers/combustion/XiFoam/createFields.H
+++ b/applications/solvers/combustion/XiFoam/createFields.H
@@ -1,10 +1,11 @@
Info<< "Reading thermophysical properties\n" << endl;
- autoPtr<hhuCombustionThermo> thermo
+ autoPtr<hhuCombustionThermo> pThermo
(
hhuCombustionThermo::New(mesh)
);
- combustionMixture& composition = thermo->composition();
+ hhuCombustionThermo& thermo = pThermo();
+ basicMultiComponentMixture& composition = thermo.composition();
volScalarField rho
(
@@ -16,18 +17,18 @@
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
- thermo->rho()
+ thermo.rho()
);
- volScalarField& p = thermo->p();
- const volScalarField& psi = thermo->psi();
- volScalarField& h = thermo->h();
- volScalarField& hu = thermo->hu();
+ volScalarField& p = thermo.p();
+ const volScalarField& psi = thermo.psi();
+ volScalarField& h = thermo.h();
+ volScalarField& hu = thermo.hu();
volScalarField& b = composition.Y("b");
Info<< "min(b) = " << min(b).value() << endl;
- const volScalarField& T = thermo->T();
+ const volScalarField& T = thermo.T();
Info<< "\nReading field U\n" << endl;
@@ -55,7 +56,7 @@
rho,
U,
phi,
- thermo()
+ thermo
)
);
diff --git a/applications/solvers/combustion/XiFoam/hEqn.H b/applications/solvers/combustion/XiFoam/hEqn.H
index 2a5204aa8d2..ebce30e24e5 100644
--- a/applications/solvers/combustion/XiFoam/hEqn.H
+++ b/applications/solvers/combustion/XiFoam/hEqn.H
@@ -8,5 +8,5 @@
DpDt
);
- thermo->correct();
+ thermo.correct();
}
diff --git a/applications/solvers/combustion/XiFoam/huEqn.H b/applications/solvers/combustion/XiFoam/huEqn.H
index 2f001b00326..0b4068344bc 100644
--- a/applications/solvers/combustion/XiFoam/huEqn.H
+++ b/applications/solvers/combustion/XiFoam/huEqn.H
@@ -13,6 +13,6 @@ if (ign.ignited())
//+ fvm::Sp(fvc::div(muEff*fvc::grad(b)/(b + 0.001)), hu)
==
- DpDt*rho/thermo->rhou()
+ DpDt*rho/thermo.rhou()
);
}
diff --git a/applications/solvers/combustion/XiFoam/pEqn.H b/applications/solvers/combustion/XiFoam/pEqn.H
index 05db89627da..9443f909a35 100644
--- a/applications/solvers/combustion/XiFoam/pEqn.H
+++ b/applications/solvers/combustion/XiFoam/pEqn.H
@@ -1,4 +1,4 @@
-rho = thermo->rho();
+rho = thermo.rho();
volScalarField rUA = 1.0/UEqn.A();
U = rUA*UEqn.H();
@@ -8,7 +8,7 @@ if (transonic)
surfaceScalarField phid
(
"phid",
- fvc::interpolate(thermo->psi())
+ fvc::interpolate(psi)
*(
(fvc::interpolate(U) & mesh.Sf())
+ fvc::ddtPhiCorr(rUA, rho, U, phi)
@@ -34,9 +34,9 @@ if (transonic)
}
else
{
- phi =
- fvc::interpolate(rho)*
- (
+ phi =
+ fvc::interpolate(rho)
+ *(
(fvc::interpolate(U) & mesh.Sf())
+ fvc::ddtPhiCorr(rUA, rho, U, phi)
);
diff --git a/applications/solvers/combustion/coalChemistryFoam/createFields.H b/applications/solvers/combustion/coalChemistryFoam/createFields.H
index b8f04a22d8c..faf324fee10 100644
--- a/applications/solvers/combustion/coalChemistryFoam/createFields.H
+++ b/applications/solvers/combustion/coalChemistryFoam/createFields.H
@@ -84,7 +84,7 @@
mesh
);
-# include "compressibleCreatePhi.H"
+ #include "compressibleCreatePhi.H"
DimensionedField<scalar, volMesh> kappa
(
diff --git a/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C b/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C
index ddb4c355300..67def3fb590 100644
--- a/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C
+++ b/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C
@@ -33,7 +33,7 @@ Description
#include "fvCFD.H"
#include "engineTime.H"
#include "engineMesh.H"
-#include "basicThermo.H"
+#include "basicPsiThermo.H"
#include "turbulenceModel.H"
#include "OFstream.H"
@@ -41,27 +41,27 @@ Description
int main(int argc, char *argv[])
{
-# include "setRootCase.H"
+ #include "setRootCase.H"
-# include "createEngineTime.H"
-# include "createEngineMesh.H"
-# include "createFields.H"
-# include "initContinuityErrs.H"
-# include "readEngineTimeControls.H"
-# include "compressibleCourantNo.H"
-# include "setInitialDeltaT.H"
-# include "startSummary.H"
+ #include "createEngineTime.H"
+ #include "createEngineMesh.H"
+ #include "createFields.H"
+ #include "initContinuityErrs.H"
+ #include "readEngineTimeControls.H"
+ #include "compressibleCourantNo.H"
+ #include "setInitialDeltaT.H"
+ #include "startSummary.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+ // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
Info<< "\nStarting time loop\n" << endl;
while (runTime.run())
{
-# include "readPISOControls.H"
-# include "readEngineTimeControls.H"
-# include "compressibleCourantNo.H"
-# include "setDeltaT.H"
+ #include "readPISOControls.H"
+ #include "readEngineTimeControls.H"
+ #include "compressibleCourantNo.H"
+ #include "setDeltaT.H"
runTime++;
@@ -70,22 +70,22 @@ int main(int argc, char *argv[])
mesh.move();
-# include "rhoEqn.H"
+ #include "rhoEqn.H"
-# include "UEqn.H"
+ #include "UEqn.H"
// --- PISO loop
for (int corr=1; corr<=nCorr; corr++)
{
-# include "hEqn.H"
-# include "pEqn.H"
+ #include "hEqn.H"
+ #include "pEqn.H"
}
turbulence->correct();
runTime.write();
-# include "logSummary.H"
+ #include "logSummary.H"
Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
<< " ClockTime = " << runTime.elapsedClockTime() << " s"
diff --git a/applications/solvers/combustion/coldEngineFoam/createFields.H b/applications/solvers/combustion/coldEngineFoam/createFields.H
index 7a369df4721..6bc3139ce6f 100644
--- a/applications/solvers/combustion/coldEngineFoam/createFields.H
+++ b/applications/solvers/combustion/coldEngineFoam/createFields.H
@@ -1,9 +1,10 @@
Info<< "Reading thermophysical properties\n" << endl;
- autoPtr<basicThermo> thermo
+ autoPtr<basicPsiThermo> pThermo
(
- basicThermo::New(mesh)
+ basicPsiThermo::New(mesh)
);
+ basicPsiThermo& thermo = pThermo();
volScalarField rho
(
@@ -15,13 +16,13 @@
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
- thermo->rho()
+ thermo.rho()
);
- volScalarField& p = thermo->p();
- const volScalarField& psi = thermo->psi();
- volScalarField& h = thermo->h();
- const volScalarField& T = thermo->T();
+ volScalarField& p = thermo.p();
+ const volScalarField& psi = thermo.psi();
+ volScalarField& h = thermo.h();
+ const volScalarField& T = thermo.T();
Info<< "\nReading field U\n" << endl;
@@ -38,7 +39,7 @@
mesh
);
-# include "compressibleCreatePhi.H"
+ #include "compressibleCreatePhi.H"
Info<< "Creating turbulence model\n" << endl;
@@ -49,7 +50,7 @@
rho,
U,
phi,
- thermo()
+ thermo
)
);
diff --git a/applications/solvers/combustion/coldEngineFoam/hEqn.H b/applications/solvers/combustion/coldEngineFoam/hEqn.H
index f72ef0c89cb..ae60d3316ec 100644
--- a/applications/solvers/combustion/coldEngineFoam/hEqn.H
+++ b/applications/solvers/combustion/coldEngineFoam/hEqn.H
@@ -8,5 +8,5 @@
DpDt
);
- thermo->correct();
+ thermo.correct();
}
diff --git a/applications/solvers/combustion/dieselEngineFoam/createFields.H b/applications/solvers/combustion/dieselEngineFoam/createFields.H
index cf0532b0f3a..9d9229cc3c1 100644
--- a/applications/solvers/combustion/dieselEngineFoam/createFields.H
+++ b/applications/solvers/combustion/dieselEngineFoam/createFields.H
@@ -1,13 +1,17 @@
Info<< nl << "Reading thermophysicalProperties" << endl;
-autoPtr<hCombustionThermo> thermo
+
+autoPtr<psiChemistryModel> pChemistry
(
- hCombustionThermo::New(mesh)
+ psiChemistryModel::New(mesh)
);
+psiChemistryModel& chemistry = pChemistry();
+
+hCombustionThermo& thermo = chemistry.thermo();
-combustionMixture& composition = thermo->composition();
+basicMultiComponentMixture& composition = thermo.composition();
PtrList<volScalarField>& Y = composition.Y();
-word inertSpecie(thermo->lookup("inertSpecie"));
+word inertSpecie(thermo.lookup("inertSpecie"));
volScalarField rho
(
@@ -17,7 +21,7 @@ volScalarField rho
runTime.timeName(),
mesh
),
- thermo->rho()
+ thermo.rho()
);
Info<< "Reading field U\n" << endl;
@@ -35,10 +39,10 @@ volVectorField U
);
-volScalarField& p = thermo->p();
-const volScalarField& psi = thermo->psi();
-const volScalarField& T = thermo->T();
-volScalarField& h = thermo->h();
+volScalarField& p = thermo.p();
+const volScalarField& psi = thermo.psi();
+const volScalarField& T = thermo.T();
+volScalarField& h = thermo.h();
#include "compressibleCreatePhi.H"
@@ -65,7 +69,7 @@ autoPtr<compressible::turbulenceModel> turbulence
rho,
U,
phi,
- thermo()
+ thermo
)
);
@@ -73,31 +77,11 @@ Info<< "Creating field DpDt\n" << endl;
volScalarField DpDt =
fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p);
-Info << "Constructing chemical mechanism" << endl;
-chemistryModel chemistry
-(
- thermo(),
- rho
-);
multivariateSurfaceInterpolationScheme<scalar>::fieldTable fields;
-for(label i=0; i<Y.size(); i++)
+forAll (Y, i)
{
fields.add(Y[i]);
}
fields.add(h);
-
-volScalarField dQ
-(
- IOobject
- (
- "dQ",
- runTime.timeName(),
- mesh,
- IOobject::NO_READ,
- IOobject::AUTO_WRITE
- ),
- mesh,
- dimensionedScalar("zero", dimensionSet(1,-3,-1,0,0,0,0), 0.0)
-);
diff --git a/applications/solvers/combustion/dieselEngineFoam/createSpray.H b/applications/solvers/combustion/dieselEngineFoam/createSpray.H
index ac473957e5d..4bc1a32f11b 100644
--- a/applications/solvers/combustion/dieselEngineFoam/createSpray.H
+++ b/applications/solvers/combustion/dieselEngineFoam/createSpray.H
@@ -1,14 +1,15 @@
Info << "Constructing Spray" << endl;
-PtrList<specieProperties> gasProperties(Y.size());
+PtrList<gasThermoPhysics> gasProperties(Y.size());
forAll(gasProperties, i)
{
gasProperties.set
(
i,
- new specieProperties
+ new gasThermoPhysics
(
- dynamic_cast<const reactingMixture&>(thermo()).speciesData()[i]
+ dynamic_cast<const reactingMixture<gasThermoPhysics>&>
+ (thermo).speciesData()[i]
)
);
}
diff --git a/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C b/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C
index 927afe9bc28..ba910bcf56e 100644
--- a/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C
+++ b/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C
@@ -36,40 +36,41 @@ Description
#include "hCombustionThermo.H"
#include "turbulenceModel.H"
#include "spray.H"
-#include "chemistryModel.H"
+#include "psiChemistryModel.H"
#include "chemistrySolver.H"
#include "multivariateScheme.H"
#include "Switch.H"
#include "OFstream.H"
#include "volPointInterpolation.H"
+#include "thermoPhysicsTypes.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
int main(int argc, char *argv[])
{
-# include "setRootCase.H"
-# include "createEngineTime.H"
-# include "createEngineMesh.H"
-# include "createFields.H"
-# include "readEnvironmentalProperties.H"
-# include "readCombustionProperties.H"
-# include "createSpray.H"
-# include "initContinuityErrs.H"
-# include "readEngineTimeControls.H"
-# include "compressibleCourantNo.H"
-# include "setInitialDeltaT.H"
-# include "startSummary.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+ #include "setRootCase.H"
+ #include "createEngineTime.H"
+ #include "createEngineMesh.H"
+ #include "createFields.H"
+ #include "readEnvironmentalProperties.H"
+ #include "readCombustionProperties.H"
+ #include "createSpray.H"
+ #include "initContinuityErrs.H"
+ #include "readEngineTimeControls.H"
+ #include "compressibleCourantNo.H"
+ #include "setInitialDeltaT.H"
+ #include "startSummary.H"
+
+ // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
Info << "\nStarting time loop\n" << endl;
while (runTime.run())
{
-# include "readPISOControls.H"
-# include "readEngineTimeControls.H"
-# include "compressibleCourantNo.H"
-# include "setDeltaT.H"
+ #include "readPISOControls.H"
+ #include "readEngineTimeControls.H"
+ #include "compressibleCourantNo.H"
+ #include "setDeltaT.H"
runTime++;
@@ -101,27 +102,27 @@ int main(int argc, char *argv[])
kappa = (runTime.deltaT() + tc)/(runTime.deltaT() + tc + tk);
}
-# include "rhoEqn.H"
-# include "UEqn.H"
+ #include "rhoEqn.H"
+ #include "UEqn.H"
for (label ocorr=1; ocorr <= nOuterCorr; ocorr++)
{
-# include "YEqn.H"
-# include "hEqn.H"
+ #include "YEqn.H"
+ #include "hEqn.H"
// --- PISO loop
for (int corr=1; corr<=nCorr; corr++)
{
-# include "pEqn.H"
+ #include "pEqn.H"
}
}
turbulence->correct();
-# include "logSummary.H"
-# include "spraySummary.H"
+ #include "logSummary.H"
+ #include "spraySummary.H"
- rho = thermo->rho();
+ rho = thermo.rho();
runTime.write();
diff --git a/applications/solvers/combustion/dieselEngineFoam/hEqn.H b/applications/solvers/combustion/dieselEngineFoam/hEqn.H
index 347fef1a9c3..0406f7fbd49 100644
--- a/applications/solvers/combustion/dieselEngineFoam/hEqn.H
+++ b/applications/solvers/combustion/dieselEngineFoam/hEqn.H
@@ -9,32 +9,5 @@
+ dieselSpray.heatTransferSource()
);
- thermo->correct();
-
- forAll(dQ, i)
- {
- dQ[i] = 0.0;
- }
-
- scalarField cp(dQ.size(), 0.0);
-
- forAll(Y, i)
- {
- volScalarField RRi = chemistry.RR(i);
-
- forAll(h, celli)
- {
- scalar Ti = T[celli];
- cp[celli] += Y[i][celli]*chemistry.specieThermo()[i].Cp(Ti);
- scalar hi = chemistry.specieThermo()[i].h(Ti);
- scalar RR = RRi[celli];
- dQ[celli] -= hi*RR;
- }
-
- }
-
- forAll(dQ, celli)
- {
- dQ[celli] /= cp[celli];
- }
+ thermo.correct();
}
diff --git a/applications/solvers/combustion/dieselEngineFoam/pEqn.H b/applications/solvers/combustion/dieselEngineFoam/pEqn.H
index 0324a47ce01..b68ae732962 100644
--- a/applications/solvers/combustion/dieselEngineFoam/pEqn.H
+++ b/applications/solvers/combustion/dieselEngineFoam/pEqn.H
@@ -1,4 +1,4 @@
-rho = thermo->rho();
+rho = thermo.rho();
volScalarField A = UEqn.A();
U = UEqn.H()/A;
@@ -8,7 +8,7 @@ if (transonic)
surfaceScalarField phid
(
"phid",
- fvc::interpolate(thermo->psi())
+ fvc::interpolate(psi)
*((fvc::interpolate(U) & mesh.Sf()) - fvc::meshPhi(rho, U))
);
diff --git a/applications/solvers/combustion/dieselEngineFoam/rhoEqn.H b/applications/solvers/combustion/dieselEngineFoam/rhoEqn.H
index 396bf33f300..dd396486d35 100644
--- a/applications/solvers/combustion/dieselEngineFoam/rhoEqn.H
+++ b/applications/solvers/combustion/dieselEngineFoam/rhoEqn.H
@@ -44,7 +44,7 @@ volScalarField Sevap
dimensionedScalar("zero", dimensionSet(1, -3, -1, 0, 0), 0.0)
);
-for(label i=0; i<Y.size(); i++)
+for (label i=0; i<Y.size(); i++)
{
if (dieselSpray.isLiquidFuel()[i])
{
diff --git a/applications/solvers/combustion/dieselEngineFoam/spraySummary.H b/applications/solvers/combustion/dieselEngineFoam/spraySummary.H
index 5b251e22902..31337d0a77e 100644
--- a/applications/solvers/combustion/dieselEngineFoam/spraySummary.H
+++ b/applications/solvers/combustion/dieselEngineFoam/spraySummary.H
@@ -1,30 +1,30 @@
- label Nparcels = dieselSpray.size();
- reduce(Nparcels, sumOp<label>());
+ label Nparcels = dieselSpray.size();
+ reduce(Nparcels, sumOp<label>());
- Info<< "\nNumber of parcels in system.... | "
- << Nparcels << endl
- << "Injected liquid mass........... | "
- << 1e6*dieselSpray.injectedMass(runTime.value()) << " mg" << endl
- << "Liquid Mass in system.......... | "
- << 1e6*dieselSpray.liquidMass() << " mg" << endl
- << "SMD, Dmax...................... | "
- << dieselSpray.smd()*1e6 << " mu, "
- << dieselSpray.maxD()*1e6 << " mu"
- << endl;
+ Info<< "\nNumber of parcels in system.... | "
+ << Nparcels << endl
+ << "Injected liquid mass........... | "
+ << 1e6*dieselSpray.injectedMass(runTime.value()) << " mg" << endl
+ << "Liquid Mass in system.......... | "
+ << 1e6*dieselSpray.liquidMass() << " mg" << endl
+ << "SMD, Dmax...................... | "
+ << dieselSpray.smd()*1e6 << " mu, "
+ << dieselSpray.maxD()*1e6 << " mu"
+ << endl;
- scalar evapMass =
- dieselSpray.injectedMass(runTime.value())
- - dieselSpray.liquidMass();
+ scalar evapMass =
+ dieselSpray.injectedMass(runTime.value())
+ - dieselSpray.liquidMass();
- scalar gasMass = fvc::domainIntegrate(rho).value();
+ scalar gasMass = fvc::domainIntegrate(rho).value();
- if (dieselSpray.twoD())
- {
- gasMass *= 2.0*mathematicalConstant::pi/dieselSpray.angleOfWedge();
- }
+ if (dieselSpray.twoD())
+ {
+ gasMass *= 2.0*mathematicalConstant::pi/dieselSpray.angleOfWedge();
+ }
- scalar addedMass = gasMass - gasMass0;
+ scalar addedMass = gasMass - gasMass0;
- Info<< "Added gas mass................. | " << 1e6*addedMass << " mg"
- << nl << "Evaporation Continuity Error... | "
- << 1e6*(addedMass - evapMass) << " mg" << endl;
+ Info<< "Added gas mass................. | " << 1e6*addedMass << " mg"
+ << nl << "Evaporation Continuity Error... | "
+ << 1e6*(addedMass - evapMass) << " mg" << endl;
diff --git a/applications/solvers/combustion/dieselFoam/dieselFoam.C b/applications/solvers/combustion/dieselFoam/dieselFoam.C
index 31d034bc573..11cd91a488e 100644
--- a/applications/solvers/combustion/dieselFoam/dieselFoam.C
+++ b/applications/solvers/combustion/dieselFoam/dieselFoam.C
@@ -34,7 +34,7 @@ Description
#include "hCombustionThermo.H"
#include "turbulenceModel.H"
#include "spray.H"
-#include "chemistryModel.H"
+#include "psiChemistryModel.H"
#include "chemistrySolver.H"
#include "multivariateScheme.H"
@@ -46,28 +46,27 @@ Description
int main(int argc, char *argv[])
{
-
-# include "setRootCase.H"
-# include "createTime.H"
-# include "createMesh.H"
-# include "createFields.H"
-# include "readEnvironmentalProperties.H"
-# include "readCombustionProperties.H"
-# include "createSpray.H"
-# include "initContinuityErrs.H"
-# include "readTimeControls.H"
-# include "compressibleCourantNo.H"
-# include "setInitialDeltaT.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+ #include "setRootCase.H"
+ #include "createTime.H"
+ #include "createMesh.H"
+ #include "createFields.H"
+ #include "readEnvironmentalProperties.H"
+ #include "readCombustionProperties.H"
+ #include "createSpray.H"
+ #include "initContinuityErrs.H"
+ #include "readTimeControls.H"
+ #include "compressibleCourantNo.H"
+ #include "setInitialDeltaT.H"
+
+ // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
Info << "\nStarting time loop\n" << endl;
while (runTime.run())
{
-# include "readPISOControls.H"
-# include "compressibleCourantNo.H"
-# include "setDeltaT.H"
+ #include "readPISOControls.H"
+ #include "compressibleCourantNo.H"
+ #include "setDeltaT.H"
runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
@@ -94,26 +93,26 @@ int main(int argc, char *argv[])
kappa = (runTime.deltaT() + tc)/(runTime.deltaT()+tc+tk);
}
-# include "rhoEqn.H"
-# include "UEqn.H"
+ #include "rhoEqn.H"
+ #include "UEqn.H"
for (label ocorr=1; ocorr <= nOuterCorr; ocorr++)
{
-# include "YEqn.H"
-# include "hEqn.H"
+ #include "YEqn.H"
+ #include "hEqn.H"
// --- PISO loop
for (int corr=1; corr<=nCorr; corr++)
{
-# include "pEqn.H"
+ #include "pEqn.H"
}
}
turbulence->correct();
-# include "spraySummary.H"
+ #include "spraySummary.H"
- rho = thermo->rho();
+ rho = thermo.rho();
runTime.write();
diff --git a/applications/solvers/combustion/dieselFoam/pEqn.H b/applications/solvers/combustion/dieselFoam/pEqn.H
index 37e63e8635c..d74947fe530 100644
--- a/applications/solvers/combustion/dieselFoam/pEqn.H
+++ b/applications/solvers/combustion/dieselFoam/pEqn.H
@@ -1,4 +1,4 @@
-rho = thermo->rho();
+rho = thermo.rho();
volScalarField rUA = 1.0/UEqn.A();
U = rUA*UEqn.H();
@@ -8,7 +8,7 @@ if (transonic)
surfaceScalarField phid
(
"phid",
- fvc::interpolate(thermo->psi())
+ fvc::interpolate(psi)
*(
(fvc::interpolate(U) & mesh.Sf())
+ fvc::ddtPhiCorr(rUA, rho, U, phi)
@@ -36,9 +36,9 @@ if (transonic)
}
else
{
- phi =
- fvc::interpolate(rho)*
- (
+ phi =
+ fvc::interpolate(rho)
+ *(
(fvc::interpolate(U) & mesh.Sf())
+ fvc::ddtPhiCorr(rUA, rho, U, phi)
);
diff --git a/applications/solvers/combustion/engineFoam/engineFoam.C b/applications/solvers/combustion/engineFoam/engineFoam.C
index a835e8ea429..33a8ea6f5d6 100644
--- a/applications/solvers/combustion/engineFoam/engineFoam.C
+++ b/applications/solvers/combustion/engineFoam/engineFoam.C
@@ -63,29 +63,29 @@ Description
int main(int argc, char *argv[])
{
-# include "setRootCase.H"
-
-# include "createEngineTime.H"
-# include "createEngineMesh.H"
-# include "readPISOControls.H"
-# include "readCombustionProperties.H"
-# include "createFields.H"
-# include "initContinuityErrs.H"
-# include "readEngineTimeControls.H"
-# include "compressibleCourantNo.H"
-# include "setInitialDeltaT.H"
-# include "startSummary.H"
+ #include "setRootCase.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+ #include "createEngineTime.H"
+ #include "createEngineMesh.H"
+ #include "readPISOControls.H"
+ #include "readCombustionProperties.H"
+ #include "createFields.H"
+ #include "initContinuityErrs.H"
+ #include "readEngineTimeControls.H"
+ #include "compressibleCourantNo.H"
+ #include "setInitialDeltaT.H"
+ #include "startSummary.H"
+
+ // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
Info << "\nStarting time loop\n" << endl;
while (runTime.run())
{
-# include "readPISOControls.H"
-# include "readEngineTimeControls.H"
-# include "compressibleCourantNo.H"
-# include "setDeltaT.H"
+ #include "readPISOControls.H"
+ #include "readEngineTimeControls.H"
+ #include "compressibleCourantNo.H"
+ #include "setDeltaT.H"
runTime++;
@@ -93,31 +93,31 @@ int main(int argc, char *argv[])
mesh.move();
-# include "rhoEqn.H"
+ #include "rhoEqn.H"
-# include "UEqn.H"
+ #include "UEqn.H"
// --- PISO loop
for (int corr=1; corr<=nCorr; corr++)
{
-# include "ftEqn.H"
-# include "bEqn.H"
-# include "huEqn.H"
-# include "hEqn.H"
+ #include "ftEqn.H"
+ #include "bEqn.H"
+ #include "huEqn.H"
+ #include "hEqn.H"
if (!ign.ignited())
{
hu == h;
}
-# include "pEqn.H"
+ #include "pEqn.H"
}
turbulence->correct();
-# include "logSummary.H"
+ #include "logSummary.H"
- rho = thermo->rho();
+ rho = thermo.rho();
runTime.write();
diff --git a/applications/solvers/combustion/engineFoam/pEqn.H b/applications/solvers/combustion/engineFoam/pEqn.H
index 638d952f175..39b49673120 100644
--- a/applications/solvers/combustion/engineFoam/pEqn.H
+++ b/applications/solvers/combustion/engineFoam/pEqn.H
@@ -1,4 +1,4 @@
-rho = thermo->rho();
+rho = thermo.rho();
volScalarField rUA = 1.0/UEqn.A();
U = rUA*UEqn.H();
@@ -8,8 +8,8 @@ if (transonic)
surfaceScalarField phid
(
"phid",
- fvc::interpolate(thermo->psi())
- *((fvc::interpolate(U) & mesh.Sf()) - fvc::meshPhi(rho, U))
+ fvc::interpolate(psi)
+ *((fvc::interpolate(U) & mesh.Sf()) - fvc::meshPhi(rho, U))
);
for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
diff --git a/applications/solvers/combustion/engineFoam/readEngineTimeControls.H b/applications/solvers/combustion/engineFoam/readEngineTimeControls.H
index 2aea3445eb2..8d6d5f28b3b 100644
--- a/applications/solvers/combustion/engineFoam/readEngineTimeControls.H
+++ b/applications/solvers/combustion/engineFoam/readEngineTimeControls.H
@@ -1,3 +1,3 @@
-#include "readTimeControls.H"
+ #include "readTimeControls.H"
maxDeltaT = runTime.userTimeToTime(maxDeltaT);
diff --git a/applications/solvers/combustion/reactingFoam/YEqn.H b/applications/solvers/combustion/reactingFoam/YEqn.H
index 873351ac9b4..cda24ec2f72 100644
--- a/applications/solvers/combustion/reactingFoam/YEqn.H
+++ b/applications/solvers/combustion/reactingFoam/YEqn.H
@@ -13,7 +13,7 @@ tmp<fv::convectionScheme<scalar> > mvConvection
label inertIndex = -1;
volScalarField Yt = 0.0*Y[0];
- for(label i=0; i<Y.size(); i++)
+ for (label i=0; i<Y.size(); i++)
{
if (Y[i].name() != inertSpecie)
{
@@ -37,7 +37,7 @@ tmp<fv::convectionScheme<scalar> > mvConvection
inertIndex = i;
}
}
-
+
Y[inertIndex] = scalar(1) - Yt;
Y[inertIndex].max(0.0);
}
diff --git a/applications/solvers/combustion/reactingFoam/createFields.H b/applications/solvers/combustion/reactingFoam/createFields.H
index 510f7d42366..d92766db549 100644
--- a/applications/solvers/combustion/reactingFoam/createFields.H
+++ b/applications/solvers/combustion/reactingFoam/createFields.H
@@ -1,13 +1,16 @@
Info<< nl << "Reading thermophysicalProperties" << endl;
-autoPtr<hCombustionThermo> thermo
+autoPtr<psiChemistryModel> pChemistry
(
- hCombustionThermo::New(mesh)
+ psiChemistryModel::New(mesh)
);
+psiChemistryModel& chemistry = pChemistry();
-combustionMixture& composition = thermo->composition();
+hCombustionThermo& thermo = chemistry.thermo();
+
+basicMultiComponentMixture& composition = thermo.composition();
PtrList<volScalarField>& Y = composition.Y();
-word inertSpecie(thermo->lookup("inertSpecie"));
+word inertSpecie(thermo.lookup("inertSpecie"));
volScalarField rho
(
@@ -17,7 +20,7 @@ volScalarField rho
runTime.timeName(),
mesh
),
- thermo->rho()
+ thermo.rho()
);
Info<< "Reading field U\n" << endl;
@@ -35,9 +38,9 @@ volVectorField U
);
-volScalarField& p = thermo->p();
-const volScalarField& psi = thermo->psi();
-volScalarField& h = thermo->h();
+volScalarField& p = thermo.p();
+const volScalarField& psi = thermo.psi();
+volScalarField& h = thermo.h();
#include "compressibleCreatePhi.H"
@@ -64,7 +67,7 @@ autoPtr<compressible::turbulenceModel> turbulence
rho,
U,
phi,
- thermo()
+ thermo
)
);
@@ -72,31 +75,11 @@ Info<< "Creating field DpDt\n" << endl;
volScalarField DpDt =
fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p);
-Info << "Constructing chemical mechanism" << endl;
-chemistryModel chemistry
-(
- thermo(),
- rho
-);
-
multivariateSurfaceInterpolationScheme<scalar>::fieldTable fields;
-for(label i=0; i<Y.size(); i++)
+forAll (Y, i)
{
fields.add(Y[i]);
}
fields.add(h);
-volScalarField dQ
-(
- IOobject
- (
- "dQ",
- runTime.timeName(),
- mesh,
- IOobject::NO_READ,
- IOobject::AUTO_WRITE
- ),
- mesh,
- dimensionedScalar("zero", dimensionSet(1, -3, -1, 0, 0, 0, 0), 0.0)
-);
diff --git a/applications/solvers/combustion/reactingFoam/reactingFoam.C b/applications/solvers/combustion/reactingFoam/reactingFoam.C
index e915818bdc1..2a9e34e5773 100644
--- a/applications/solvers/combustion/reactingFoam/reactingFoam.C
+++ b/applications/solvers/combustion/reactingFoam/reactingFoam.C
@@ -33,7 +33,7 @@ Description
#include "fvCFD.H"
#include "hCombustionThermo.H"
#include "turbulenceModel.H"
-#include "chemistryModel.H"
+#include "psiChemistryModel.H"
#include "chemistrySolver.H"
#include "multivariateScheme.H"
@@ -41,52 +41,52 @@ Description
int main(int argc, char *argv[])
{
-# include "setRootCase.H"
-# include "createTime.H"
-# include "createMesh.H"
-# include "readChemistryProperties.H"
-# include "readEnvironmentalProperties.H"
-# include "createFields.H"
-# include "initContinuityErrs.H"
-# include "readTimeControls.H"
-# include "compressibleCourantNo.H"
-# include "setInitialDeltaT.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+ #include "setRootCase.H"
+ #include "createTime.H"
+ #include "createMesh.H"
+ #include "readChemistryProperties.H"
+ #include "readEnvironmentalProperties.H"
+ #include "createFields.H"
+ #include "initContinuityErrs.H"
+ #include "readTimeControls.H"
+ #include "compressibleCourantNo.H"
+ #include "setInitialDeltaT.H"
+
+ // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
Info << "\nStarting time loop\n" << endl;
while (runTime.run())
{
-# include "readTimeControls.H"
-# include "readPISOControls.H"
-# include "compressibleCourantNo.H"
-# include "setDeltaT.H"
+ #include "readTimeControls.H"
+ #include "readPISOControls.H"
+ #include "compressibleCourantNo.H"
+ #include "setDeltaT.H"
runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
-# include "chemistry.H"
-# include "rhoEqn.H"
-# include "UEqn.H"
+ #include "chemistry.H"
+ #include "rhoEqn.H"
+ #include "UEqn.H"
for (label ocorr=1; ocorr <= nOuterCorr; ocorr++)
{
-# include "YEqn.H"
+ #include "YEqn.H"
-# define Db turbulence->alphaEff()
-# include "hEqn.H"
+ #define Db turbulence->alphaEff()
+ #include "hEqn.H"
// --- PISO loop
for (int corr=1; corr<=nCorr; corr++)
{
-# include "pEqn.H"
+ #include "pEqn.H"
}
}
turbulence->correct();
- rho = thermo->rho();
+ rho = thermo.rho();
runTime.write();
diff --git a/applications/solvers/compressible/rhoCentralFoam/compressibleCourantNo.H b/applications/solvers/compressible/rhoCentralFoam/compressibleCourantNo.H
index ebec931a54f..33b4edc8a7d 100644
--- a/applications/solvers/compressible/rhoCentralFoam/compressibleCourantNo.H
+++ b/applications/solvers/compressible/rhoCentralFoam/compressibleCourantNo.H
@@ -38,11 +38,11 @@ if (mesh.nInternalFaces())
surfaceScalarField amaxSfbyDelta =
mesh.surfaceInterpolation::deltaCoeffs()*amaxSf;
- CoNum = max(amaxSfbyDelta/mesh.magSf())
- .value()*runTime.deltaT().value();
+ CoNum = max(amaxSfbyDelta/mesh.magSf()).value()*runTime.deltaT().value();
- meanCoNum = (sum(amaxSfbyDelta)/sum(mesh.magSf()))
- .value()*runTime.deltaT().value();
+ meanCoNum =
+ (sum(amaxSfbyDelta)/sum(mesh.magSf())).value()
+ *runTime.deltaT().value();
}
Info<< "Mean and max Courant Numbers = "
diff --git a/applications/solvers/compressible/rhoCentralFoam/createFields.H b/applications/solvers/compressible/rhoCentralFoam/createFields.H
index 3b273bb3dda..daf3a88435c 100644
--- a/applications/solvers/compressible/rhoCentralFoam/createFields.H
+++ b/applications/solvers/compressible/rhoCentralFoam/createFields.H
@@ -1,15 +1,16 @@
Info<< "Reading thermophysical properties\n" << endl;
-autoPtr<basicThermo> thermo
+autoPtr<basicPsiThermo> pThermo
(
- basicThermo::New(mesh)
+ basicPsiThermo::New(mesh)
);
+basicPsiThermo& thermo = pThermo();
-volScalarField& p = thermo->p();
-volScalarField& h = thermo->h();
-const volScalarField& T = thermo->T();
-const volScalarField& psi = thermo->psi();
-const volScalarField& mu = thermo->mu();
+volScalarField& p = thermo.p();
+volScalarField& h = thermo.h();
+const volScalarField& T = thermo.T();
+const volScalarField& psi = thermo.psi();
+const volScalarField& mu = thermo.mu();
bool inviscid(true);
if (max(mu.internalField()) > 0.0)
@@ -42,7 +43,7 @@ volScalarField rho
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
- thermo->rho(),
+ thermo.rho(),
rhoBoundaryTypes
);
diff --git a/applications/solvers/compressible/rhoCentralFoam/rhoBoundaryTypes.H b/applications/solvers/compressible/rhoCentralFoam/rhoBoundaryTypes.H
index c85f4919852..7118d24fc92 100644
--- a/applications/solvers/compressible/rhoCentralFoam/rhoBoundaryTypes.H
+++ b/applications/solvers/compressible/rhoCentralFoam/rhoBoundaryTypes.H
@@ -3,10 +3,7 @@ wordList rhoBoundaryTypes = pbf.types();
forAll(rhoBoundaryTypes, patchi)
{
- if
- (
- rhoBoundaryTypes[patchi] == "waveTransmissive"
- )
+ if (rhoBoundaryTypes[patchi] == "waveTransmissive")
{
rhoBoundaryTypes[patchi] = zeroGradientFvPatchScalarField::typeName;
}
diff --git a/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C b/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C
index 502406d1322..f418f176374 100644
--- a/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C
+++ b/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C
@@ -32,7 +32,7 @@ Description
\*---------------------------------------------------------------------------*/
#include "fvCFD.H"
-#include "basicThermo.H"
+#include "basicPsiThermo.H"
#include "zeroGradientFvPatchFields.H"
#include "fixedRhoFvPatchScalarField.H"
@@ -40,18 +40,17 @@ Description
int main(int argc, char *argv[])
{
+ #include "setRootCase.H"
-# include "setRootCase.H"
+ #include "createTime.H"
+ #include "createMesh.H"
+ #include "createFields.H"
+ #include "readThermophysicalProperties.H"
+ #include "readTimeControls.H"
-# include "createTime.H"
-# include "createMesh.H"
-# include "createFields.H"
-# include "readThermophysicalProperties.H"
-# include "readTimeControls.H"
+ // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-# include "readFluxScheme.H"
+ #include "readFluxScheme.H"
dimensionedScalar v_zero("v_zero",dimVolume/dimTime, 0.0);
@@ -91,7 +90,7 @@ int main(int argc, char *argv[])
surfaceScalarField phiv_pos = U_pos & mesh.Sf();
surfaceScalarField phiv_neg = U_neg & mesh.Sf();
- volScalarField c = sqrt(thermo->Cp()/thermo->Cv()*rPsi);
+ volScalarField c = sqrt(thermo.Cp()/thermo.Cv()*rPsi);
surfaceScalarField cSf_pos = fvc::interpolate(c, pos, "reconstruct(T)")*mesh.magSf();
surfaceScalarField cSf_neg = fvc::interpolate(c, neg, "reconstruct(T)")*mesh.magSf();
@@ -102,9 +101,9 @@ int main(int argc, char *argv[])
surfaceScalarField amaxSf("amaxSf", max(mag(am), mag(ap)));
-# include "compressibleCourantNo.H"
-# include "readTimeControls.H"
-# include "setDeltaT.H"
+ #include "compressibleCourantNo.H"
+ #include "readTimeControls.H"
+ #include "setDeltaT.H"
runTime++;
@@ -183,7 +182,7 @@ int main(int argc, char *argv[])
h = (rhoE + p)/rho - 0.5*magSqr(U);
h.correctBoundaryConditions();
- thermo->correct();
+ thermo.correct();
rhoE.boundaryField() =
rho.boundaryField()*
(
@@ -193,15 +192,15 @@ int main(int argc, char *argv[])
if (!inviscid)
{
- volScalarField k("k", thermo->Cp()*mu/Pr);
+ volScalarField k("k", thermo.Cp()*mu/Pr);
solve
(
fvm::ddt(rho, h) - fvc::ddt(rho, h)
- - fvm::laplacian(thermo->alpha(), h)
- + fvc::laplacian(thermo->alpha(), h)
+ - fvm::laplacian(thermo.alpha(), h)
+ + fvc::laplacian(thermo.alpha(), h)
- fvc::laplacian(k, T)
);
- thermo->correct();
+ thermo.correct();
rhoE = rho*(h + 0.5*magSqr(U)) - p;
}
diff --git a/applications/solvers/compressible/rhoPimpleFoam/createFields.H b/applications/solvers/compressible/rhoPimpleFoam/createFields.H
index e836704cb1f..1433ea5cc3d 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/createFields.H
+++ b/applications/solvers/compressible/rhoPimpleFoam/createFields.H
@@ -1,13 +1,14 @@
Info<< "Reading thermophysical properties\n" << endl;
- autoPtr<basicThermo> thermo
+ autoPtr<basicPsiThermo> pThermo
(
- basicThermo::New(mesh)
+ basicPsiThermo::New(mesh)
);
+ basicPsiThermo& thermo = pThermo();
- volScalarField& p = thermo->p();
- volScalarField& h = thermo->h();
- const volScalarField& psi = thermo->psi();
+ volScalarField& p = thermo.p();
+ volScalarField& h = thermo.h();
+ const volScalarField& psi = thermo.psi();
volScalarField rho
(
@@ -19,7 +20,7 @@
IOobject::READ_IF_PRESENT,
IOobject::AUTO_WRITE
),
- thermo->rho()
+ thermo.rho()
);
Info<< "Reading field U\n" << endl;
@@ -51,7 +52,7 @@
rho,
U,
phi,
- thermo()
+ thermo
)
);
diff --git a/applications/solvers/compressible/rhoPimpleFoam/hEqn.H b/applications/solvers/compressible/rhoPimpleFoam/hEqn.H
index dbc76740f51..e66b99442b8 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/hEqn.H
+++ b/applications/solvers/compressible/rhoPimpleFoam/hEqn.H
@@ -19,5 +19,5 @@
hEqn.solve();
}
- thermo->correct();
+ thermo.correct();
}
diff --git a/applications/solvers/compressible/rhoPimpleFoam/pEqn.H b/applications/solvers/compressible/rhoPimpleFoam/pEqn.H
index 7918618404a..9c4e9658cc7 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/pEqn.H
+++ b/applications/solvers/compressible/rhoPimpleFoam/pEqn.H
@@ -1,4 +1,4 @@
-rho = thermo->rho();
+rho = thermo.rho();
volScalarField rUA = 1.0/UEqn().A();
U = rUA*UEqn().H();
@@ -13,7 +13,7 @@ if (transonic)
surfaceScalarField phid
(
"phid",
- fvc::interpolate(thermo->psi())
+ fvc::interpolate(psi)
*(
(fvc::interpolate(U) & mesh.Sf())
+ fvc::ddtPhiCorr(rUA, rho, U, phi)
@@ -99,7 +99,7 @@ else
// Explicitly relax pressure for momentum corrector
p.relax();
- rho = thermo->rho();
+ rho = thermo.rho();
rho.relax();
Info<< "rho max/min : " << max(rho).value()
<< " " << min(rho).value() << endl;
@@ -117,7 +117,7 @@ bound(p, pMin);
/*
if (closedVolume)
{
- p += (initialMass - fvc::domainIntegrate(thermo->psi()*p))
- /fvc::domainIntegrate(thermo->psi());
+ p += (initialMass - fvc::domainIntegrate(psi*p))
+ /fvc::domainIntegrate(psi);
}
*/
diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
index 8b916b308ef..19a26875db5 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
+++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
@@ -35,7 +35,7 @@ Description
\*---------------------------------------------------------------------------*/
#include "fvCFD.H"
-#include "basicThermo.H"
+#include "basicPsiThermo.H"
#include "turbulenceModel.H"
#include "bound.H"
diff --git a/applications/solvers/compressible/rhoPisoFoam/createFields.H b/applications/solvers/compressible/rhoPisoFoam/createFields.H
index 614f01702df..fdb706a14ce 100644
--- a/applications/solvers/compressible/rhoPisoFoam/createFields.H
+++ b/applications/solvers/compressible/rhoPisoFoam/createFields.H
@@ -1,13 +1,14 @@
Info<< "Reading thermophysical properties\n" << endl;
- autoPtr<basicThermo> thermo
+ autoPtr<basicPsiThermo> pThermo
(
- basicThermo::New(mesh)
+ basicPsiThermo::New(mesh)
);
+ basicPsiThermo& thermo = pThermo();
- volScalarField& p = thermo->p();
- volScalarField& h = thermo->h();
- const volScalarField& psi = thermo->psi();
+ volScalarField& p = thermo.p();
+ volScalarField& h = thermo.h();
+ const volScalarField& psi = thermo.psi();
volScalarField rho
(
@@ -19,7 +20,7 @@
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
- thermo->rho()
+ thermo.rho()
);
Info<< "\nReading field U\n" << endl;
@@ -47,7 +48,7 @@
rho,
U,
phi,
- thermo()
+ thermo
)
);
diff --git a/applications/solvers/compressible/rhoPisoFoam/hEqn.H b/applications/solvers/compressible/rhoPisoFoam/hEqn.H
index f72ef0c89cb..ae60d3316ec 100644
--- a/applications/solvers/compressible/rhoPisoFoam/hEqn.H
+++ b/applications/solvers/compressible/rhoPisoFoam/hEqn.H
@@ -8,5 +8,5 @@
DpDt
);
- thermo->correct();
+ thermo.correct();
}
diff --git a/applications/solvers/compressible/rhoPisoFoam/pEqn.H b/applications/solvers/compressible/rhoPisoFoam/pEqn.H
index 05db89627da..280842ecc38 100644
--- a/applications/solvers/compressible/rhoPisoFoam/pEqn.H
+++ b/applications/solvers/compressible/rhoPisoFoam/pEqn.H
@@ -1,4 +1,4 @@
-rho = thermo->rho();
+rho = thermo.rho();
volScalarField rUA = 1.0/UEqn.A();
U = rUA*UEqn.H();
@@ -8,7 +8,7 @@ if (transonic)
surfaceScalarField phid
(
"phid",
- fvc::interpolate(thermo->psi())
+ fvc::interpolate(psi)
*(
(fvc::interpolate(U) & mesh.Sf())
+ fvc::ddtPhiCorr(rUA, rho, U, phi)
@@ -34,7 +34,7 @@ if (transonic)
}
else
{
- phi =
+ phi =
fvc::interpolate(rho)*
(
(fvc::interpolate(U) & mesh.Sf())
diff --git a/applications/solvers/compressible/rhoPisoFoam/rhoPisoFoam.C b/applications/solvers/compressible/rhoPisoFoam/rhoPisoFoam.C
index c349e7520e6..2d9cccd29e6 100644
--- a/applications/solvers/compressible/rhoPisoFoam/rhoPisoFoam.C
+++ b/applications/solvers/compressible/rhoPisoFoam/rhoPisoFoam.C
@@ -31,7 +31,7 @@ Description
\*---------------------------------------------------------------------------*/
#include "fvCFD.H"
-#include "basicThermo.H"
+#include "basicPsiThermo.H"
#include "turbulenceModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -77,7 +77,7 @@ int main(int argc, char *argv[])
turbulence->correct();
- rho = thermo->rho();
+ rho = thermo.rho();
runTime.write();
diff --git a/applications/solvers/compressible/rhoPorousSimpleFoam/createFields.H b/applications/solvers/compressible/rhoPorousSimpleFoam/createFields.H
index eee3959a4e0..1177cba2a4b 100644
--- a/applications/solvers/compressible/rhoPorousSimpleFoam/createFields.H
+++ b/applications/solvers/compressible/rhoPorousSimpleFoam/createFields.H
@@ -1,9 +1,10 @@
Info<< "Reading thermophysical properties\n" << endl;
- autoPtr<basicThermo> thermo
+ autoPtr<basicPsiThermo> pThermo
(
- basicThermo::New(mesh)
+ basicPsiThermo::New(mesh)
);
+ basicPsiThermo& thermo = pThermo();
volScalarField rho
(
@@ -15,11 +16,12 @@
IOobject::READ_IF_PRESENT,
IOobject::AUTO_WRITE
),
- thermo->rho()
+ thermo.rho()
);
- volScalarField& p = thermo->p();
- volScalarField& h = thermo->h();
+ volScalarField& p = thermo.p();
+ volScalarField& h = thermo.h();
+ const volScalarField& psi = thermo.psi();
Info<< "Reading field U\n" << endl;
@@ -36,7 +38,7 @@
mesh
);
-# include "compressibleCreatePhi.H"
+ #include "compressibleCreatePhi.H"
label pRefCell = 0;
@@ -56,7 +58,7 @@
rho,
U,
phi,
- thermo()
+ thermo
)
);
diff --git a/applications/solvers/compressible/rhoPorousSimpleFoam/hEqn.H b/applications/solvers/compressible/rhoPorousSimpleFoam/hEqn.H
index 8eb03f95eb4..605b8820d18 100644
--- a/applications/solvers/compressible/rhoPorousSimpleFoam/hEqn.H
+++ b/applications/solvers/compressible/rhoPorousSimpleFoam/hEqn.H
@@ -14,5 +14,5 @@
eqnResidual = hEqn.solve().initialResidual();
maxResidual = max(eqnResidual, maxResidual);
- thermo->correct();
+ thermo.correct();
}
diff --git a/applications/solvers/compressible/rhoPorousSimpleFoam/pEqn.H b/applications/solvers/compressible/rhoPorousSimpleFoam/pEqn.H
index ae41da9e36f..4d8e010f7e3 100644
--- a/applications/solvers/compressible/rhoPorousSimpleFoam/pEqn.H
+++ b/applications/solvers/compressible/rhoPorousSimpleFoam/pEqn.H
@@ -65,10 +65,10 @@ bound(p, pMin);
// to obey overall mass continuity
if (closedVolume)
{
- p += (initialMass - fvc::domainIntegrate(thermo->psi()*p))
- /fvc::domainIntegrate(thermo->psi());
+ p += (initialMass - fvc::domainIntegrate(psi*p))
+ /fvc::domainIntegrate(psi);
}
-rho = thermo->rho();
+rho = thermo.rho();
rho.relax();
Info<< "rho max/min : " << max(rho).value() << " " << min(rho).value() << endl;
diff --git a/applications/solvers/compressible/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C b/applications/solvers/compressible/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C
index 0cd144fce23..fbc27d88460 100644
--- a/applications/solvers/compressible/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C
+++ b/applications/solvers/compressible/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C
@@ -27,12 +27,12 @@ Application
Description
Steady-state solver for turbulent flow of compressible fluids with
- implicit or explicit porosity treatment
+ RANS turbulence modelling, and implicit or explicit porosity treatment
\*---------------------------------------------------------------------------*/
#include "fvCFD.H"
-#include "basicThermo.H"
+#include "basicPsiThermo.H"
#include "RASModel.H"
#include "porousZones.H"
diff --git a/applications/solvers/compressible/rhoSimpleFoam/createFields.H b/applications/solvers/compressible/rhoSimpleFoam/createFields.H
index 9c4f446c37f..690b53760d7 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/createFields.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/createFields.H
@@ -1,9 +1,10 @@
Info<< "Reading thermophysical properties\n" << endl;
- autoPtr<basicThermo> thermo
+ autoPtr<basicPsiThermo> pThermo
(
- basicThermo::New(mesh)
+ basicPsiThermo::New(mesh)
);
+ basicPsiThermo& thermo = pThermo();
volScalarField rho
(
@@ -15,12 +16,12 @@
IOobject::READ_IF_PRESENT,
IOobject::AUTO_WRITE
),
- thermo->rho()
+ thermo.rho()
);
- volScalarField& p = thermo->p();
- volScalarField& h = thermo->h();
-
+ volScalarField& p = thermo.p();
+ volScalarField& h = thermo.h();
+ const volScalarField& psi = thermo.psi();
Info<< "Reading field U\n" << endl;
volVectorField U
@@ -56,7 +57,7 @@
rho,
U,
phi,
- thermo()
+ thermo
)
);
diff --git a/applications/solvers/compressible/rhoSimpleFoam/hEqn.H b/applications/solvers/compressible/rhoSimpleFoam/hEqn.H
index 6a87bbdf119..e299d99f83c 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/hEqn.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/hEqn.H
@@ -14,5 +14,5 @@
eqnResidual = hEqn.solve().initialResidual();
maxResidual = max(eqnResidual, maxResidual);
- thermo->correct();
+ thermo.correct();
}
diff --git a/applications/solvers/compressible/rhoSimpleFoam/pEqn.H b/applications/solvers/compressible/rhoSimpleFoam/pEqn.H
index e4fbe15aa48..f6a433fd616 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/pEqn.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/pEqn.H
@@ -1,4 +1,4 @@
-rho = thermo->rho();
+rho = thermo.rho();
volScalarField rUA = 1.0/UEqn().A();
U = rUA*UEqn().H();
@@ -11,7 +11,7 @@ if (transonic)
surfaceScalarField phid
(
"phid",
- fvc::interpolate(thermo->psi())*(fvc::interpolate(U) & mesh.Sf())
+ fvc::interpolate(psi)*(fvc::interpolate(U) & mesh.Sf())
);
for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
@@ -82,7 +82,7 @@ else
// Explicitly relax pressure for momentum corrector
p.relax();
-rho = thermo->rho();
+rho = thermo.rho();
rho.relax();
Info<< "rho max/min : " << max(rho).value() << " " << min(rho).value() << endl;
@@ -95,6 +95,6 @@ bound(p, pMin);
// to obey overall mass continuity
if (closedVolume)
{
- p += (initialMass - fvc::domainIntegrate(thermo->psi()*p))
- /fvc::domainIntegrate(thermo->psi());
+ p += (initialMass - fvc::domainIntegrate(psi*p))
+ /fvc::domainIntegrate(psi);
}
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C b/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C
index bf6a9f24f33..099257e5ae4 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C
@@ -26,13 +26,13 @@ Application
rhoSimpleFoam
Description
- Steady-state SIMPLE solver for laminar or turbulent flow of
+ Steady-state SIMPLE solver for laminar or turbulent RANS flow of
compressible fluids.
\*---------------------------------------------------------------------------*/
#include "fvCFD.H"
-#include "basicThermo.H"
+#include "basicPsiThermo.H"
#include "RASModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/compressible/sonicDyMFoam/compressibleContinuityErrs.H b/applications/solvers/compressible/sonicDyMFoam/compressibleContinuityErrs.H
index eec8485329c..1d869cc58da 100644
--- a/applications/solvers/compressible/sonicDyMFoam/compressibleContinuityErrs.H
+++ b/applications/solvers/compressible/sonicDyMFoam/compressibleContinuityErrs.H
@@ -1,5 +1,5 @@
{
-# include "rhoEqn.H"
+ #include "rhoEqn.H"
}
{
scalar sumLocalContErr =
diff --git a/applications/solvers/compressible/sonicDyMFoam/createFields.H b/applications/solvers/compressible/sonicDyMFoam/createFields.H
index eb45a7c23af..bbb5d105269 100644
--- a/applications/solvers/compressible/sonicDyMFoam/createFields.H
+++ b/applications/solvers/compressible/sonicDyMFoam/createFields.H
@@ -1,13 +1,14 @@
Info<< "Reading thermophysical properties\n" << endl;
- autoPtr<basicThermo> thermo
+ autoPtr<basicPsiThermo> pThermo
(
- basicThermo::New(mesh)
+ basicPsiThermo::New(mesh)
);
+ basicPsiThermo& thermo = pThermo();
- volScalarField& p = thermo->p();
- volScalarField& h = thermo->h();
- const volScalarField& psi = thermo->psi();
+ volScalarField& p = thermo.p();
+ volScalarField& h = thermo.h();
+ const volScalarField& psi = thermo.psi();
volScalarField rho
(
@@ -17,7 +18,7 @@
runTime.timeName(),
mesh
),
- thermo->rho()
+ thermo.rho()
);
Info<< "Reading field U\n" << endl;
@@ -45,7 +46,7 @@
rho,
U,
phi,
- thermo()
+ thermo
)
);
diff --git a/applications/solvers/compressible/sonicDyMFoam/sonicDyMFoam.C b/applications/solvers/compressible/sonicDyMFoam/sonicDyMFoam.C
index 57b15a0f9ba..d86e41913e9 100644
--- a/applications/solvers/compressible/sonicDyMFoam/sonicDyMFoam.C
+++ b/applications/solvers/compressible/sonicDyMFoam/sonicDyMFoam.C
@@ -32,7 +32,7 @@ Description
\*---------------------------------------------------------------------------*/
#include "fvCFD.H"
-#include "basicThermo.H"
+#include "basicPsiThermo.H"
#include "turbulenceModel.H"
#include "motionSolver.H"
@@ -84,8 +84,8 @@ int main(int argc, char *argv[])
surfaceScalarField phid
(
"phid",
- fvc::interpolate(psi)*
- (
+ fvc::interpolate(psi)
+ *(
(fvc::interpolate(U) & mesh.Sf()) - fvc::meshPhi(rho, U)
)
);
diff --git a/applications/solvers/compressible/sonicFoam/createFields.H b/applications/solvers/compressible/sonicFoam/createFields.H
index eb45a7c23af..bbb5d105269 100644
--- a/applications/solvers/compressible/sonicFoam/createFields.H
+++ b/applications/solvers/compressible/sonicFoam/createFields.H
@@ -1,13 +1,14 @@
Info<< "Reading thermophysical properties\n" << endl;
- autoPtr<basicThermo> thermo
+ autoPtr<basicPsiThermo> pThermo
(
- basicThermo::New(mesh)
+ basicPsiThermo::New(mesh)
);
+ basicPsiThermo& thermo = pThermo();
- volScalarField& p = thermo->p();
- volScalarField& h = thermo->h();
- const volScalarField& psi = thermo->psi();
+ volScalarField& p = thermo.p();
+ volScalarField& h = thermo.h();
+ const volScalarField& psi = thermo.psi();
volScalarField rho
(
@@ -17,7 +18,7 @@
runTime.timeName(),
mesh
),
- thermo->rho()
+ thermo.rho()
);
Info<< "Reading field U\n" << endl;
@@ -45,7 +46,7 @@
rho,
U,
phi,
- thermo()
+ thermo
)
);
diff --git a/applications/solvers/compressible/sonicFoam/hEqn.H b/applications/solvers/compressible/sonicFoam/hEqn.H
index 5cb4c48c088..baa2dab3433 100644
--- a/applications/solvers/compressible/sonicFoam/hEqn.H
+++ b/applications/solvers/compressible/sonicFoam/hEqn.H
@@ -8,5 +8,5 @@
DpDt
);
- thermo->correct();
+ thermo.correct();
}
diff --git a/applications/solvers/compressible/sonicFoam/sonicFoam.C b/applications/solvers/compressible/sonicFoam/sonicFoam.C
index 6ff79607986..c9eda00fa34 100644
--- a/applications/solvers/compressible/sonicFoam/sonicFoam.C
+++ b/applications/solvers/compressible/sonicFoam/sonicFoam.C
@@ -32,7 +32,7 @@ Description
\*---------------------------------------------------------------------------*/
#include "fvCFD.H"
-#include "basicThermo.H"
+#include "basicPsiThermo.H"
#include "turbulenceModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -80,7 +80,7 @@ int main(int argc, char *argv[])
surfaceScalarField phid
(
"phid",
- fvc::interpolate(thermo->psi())
+ fvc::interpolate(psi)
*(
(fvc::interpolate(U) & mesh.Sf())
+ fvc::ddtPhiCorr(rUA, rho, U, phi)
diff --git a/applications/solvers/compressible/sonicLiquidFoam/createFields.H b/applications/solvers/compressible/sonicLiquidFoam/createFields.H
index f419234c7db..1268cbb7b06 100644
--- a/applications/solvers/compressible/sonicLiquidFoam/createFields.H
+++ b/applications/solvers/compressible/sonicLiquidFoam/createFields.H
@@ -41,4 +41,4 @@
);
-# include "compressibleCreatePhi.H"
+ #include "compressibleCreatePhi.H"
diff --git a/applications/solvers/compressible/sonicLiquidFoam/sonicLiquidFoam.C b/applications/solvers/compressible/sonicLiquidFoam/sonicLiquidFoam.C
index 0324da82998..763e03a4b97 100644
--- a/applications/solvers/compressible/sonicLiquidFoam/sonicLiquidFoam.C
+++ b/applications/solvers/compressible/sonicLiquidFoam/sonicLiquidFoam.C
@@ -37,16 +37,15 @@ Description
int main(int argc, char *argv[])
{
+ #include "setRootCase.H"
+ #include "createTime.H"
+ #include "createMesh.H"
+ #include "readThermodynamicProperties.H"
+ #include "readTransportProperties.H"
+ #include "createFields.H"
+ #include "initContinuityErrs.H"
-# include "setRootCase.H"
-# include "createTime.H"
-# include "createMesh.H"
-# include "readThermodynamicProperties.H"
-# include "readTransportProperties.H"
-# include "createFields.H"
-# include "initContinuityErrs.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+ // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
Info<< "\nStarting time loop\n" << endl;
@@ -54,10 +53,10 @@ int main(int argc, char *argv[])
{
Info<< "Time = " << runTime.timeName() << nl << endl;
-# include "readPISOControls.H"
-# include "compressibleCourantNo.H"
+ #include "readPISOControls.H"
+ #include "compressibleCourantNo.H"
-# include "rhoEqn.H"
+ #include "rhoEqn.H"
fvVectorMatrix UEqn
(
@@ -79,8 +78,8 @@ int main(int argc, char *argv[])
surfaceScalarField phid
(
"phid",
- psi*
- (
+ psi
+ *(
(fvc::interpolate(U) & mesh.Sf())
+ fvc::ddtPhiCorr(rUA, rho, U, phi)
)
@@ -100,7 +99,7 @@ int main(int argc, char *argv[])
phi += pEqn.flux();
-# include "compressibleContinuityErrs.H"
+ #include "compressibleContinuityErrs.H"
U -= rUA*fvc::grad(p);
U.correctBoundaryConditions();
diff --git a/applications/solvers/heatTransfer/buoyantPisoFoam/buoyantPisoFoam.C b/applications/solvers/heatTransfer/buoyantPisoFoam/buoyantPisoFoam.C
index b7efa050dee..b5055812c40 100644
--- a/applications/solvers/heatTransfer/buoyantPisoFoam/buoyantPisoFoam.C
+++ b/applications/solvers/heatTransfer/buoyantPisoFoam/buoyantPisoFoam.C
@@ -81,7 +81,7 @@ int main(int argc, char *argv[])
turbulence->correct();
- rho = thermo->rho();
+ rho = thermo.rho();
runTime.write();
diff --git a/applications/solvers/heatTransfer/buoyantPisoFoam/createFields.H b/applications/solvers/heatTransfer/buoyantPisoFoam/createFields.H
index bd0d71dc571..b5c84e435e3 100644
--- a/applications/solvers/heatTransfer/buoyantPisoFoam/createFields.H
+++ b/applications/solvers/heatTransfer/buoyantPisoFoam/createFields.H
@@ -1,9 +1,10 @@
Info<< "Reading thermophysical properties\n" << endl;
- autoPtr<basicRhoThermo> thermo
+ autoPtr<basicRhoThermo> pThermo
(
basicRhoThermo::New(mesh)
);
+ basicRhoThermo& thermo = pThermo();
volScalarField rho
(
@@ -15,12 +16,12 @@
IOobject::NO_READ,
IOobject::NO_WRITE
),
- thermo->rho()
+ thermo.rho()
);
- volScalarField& p = thermo->p();
- volScalarField& h = thermo->h();
- const volScalarField& psi = thermo->psi();
+ volScalarField& p = thermo.p();
+ volScalarField& h = thermo.h();
+ const volScalarField& psi = thermo.psi();
Info<< "Reading field U\n" << endl;
@@ -37,7 +38,7 @@
mesh
);
-# include "compressibleCreatePhi.H"
+ #include "compressibleCreatePhi.H"
Info<< "Creating turbulence model\n" << endl;
@@ -48,7 +49,7 @@
rho,
U,
phi,
- thermo()
+ thermo
)
);
@@ -59,7 +60,7 @@
fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p)
);
- thermo->correct();
+ thermo.correct();
dimensionedScalar initialMass = fvc::domainIntegrate(rho);
diff --git a/applications/solvers/heatTransfer/buoyantPisoFoam/hEqn.H b/applications/solvers/heatTransfer/buoyantPisoFoam/hEqn.H
index f1a87c6a798..3125cc3ffa8 100644
--- a/applications/solvers/heatTransfer/buoyantPisoFoam/hEqn.H
+++ b/applications/solvers/heatTransfer/buoyantPisoFoam/hEqn.H
@@ -11,5 +11,5 @@
hEqn.relax();
hEqn.solve();
- thermo->correct();
+ thermo.correct();
}
diff --git a/applications/solvers/heatTransfer/buoyantPisoFoam/pEqn.H b/applications/solvers/heatTransfer/buoyantPisoFoam/pEqn.H
index cfc8287cadd..c954c0ecb19 100644
--- a/applications/solvers/heatTransfer/buoyantPisoFoam/pEqn.H
+++ b/applications/solvers/heatTransfer/buoyantPisoFoam/pEqn.H
@@ -1,11 +1,11 @@
{
bool closedVolume = p.needReference();
- rho = thermo->rho();
+ rho = thermo.rho();
// Thermodynamic density needs to be updated by psi*d(p) after the
// pressure solution - done in 2 parts. Part 1:
- thermo->rho() -= psi*p;
+ thermo.rho() -= psi*p;
volScalarField rUA = 1.0/UEqn.A();
surfaceScalarField rhorUAf("(rho*(1|A(U)))", fvc::interpolate(rho*rUA));
@@ -48,7 +48,7 @@
}
// Second part of thermodynamic density update
- thermo->rho() += psi*p;
+ thermo.rho() += psi*p;
U += rUA*fvc::reconstruct((phi - phiU)/rhorUAf);
U.correctBoundaryConditions();
@@ -65,7 +65,7 @@
p +=
(initialMass - fvc::domainIntegrate(psi*p))
/fvc::domainIntegrate(psi);
- thermo->rho() = psi*p;
+ thermo.rho() = psi*p;
rho += (initialMass - fvc::domainIntegrate(rho))/totalVolume;
}
}
diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C b/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C
index b2a8c5c3742..52f915bd7ab 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C
+++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C
@@ -31,7 +31,7 @@ Description
\*---------------------------------------------------------------------------*/
#include "fvCFD.H"
-#include "basicThermo.H"
+#include "basicPsiThermo.H"
#include "RASModel.H"
#include "fixedGradientFvPatchFields.H"
diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H b/applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H
index 0d9d9d5ec7f..b304ace1046 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H
+++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H
@@ -1,9 +1,10 @@
Info<< "Reading thermophysical properties\n" << endl;
- autoPtr<basicThermo> thermo
+ autoPtr<basicPsiThermo> pThermo
(
- basicThermo::New(mesh)
+ basicPsiThermo::New(mesh)
);
+ basicPsiThermo& thermo = pThermo();
volScalarField rho
(
@@ -15,11 +16,12 @@
IOobject::NO_READ,
IOobject::NO_WRITE
),
- thermo->rho()
+ thermo.rho()
);
- volScalarField& p = thermo->p();
- volScalarField& h = thermo->h();
+ volScalarField& p = thermo.p();
+ volScalarField& h = thermo.h();
+ const volScalarField& psi = thermo.psi();
Info<< "Reading field U\n" << endl;
@@ -36,7 +38,7 @@
mesh
);
-# include "compressibleCreatePhi.H"
+ #include "compressibleCreatePhi.H"
Info<< "Creating turbulence model\n" << endl;
@@ -47,11 +49,11 @@
rho,
U,
phi,
- thermo()
+ thermo
)
);
- thermo->correct();
+ thermo.correct();
label pRefCell = 0;
scalar pRefValue = 0.0;
diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/hEqn.H b/applications/solvers/heatTransfer/buoyantSimpleFoam/hEqn.H
index dad078c2193..0c507ce3d18 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleFoam/hEqn.H
+++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/hEqn.H
@@ -14,5 +14,5 @@
eqnResidual = hEqn.solve().initialResidual();
maxResidual = max(eqnResidual, maxResidual);
- thermo->correct();
+ thermo.correct();
}
diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/initConvergenceCheck.H b/applications/solvers/heatTransfer/buoyantSimpleFoam/initConvergenceCheck.H
index b56197f22a5..c920b6708d0 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleFoam/initConvergenceCheck.H
+++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/initConvergenceCheck.H
@@ -1,4 +1,4 @@
-// initialize values for convergence checks
+ // initialize values for convergence checks
scalar eqnResidual = 1, maxResidual = 0;
scalar convergenceCriterion = 0;
diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H b/applications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H
index d592bc3c43e..e680e9421ae 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H
+++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/pEqn.H
@@ -1,5 +1,5 @@
{
- rho = thermo->rho();
+ rho = thermo.rho();
volScalarField rUA = 1.0/UEqn().A();
surfaceScalarField rhorUAf("(rho*(1|A(U)))", fvc::interpolate(rho*rUA));
@@ -39,8 +39,8 @@
// to obey overall mass continuity
if (closedVolume)
{
- p += (initialMass - fvc::domainIntegrate(thermo->psi()*p))
- /fvc::domainIntegrate(thermo->psi());
+ p += (initialMass - fvc::domainIntegrate(psi*p))
+ /fvc::domainIntegrate(psi);
}
// Calculate the conservative fluxes
@@ -58,7 +58,7 @@
#include "continuityErrs.H"
- rho = thermo->rho();
+ rho = thermo.rho();
rho.relax();
Info<< "rho max/min : " << max(rho).value() << " " << min(rho).value()
<< endl;
diff --git a/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/buoyantSimpleRadiationFoam.C b/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/buoyantSimpleRadiationFoam.C
index 5996e6be23b..0862d20bb2c 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/buoyantSimpleRadiationFoam.C
+++ b/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/buoyantSimpleRadiationFoam.C
@@ -32,7 +32,7 @@ Description
\*---------------------------------------------------------------------------*/
#include "fvCFD.H"
-#include "basicThermo.H"
+#include "basicPsiThermo.H"
#include "RASModel.H"
#include "fixedGradientFvPatchFields.H"
#include "radiationModel.H"
@@ -61,7 +61,7 @@ int main(int argc, char *argv[])
# include "readSIMPLEControls.H"
# include "initConvergenceCheck.H"
- pd.storePrevIter();
+ p.storePrevIter();
rho.storePrevIter();
// Pressure-velocity SIMPLE corrector
diff --git a/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/hEqn.H b/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/hEqn.H
index 31462927b94..24b17645d2c 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/hEqn.H
+++ b/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/hEqn.H
@@ -7,7 +7,7 @@
==
fvc::div(phi/fvc::interpolate(rho)*fvc::interpolate(p))
- p*fvc::div(phi/fvc::interpolate(rho))
- + radiation->Sh(thermo())
+ + radiation->Sh(thermo)
);
hEqn.relax();
@@ -15,7 +15,7 @@
eqnResidual = hEqn.solve().initialResidual();
maxResidual = max(eqnResidual, maxResidual);
- thermo->correct();
+ thermo.correct();
radiation->correct();
}
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C
index 7ad940bcff1..54e1c8cb184 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C
@@ -32,7 +32,7 @@ Description
\*---------------------------------------------------------------------------*/
#include "fvCFD.H"
-#include "basicThermo.H"
+#include "basicPsiThermo.H"
#include "turbulenceModel.H"
#include "fixedGradientFvPatchFields.H"
#include "regionProperties.H"
@@ -42,37 +42,36 @@ Description
int main(int argc, char *argv[])
{
-
-# include "setRootCase.H"
-# include "createTime.H"
+ #include "setRootCase.H"
+ #include "createTime.H"
regionProperties rp(runTime);
-# include "createFluidMeshes.H"
-# include "createSolidMeshes.H"
+ #include "createFluidMeshes.H"
+ #include "createSolidMeshes.H"
-# include "createFluidFields.H"
-# include "createSolidFields.H"
+ #include "createFluidFields.H"
+ #include "createSolidFields.H"
-# include "initContinuityErrs.H"
+ #include "initContinuityErrs.H"
-# include "readTimeControls.H"
+ #include "readTimeControls.H"
if (fluidRegions.size())
{
-# include "compressibleMultiRegionCourantNo.H"
-# include "setInitialDeltaT.H"
+ #include "compressibleMultiRegionCourantNo.H"
+ #include "setInitialDeltaT.H"
}
while (runTime.run())
{
-# include "readTimeControls.H"
-# include "readPIMPLEControls.H"
+ #include "readTimeControls.H"
+ #include "readPIMPLEControls.H"
if (fluidRegions.size())
{
-# include "compressibleMultiRegionCourantNo.H"
-# include "setDeltaT.H"
+ #include "compressibleMultiRegionCourantNo.H"
+ #include "setDeltaT.H"
}
runTime++;
@@ -83,8 +82,8 @@ int main(int argc, char *argv[])
{
forAll(fluidRegions, i)
{
-# include "setRegionFluidFields.H"
-# include "storeOldFluidFields.H"
+ #include "setRegionFluidFields.H"
+ #include "storeOldFluidFields.H"
}
}
@@ -96,18 +95,18 @@ int main(int argc, char *argv[])
{
Info<< "\nSolving for fluid region "
<< fluidRegions[i].name() << endl;
-# include "setRegionFluidFields.H"
-# include "readFluidMultiRegionPIMPLEControls.H"
-# include "solveFluid.H"
+ #include "setRegionFluidFields.H"
+ #include "readFluidMultiRegionPIMPLEControls.H"
+ #include "solveFluid.H"
}
forAll(solidRegions, i)
{
Info<< "\nSolving for solid region "
<< solidRegions[i].name() << endl;
-# include "setRegionSolidFields.H"
-# include "readSolidMultiRegionPIMPLEControls.H"
-# include "solveSolid.H"
+ #include "setRegionSolidFields.H"
+ #include "readSolidMultiRegionPIMPLEControls.H"
+ #include "solveSolid.H"
}
}
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H
index fd9624685f8..7aa01dee793 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H
@@ -1,5 +1,5 @@
// Initialise fluid field pointer lists
- PtrList<basicThermo> thermoFluid(fluidRegions.size());
+ PtrList<basicPsiThermo> thermoFluid(fluidRegions.size());
PtrList<volScalarField> rhoFluid(fluidRegions.size());
PtrList<volScalarField> KFluid(fluidRegions.size());
PtrList<volVectorField> UFluid(fluidRegions.size());
@@ -19,7 +19,7 @@
thermoFluid.set
(
i,
- basicThermo::New(fluidRegions[i]).ptr()
+ basicPsiThermo::New(fluidRegions[i]).ptr()
);
Info<< " Adding to rhoFluid\n" << endl;
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H
index 72c9bbc4faf..29aea044664 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H
@@ -1,6 +1,6 @@
const fvMesh& mesh = fluidRegions[i];
- basicThermo& thermo = thermoFluid[i];
+ basicPsiThermo& thermo = thermoFluid[i];
volScalarField& rho = rhoFluid[i];
volScalarField& K = KFluid[i];
volVectorField& U = UFluid[i];
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFoam/Make/options
index 7d9fba61432..d10253a8fa3 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/reactingParcelFoam/Make/options
@@ -12,7 +12,7 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/solids/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/solidMixture/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/combustion/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
-I$(LIB_SRC)/ODE/lnInclude
@@ -31,7 +31,7 @@ EXE_LIBS = \
-lsolids \
-lsolidMixture \
-lthermophysicalFunctions \
- -lcombustionThermophysicalModels \
+ -lreactionThermophysicalModels \
-lchemistryModel \
-lradiation \
-lODE
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/additionalOutput.H b/applications/solvers/lagrangian/reactingParcelFoam/additionalOutput.H
deleted file mode 100644
index 9edd35eb7ca..00000000000
--- a/applications/solvers/lagrangian/reactingParcelFoam/additionalOutput.H
+++ /dev/null
@@ -1,48 +0,0 @@
-{
- tmp<volScalarField> tdQ
- (
- new volScalarField
- (
- IOobject
- (
- "dQ",
- runTime.timeName(),
- mesh,
- IOobject::NO_READ,
- IOobject::AUTO_WRITE
- ),
- mesh,
- dimensionedScalar
- (
- "zero",
- dimensionSet(1, -3, -1, 0, 0, 0, 0),
- 0.0
- )
- )
- );
-
- scalarField& dQ = tdQ();
-
- scalarField cp(dQ.size(), 0.0);
-
- forAll(Y, i)
- {
- volScalarField RRi = chemistry.RR(i);
-
- forAll(h, celli)
- {
- scalar Ti = T[celli];
- cp[celli] += Y[i][celli]*chemistry.specieThermo()[i].Cp(Ti);
- scalar hi = chemistry.specieThermo()[i].h(Ti);
- scalar RR = RRi[celli];
- dQ[celli] -= hi*RR;
- }
- }
-
- forAll(dQ, celli)
- {
- dQ[celli] /= cp[celli];
- }
-
- tdQ().write();
-}
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/createClouds.H b/applications/solvers/lagrangian/reactingParcelFoam/createClouds.H
index fcab29c923c..4ae0633ab7b 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/createClouds.H
+++ b/applications/solvers/lagrangian/reactingParcelFoam/createClouds.H
@@ -1,9 +1,9 @@
Info<< "\nConstructing reacting cloud" << endl;
-BasicReactingCloud<specieReactingProperties> parcels
+BasicReactingCloud<gasThermoPhysics> parcels
(
"reactingCloud1",
rho,
U,
g,
- thermo()
+ thermo
);
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/createFields.H b/applications/solvers/lagrangian/reactingParcelFoam/createFields.H
index 8f0d59e77d4..cad1330c68d 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/createFields.H
+++ b/applications/solvers/lagrangian/reactingParcelFoam/createFields.H
@@ -1,19 +1,22 @@
Info<< "Reading thermophysical properties\n" << endl;
- autoPtr<hCombustionThermo> thermo
+ autoPtr<psiChemistryModel> pChemistry
(
- hCombustionThermo::New(mesh)
+ psiChemistryModel::New(mesh)
);
+ psiChemistryModel& chemistry = pChemistry();
- combustionMixture& composition = thermo->composition();
+ hCombustionThermo& thermo = chemistry.thermo();
+
+ basicMultiComponentMixture& composition = thermo.composition();
PtrList<volScalarField>& Y = composition.Y();
- word inertSpecie(thermo->lookup("inertSpecie"));
+ word inertSpecie(thermo.lookup("inertSpecie"));
- volScalarField& p = thermo->p();
- volScalarField& h = thermo->h();
- const volScalarField& T = thermo->T();
- const volScalarField& psi = thermo->psi();
+ volScalarField& p = thermo.p();
+ volScalarField& h = thermo.h();
+ const volScalarField& T = thermo.T();
+ const volScalarField& psi = thermo.psi();
volScalarField rho
(
@@ -25,7 +28,7 @@
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
- thermo->rho()
+ thermo.rho()
);
Info<< "\nReading field U\n" << endl;
@@ -42,7 +45,7 @@
mesh
);
-# include "compressibleCreatePhi.H"
+ #include "compressibleCreatePhi.H"
DimensionedField<scalar, volMesh> kappa
(
@@ -66,7 +69,7 @@
rho,
U,
phi,
- thermo()
+ thermo
)
);
@@ -74,13 +77,6 @@
volScalarField DpDt =
fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p);
- Info << "Constructing chemical mechanism" << endl;
- chemistryModel chemistry
- (
- thermo(),
- rho
- );
-
multivariateSurfaceInterpolationScheme<scalar>::fieldTable fields;
forAll (Y, i)
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/hEqn.H b/applications/solvers/lagrangian/reactingParcelFoam/hEqn.H
index 7909d8c67d2..020c9bdb118 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/hEqn.H
+++ b/applications/solvers/lagrangian/reactingParcelFoam/hEqn.H
@@ -7,14 +7,14 @@
==
DpDt
+ parcels.Sh()
- + radiation->Sh(thermo())
+ + radiation->Sh(thermo)
);
hEqn.relax();
hEqn.solve();
- thermo->correct();
+ thermo.correct();
radiation->correct();
}
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/pEqn.H b/applications/solvers/lagrangian/reactingParcelFoam/pEqn.H
index 63370f0cd41..d27afcce8ac 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/pEqn.H
+++ b/applications/solvers/lagrangian/reactingParcelFoam/pEqn.H
@@ -1,4 +1,4 @@
-rho = thermo->rho();
+rho = thermo.rho();
volScalarField rUA = 1.0/UEqn.A();
U = rUA*UEqn.H();
@@ -8,7 +8,7 @@ if (transonic)
surfaceScalarField phid
(
"phid",
- fvc::interpolate(thermo->psi())
+ fvc::interpolate(psi)
*(
(fvc::interpolate(U) & mesh.Sf())
+ fvc::ddtPhiCorr(rUA, rho, U, phi)
@@ -37,8 +37,8 @@ if (transonic)
else
{
phi =
- fvc::interpolate(rho)*
- (
+ fvc::interpolate(rho)
+ *(
(fvc::interpolate(U) & mesh.Sf())
+ fvc::ddtPhiCorr(rUA, rho, U, phi)
);
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C b/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C
index d93b8236612..f60de4a3690 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C
+++ b/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C
@@ -35,9 +35,9 @@ Description
#include "hCombustionThermo.H"
#include "turbulenceModel.H"
#include "BasicReactingCloud.H"
-#include "chemistryModel.H"
+#include "psiChemistryModel.H"
#include "chemistrySolver.H"
-#include "thermoPhsyicsTypes.H"
+#include "thermoPhysicsTypes.H"
#include "radiationModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -100,12 +100,9 @@ int main(int argc, char *argv[])
turbulence->correct();
- rho = thermo->rho();
+ rho = thermo.rho();
- if (runTime.write())
- {
- #include "additionalOutput.H"
- }
+ runTime.write();
Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
<< " ClockTime = " << runTime.elapsedClockTime() << " s"
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/rhoEqn.H b/applications/solvers/lagrangian/reactingParcelFoam/rhoEqn.H
index 1b2882a2b7b..131c144114e 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/rhoEqn.H
+++ b/applications/solvers/lagrangian/reactingParcelFoam/rhoEqn.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2007 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/applications/solvers/lagrangian/trackedReactingParcelFoam/Make/options b/applications/solvers/lagrangian/trackedReactingParcelFoam/Make/options
index 76bc8b084f4..76ae4faa083 100644
--- a/applications/solvers/lagrangian/trackedReactingParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/trackedReactingParcelFoam/Make/options
@@ -1,4 +1,7 @@
+REACTINGPARCELFOAM = ../reactingParcelFoam
+
EXE_INC = \
+ -I$(REACTINGPARCELFOAM) \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I${LIB_SRC}/meshTools/lnInclude \
-I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
diff --git a/applications/solvers/lagrangian/trackedReactingParcelFoam/UEqn.H b/applications/solvers/lagrangian/trackedReactingParcelFoam/UEqn.H
index c82307305b8..c3716a63818 100644
--- a/applications/solvers/lagrangian/trackedReactingParcelFoam/UEqn.H
+++ b/applications/solvers/lagrangian/trackedReactingParcelFoam/UEqn.H
@@ -5,7 +5,7 @@
+ turbulence->divDevRhoReff(U)
==
rho.dimensionedInternalField()*g
- + reactingParcels.SU()
+ + parcels.SU()
);
UEqn.relax();
diff --git a/applications/solvers/lagrangian/trackedReactingParcelFoam/YEqn.H b/applications/solvers/lagrangian/trackedReactingParcelFoam/YEqn.H
index 8f77f23bc2f..2fc0f375664 100644
--- a/applications/solvers/lagrangian/trackedReactingParcelFoam/YEqn.H
+++ b/applications/solvers/lagrangian/trackedReactingParcelFoam/YEqn.H
@@ -26,7 +26,7 @@ tmp<fv::convectionScheme<scalar> > mvConvection
+ mvConvection->fvmDiv(phi, Yi)
- fvm::laplacian(turbulence->muEff(), Yi)
==
- reactingParcels.Srho(i)
+ parcels.Srho(i)
+ kappa*chemistry.RR(i)().dimensionedInternalField()
+ pointMassSources.Su(i)
);
diff --git a/applications/solvers/lagrangian/trackedReactingParcelFoam/additionalOutput.H b/applications/solvers/lagrangian/trackedReactingParcelFoam/additionalOutput.H
deleted file mode 100644
index 9edd35eb7ca..00000000000
--- a/applications/solvers/lagrangian/trackedReactingParcelFoam/additionalOutput.H
+++ /dev/null
@@ -1,48 +0,0 @@
-{
- tmp<volScalarField> tdQ
- (
- new volScalarField
- (
- IOobject
- (
- "dQ",
- runTime.timeName(),
- mesh,
- IOobject::NO_READ,
- IOobject::AUTO_WRITE
- ),
- mesh,
- dimensionedScalar
- (
- "zero",
- dimensionSet(1, -3, -1, 0, 0, 0, 0),
- 0.0
- )
- )
- );
-
- scalarField& dQ = tdQ();
-
- scalarField cp(dQ.size(), 0.0);
-
- forAll(Y, i)
- {
- volScalarField RRi = chemistry.RR(i);
-
- forAll(h, celli)
- {
- scalar Ti = T[celli];
- cp[celli] += Y[i][celli]*chemistry.specieThermo()[i].Cp(Ti);
- scalar hi = chemistry.specieThermo()[i].h(Ti);
- scalar RR = RRi[celli];
- dQ[celli] -= hi*RR;
- }
- }
-
- forAll(dQ, celli)
- {
- dQ[celli] /= cp[celli];
- }
-
- tdQ().write();
-}
diff --git a/applications/solvers/lagrangian/trackedReactingParcelFoam/chemistry.H b/applications/solvers/lagrangian/trackedReactingParcelFoam/chemistry.H
deleted file mode 100644
index 07b1e9953b0..00000000000
--- a/applications/solvers/lagrangian/trackedReactingParcelFoam/chemistry.H
+++ /dev/null
@@ -1,25 +0,0 @@
-{
- Info << "Solving chemistry" << endl;
-
- chemistry.solve
- (
- runTime.value() - runTime.deltaT().value(),
- runTime.deltaT().value()
- );
-
- // turbulent time scale
- if (turbulentReaction)
- {
- DimensionedField<scalar, volMesh> tk =
- Cmix*sqrt(turbulence->muEff()/rho/turbulence->epsilon());
- DimensionedField<scalar, volMesh> tc =
- chemistry.tc()().dimensionedInternalField();
-
- // Chalmers PaSR model
- kappa = (runTime.deltaT() + tc)/(runTime.deltaT() + tc + tk);
- }
- else
- {
- kappa = 1.0;
- }
-}
diff --git a/applications/solvers/lagrangian/trackedReactingParcelFoam/createClouds.H b/applications/solvers/lagrangian/trackedReactingParcelFoam/createClouds.H
index aaf91c81cc6..3740171beba 100644
--- a/applications/solvers/lagrangian/trackedReactingParcelFoam/createClouds.H
+++ b/applications/solvers/lagrangian/trackedReactingParcelFoam/createClouds.H
@@ -1,9 +1,9 @@
Info<< "\nConstructing reacting cloud" << endl;
-BasicTrackedReactingCloud<specieReactingProperties> reactingParcels
+BasicTrackedReactingCloud<gasThermoPhysics> parcels
(
"reactingCloud1",
rho,
U,
g,
- thermo()
+ thermo
);
diff --git a/applications/solvers/lagrangian/trackedReactingParcelFoam/createFields.H b/applications/solvers/lagrangian/trackedReactingParcelFoam/createFields.H
deleted file mode 100644
index b9cea162f4a..00000000000
--- a/applications/solvers/lagrangian/trackedReactingParcelFoam/createFields.H
+++ /dev/null
@@ -1,111 +0,0 @@
- Info<< "Reading thermophysical properties" << nl << endl;
-
- autoPtr<hCombustionThermo> thermo
- (
- hCombustionThermo::New(mesh)
- );
-
- combustionMixture& composition = thermo->composition();
- PtrList<volScalarField>& Y = composition.Y();
-
- word inertSpecie(thermo->lookup("inertSpecie"));
-
- volScalarField& p = thermo->p();
- volScalarField& h = thermo->h();
- const volScalarField& T = thermo->T();
- const volScalarField& psi = thermo->psi();
-
- volScalarField rho
- (
- IOobject
- (
- "rho",
- runTime.timeName(),
- mesh,
- IOobject::NO_READ,
- IOobject::AUTO_WRITE
- ),
- thermo->rho()
- );
-
- Info<< "Reading field U" << nl << endl;
- volVectorField U
- (
- IOobject
- (
- "U",
- runTime.timeName(),
- mesh,
- IOobject::MUST_READ,
- IOobject::AUTO_WRITE
- ),
- mesh
- );
-
-# include "compressibleCreatePhi.H"
-
- DimensionedField<scalar, volMesh> kappa
- (
- IOobject
- (
- "kappa",
- runTime.timeName(),
- mesh,
- IOobject::NO_READ,
- IOobject::AUTO_WRITE
- ),
- mesh,
- dimensionedScalar("zero", dimless, 0.0)
- );
-
- Info<< "Creating turbulence model" << nl << endl;
- autoPtr<compressible::turbulenceModel> turbulence
- (
- compressible::turbulenceModel::New
- (
- rho,
- U,
- phi,
- thermo()
- )
- );
-
- Info<< "Creating field DpDt" << nl << endl;
- volScalarField DpDt =
- fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p);
-
- Info << "Constructing chemical mechanism" << nl << endl;
- chemistryModel chemistry
- (
- thermo(),
- rho
- );
-
- multivariateSurfaceInterpolationScheme<scalar>::fieldTable fields;
-
- forAll (Y, i)
- {
- fields.add(Y[i]);
- }
- fields.add(h);
-
- Info<< "Creating porous zones" << nl << endl;
- porousZones pZones(mesh);
- Switch pressureImplicitPorosity(false);
-
- label nUCorr = 0;
- if (pZones.size())
- {
- // nUCorrectors for pressureImplicitPorosity
- if (mesh.solutionDict().subDict("PISO").found("nUCorrectors"))
- {
- mesh.solutionDict().subDict("PISO").lookup("nUCorrectors")
- >> nUCorr;
- }
-
- if (nUCorr > 0)
- {
- pressureImplicitPorosity = true;
- }
- }
-
diff --git a/applications/solvers/lagrangian/trackedReactingParcelFoam/createPorousZones.H b/applications/solvers/lagrangian/trackedReactingParcelFoam/createPorousZones.H
new file mode 100644
index 00000000000..caed85ecba8
--- /dev/null
+++ b/applications/solvers/lagrangian/trackedReactingParcelFoam/createPorousZones.H
@@ -0,0 +1,21 @@
+ Info<< "Creating porous zones" << nl << endl;
+
+ porousZones pZones(mesh);
+ Switch pressureImplicitPorosity(false);
+
+ label nUCorr = 0;
+ if (pZones.size())
+ {
+ // nUCorrectors for pressureImplicitPorosity
+ if (mesh.solutionDict().subDict("PISO").found("nUCorrectors"))
+ {
+ mesh.solutionDict().subDict("PISO").lookup("nUCorrectors")
+ >> nUCorr;
+ }
+
+ if (nUCorr > 0)
+ {
+ pressureImplicitPorosity = true;
+ }
+ }
+
diff --git a/applications/solvers/lagrangian/trackedReactingParcelFoam/hEqn.H b/applications/solvers/lagrangian/trackedReactingParcelFoam/hEqn.H
deleted file mode 100644
index 32e71555369..00000000000
--- a/applications/solvers/lagrangian/trackedReactingParcelFoam/hEqn.H
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- fvScalarMatrix hEqn
- (
- fvm::ddt(rho, h)
- + fvm::div(phi, h)
- - fvm::laplacian(turbulence->alphaEff(), h)
- ==
- DpDt
- + reactingParcels.Sh()
- + radiation->Sh(thermo())
- );
-
- hEqn.relax();
-
- hEqn.solve();
-
- thermo->correct();
-
- radiation->correct();
-}
diff --git a/applications/solvers/lagrangian/trackedReactingParcelFoam/pEqn.H b/applications/solvers/lagrangian/trackedReactingParcelFoam/pEqn.H
index b6207ce0c4d..f8d6f4e6383 100644
--- a/applications/solvers/lagrangian/trackedReactingParcelFoam/pEqn.H
+++ b/applications/solvers/lagrangian/trackedReactingParcelFoam/pEqn.H
@@ -1,4 +1,4 @@
-rho = thermo->rho();
+rho = thermo.rho();
if (pressureImplicitPorosity)
{
@@ -14,7 +14,7 @@ if (transonic)
surfaceScalarField phid
(
"phid",
- fvc::interpolate(thermo->psi())
+ fvc::interpolate(psi)
*(
(fvc::interpolate(U) & mesh.Sf())
// + fvc::ddtPhiCorr(rUA, rho, U, phi)
@@ -40,7 +40,7 @@ if (transonic)
+ fvm::div(phid, p)
- lapTerm()
==
- reactingParcels.Srho()
+ parcels.Srho()
+ pointMassSources.Su()
);
@@ -80,7 +80,7 @@ else
+ fvc::div(phi)
- lapTerm()
==
- reactingParcels.Srho()
+ parcels.Srho()
+ pointMassSources.Su()
);
diff --git a/applications/solvers/lagrangian/trackedReactingParcelFoam/readChemistryProperties.H b/applications/solvers/lagrangian/trackedReactingParcelFoam/readChemistryProperties.H
deleted file mode 100644
index 1a60e6fb346..00000000000
--- a/applications/solvers/lagrangian/trackedReactingParcelFoam/readChemistryProperties.H
+++ /dev/null
@@ -1,22 +0,0 @@
-Info<< "Reading chemistry properties\n" << endl;
-
-IOdictionary chemistryProperties
-(
- IOobject
- (
- "chemistryProperties",
- runTime.constant(),
- mesh,
- IOobject::MUST_READ,
- IOobject::NO_WRITE
- )
-);
-
-Switch turbulentReaction(chemistryProperties.lookup("turbulentReaction"));
-
-dimensionedScalar Cmix("Cmix", dimless, 1.0);
-
-if (turbulentReaction)
-{
- chemistryProperties.lookup("Cmix") >> Cmix;
-}
diff --git a/applications/solvers/lagrangian/trackedReactingParcelFoam/rhoEqn.H b/applications/solvers/lagrangian/trackedReactingParcelFoam/rhoEqn.H
index faadc1ecfbb..76b105474ba 100644
--- a/applications/solvers/lagrangian/trackedReactingParcelFoam/rhoEqn.H
+++ b/applications/solvers/lagrangian/trackedReactingParcelFoam/rhoEqn.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2008-2007 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -36,7 +36,7 @@ Description
fvm::ddt(rho)
+ fvc::div(phi)
==
- reactingParcels.Srho()
+ parcels.Srho()
+ pointMassSources.Su()
);
}
diff --git a/applications/solvers/lagrangian/trackedReactingParcelFoam/trackedReactingParcelFoam.C b/applications/solvers/lagrangian/trackedReactingParcelFoam/trackedReactingParcelFoam.C
index 62af964eba7..a8338a5e349 100644
--- a/applications/solvers/lagrangian/trackedReactingParcelFoam/trackedReactingParcelFoam.C
+++ b/applications/solvers/lagrangian/trackedReactingParcelFoam/trackedReactingParcelFoam.C
@@ -32,9 +32,9 @@ Description
#include "hCombustionThermo.H"
#include "turbulenceModel.H"
#include "BasicTrackedReactingCloud.H"
-#include "chemistryModel.H"
+#include "psiChemistryModel.H"
#include "chemistrySolver.H"
-#include "reactingThermoTypes.H"
+#include "thermoPhysicsTypes.H"
#include "radiationModel.H"
#include "porousZones.H"
#include "timeActivatedExplicitMulticomponentPointSource.H"
@@ -53,6 +53,7 @@ int main(int argc, char *argv[])
#include "createRadiationModel.H"
#include "createClouds.H"
#include "createMulticomponentPointSources.H"
+ #include "createPorousZones.H"
#include "readPISOControls.H"
#include "initContinuityErrs.H"
#include "readTimeControls.H"
@@ -74,9 +75,9 @@ int main(int argc, char *argv[])
Info<< "Time = " << runTime.timeName() << nl << endl;
- reactingParcels.evolve();
+ parcels.evolve();
- reactingParcels.info();
+ parcels.info();
#include "chemistry.H"
#include "rhoEqn.H"
@@ -100,12 +101,9 @@ int main(int argc, char *argv[])
turbulence->correct();
- rho = thermo->rho();
+ rho = thermo.rho();
- if (runTime.write())
- {
- #include "additionalOutput.H"
- }
+ runTime.write();
Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
<< " ClockTime = " << runTime.elapsedClockTime() << " s"
diff --git a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/createFields.H b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/createFields.H
index c76a81ca466..78b0e8b552f 100644
--- a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/createFields.H
+++ b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/createFields.H
@@ -1,9 +1,10 @@
Info<< "Reading thermophysical properties\n" << endl;
- autoPtr<basicThermo> thermo
+ autoPtr<basicPsiThermo> pThermo
(
- basicThermo::New(mesh)
+ basicPsiThermo::New(mesh)
);
+ basicPsiThermo& thermo = pThermo();
volScalarField rho
(
@@ -15,7 +16,7 @@
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
- thermo->rho()
+ thermo.rho()
);
Info<< "\nReading field U\n" << endl;
@@ -42,7 +43,7 @@
rho,
U,
phi,
- thermo()
+ thermo
)
);
@@ -55,6 +56,6 @@
kinematicCloudName,
rho,
U,
- thermo().mu(),
+ thermo.mu(),
g
);
diff --git a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C
index e4c2b396652..2039346411b 100644
--- a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C
+++ b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C
@@ -32,7 +32,7 @@ Description
\*---------------------------------------------------------------------------*/
#include "fvCFD.H"
-#include "basicThermo.H"
+#include "basicPsiThermo.H"
#include "turbulenceModel.H"
#include "basicKinematicCloud.H"
diff --git a/applications/solvers/multiphase/bubbleFoam/bubbleFoam.C b/applications/solvers/multiphase/bubbleFoam/bubbleFoam.C
index 66df8cfb9f2..af6de6def0b 100644
--- a/applications/solvers/multiphase/bubbleFoam/bubbleFoam.C
+++ b/applications/solvers/multiphase/bubbleFoam/bubbleFoam.C
@@ -26,7 +26,7 @@ Application
bubbleFoam
Description
- Solver for a system of 2 incompressible fluid phases with one phase
+ Solver for a system of 2 incompressible fluid phases with one phase
dispersed, e.g. gas bubbles in a liquid.
\*---------------------------------------------------------------------------*/
@@ -40,16 +40,15 @@ Description
int main(int argc, char *argv[])
{
+ #include "setRootCase.H"
-# include "setRootCase.H"
+ #include "createTime.H"
+ #include "createMesh.H"
+ #include "readEnvironmentalProperties.H"
+ #include "createFields.H"
+ #include "initContinuityErrs.H"
-# include "createTime.H"
-# include "createMesh.H"
-# include "readEnvironmentalProperties.H"
-# include "createFields.H"
-# include "initContinuityErrs.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+ // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
Info<< "\nStarting time loop\n" << endl;
@@ -57,30 +56,30 @@ int main(int argc, char *argv[])
{
Info<< "Time = " << runTime.timeName() << nl << endl;
-# include "readBubbleFoamControls.H"
-# include "CourantNo.H"
+ #include "readBubbleFoamControls.H"
+ #include "CourantNo.H"
-# include "alphaEqn.H"
-# include "liftDragCoeffs.H"
-# include "UEqns.H"
+ #include "alphaEqn.H"
+ #include "liftDragCoeffs.H"
+ #include "UEqns.H"
// --- PISO loop
for (int corr=0; corr<nCorr; corr++)
{
-# include "pEqn.H"
+ #include "pEqn.H"
if (correctAlpha)
{
-# include "alphaEqn.H"
+ #include "alphaEqn.H"
}
}
-# include "DDtU.H"
+ #include "DDtU.H"
-# include "kEpsilon.H"
+ #include "kEpsilon.H"
-# include "write.H"
+ #include "write.H"
Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
<< " ClockTime = " << runTime.elapsedClockTime() << " s"
diff --git a/applications/solvers/multiphase/bubbleFoam/createFields.H b/applications/solvers/multiphase/bubbleFoam/createFields.H
index 875a4f1be13..9aca6933fc3 100644
--- a/applications/solvers/multiphase/bubbleFoam/createFields.H
+++ b/applications/solvers/multiphase/bubbleFoam/createFields.H
@@ -141,8 +141,8 @@
transportProperties.lookup("Ct")
);
-# include "createPhia.H"
-# include "createPhib.H"
+ #include "createPhia.H"
+ #include "createPhib.H"
surfaceScalarField phi
(
@@ -157,7 +157,7 @@
);
-# include "createRASTurbulence.H"
+ #include "createRASTurbulence.H"
Info<< "Calculating field DDtUa and DDtUb\n" << endl;
diff --git a/applications/solvers/multiphase/bubbleFoam/kEpsilon.H b/applications/solvers/multiphase/bubbleFoam/kEpsilon.H
index 016d1f4488c..b1c8951b04a 100644
--- a/applications/solvers/multiphase/bubbleFoam/kEpsilon.H
+++ b/applications/solvers/multiphase/bubbleFoam/kEpsilon.H
@@ -9,7 +9,7 @@ if(turbulence)
volScalarField G = 2*nutb*(tgradUb() && dev(symm(tgradUb())));
tgradUb.clear();
-# include "wallFunctions.H"
+ #include "wallFunctions.H"
// Dissipation equation
fvScalarMatrix epsEqn
@@ -22,7 +22,7 @@ if(turbulence)
- fvm::Sp(C2*beta*epsilon/k, epsilon)
);
-# include "wallDissipation.H"
+ #include "wallDissipation.H"
epsEqn.relax();
epsEqn.solve();
@@ -48,8 +48,7 @@ if(turbulence)
//- Re-calculate turbulence viscosity
nutb = Cmu*sqr(k)/epsilon;
-# include "wallViscosity.H"
-
+ #include "wallViscosity.H"
}
nuEffa = sqr(Ct)*nutb + nua;
diff --git a/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C b/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C
index 12a8f4d4999..62aa7a076fb 100644
--- a/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C
+++ b/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C
@@ -41,40 +41,39 @@ Description
int main(int argc, char *argv[])
{
+ #include "setRootCase.H"
-# include "setRootCase.H"
+ #include "createTime.H"
+ #include "createMesh.H"
+ #include "readThermodynamicProperties.H"
+ #include "readControls.H"
+ #include "createFields.H"
+ #include "initContinuityErrs.H"
+ #include "compressibleCourantNo.H"
+ #include "setInitialDeltaT.H"
-# include "createTime.H"
-# include "createMesh.H"
-# include "readThermodynamicProperties.H"
-# include "readControls.H"
-# include "createFields.H"
-# include "initContinuityErrs.H"
-# include "compressibleCourantNo.H"
-# include "setInitialDeltaT.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+ // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
Info<< "\nStarting time loop\n" << endl;
while (runTime.run())
{
-# include "readControls.H"
-# include "CourantNo.H"
-# include "setDeltaT.H"
+ #include "readControls.H"
+ #include "CourantNo.H"
+ #include "setDeltaT.H"
runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
for (int outerCorr=0; outerCorr<nOuterCorr; outerCorr++)
{
-# include "rhoEqn.H"
-# include "gammaPsi.H"
-# include "UEqn.H"
+ #include "rhoEqn.H"
+ #include "gammaPsi.H"
+ #include "UEqn.H"
for (int corr=0; corr<nCorr; corr++)
{
-# include "pEqn.H"
+ #include "pEqn.H"
}
}
diff --git a/applications/solvers/multiphase/cavitatingFoam/createFields.H b/applications/solvers/multiphase/cavitatingFoam/createFields.H
index dc2f5e69612..49c7de14733 100644
--- a/applications/solvers/multiphase/cavitatingFoam/createFields.H
+++ b/applications/solvers/multiphase/cavitatingFoam/createFields.H
@@ -71,8 +71,8 @@
mesh
);
-# include "createPhiv.H"
-# include "compressibleCreatePhi.H"
+ #include "createPhiv.H"
+ #include "compressibleCreatePhi.H"
Info<< "Reading transportProperties\n" << endl;
diff --git a/applications/solvers/multiphase/cavitatingFoam/pEqn.H b/applications/solvers/multiphase/cavitatingFoam/pEqn.H
index c22aa76479a..979834717be 100644
--- a/applications/solvers/multiphase/cavitatingFoam/pEqn.H
+++ b/applications/solvers/multiphase/cavitatingFoam/pEqn.H
@@ -24,7 +24,7 @@
phiv -= phiGradp/rhof;
-# include "resetPhivPatches.H"
+ #include "resetPhivPatches.H"
for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
{
@@ -82,6 +82,5 @@
Info<< "max-min rho: " << max(rho).value()
<< " " << min(rho).value() << endl;
-# include "gammaPsi.H"
-
+ #include "gammaPsi.H"
}
diff --git a/applications/solvers/multiphase/settlingFoam/createFields.H b/applications/solvers/multiphase/settlingFoam/createFields.H
index 7c8445a71d4..916acde39ed 100644
--- a/applications/solvers/multiphase/settlingFoam/createFields.H
+++ b/applications/solvers/multiphase/settlingFoam/createFields.H
@@ -128,7 +128,7 @@
alpha.boundaryField().types()
);
-# include "compressibleCreatePhi.H"
+ #include "compressibleCreatePhi.H"
label pRefCell = 0;
diff --git a/applications/solvers/multiphase/settlingFoam/settlingFoam.C b/applications/solvers/multiphase/settlingFoam/settlingFoam.C
index ad8dbe3646c..e68ddbb0f07 100644
--- a/applications/solvers/multiphase/settlingFoam/settlingFoam.C
+++ b/applications/solvers/multiphase/settlingFoam/settlingFoam.C
@@ -43,17 +43,15 @@ Description
int main(int argc, char *argv[])
{
+ #include "setRootCase.H"
-# include "setRootCase.H"
+ #include "createTime.H"
+ #include "createMesh.H"
+ #include "readEnvironmentalProperties.H"
+ #include "createFields.H"
+ #include "initContinuityErrs.H"
-# include "createTime.H"
-# include "createMesh.H"
-# include "readEnvironmentalProperties.H"
-# include "createFields.H"
-# include "initContinuityErrs.H"
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+ // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
Info<< "\nStarting time loop\n" << endl;
@@ -61,27 +59,27 @@ int main(int argc, char *argv[])
{
Info<< "Time = " << runTime.timeName() << nl << endl;
-# include "readPISOControls.H"
-# include "compressibleCourantNo.H"
+ #include "readPISOControls.H"
+ #include "compressibleCourantNo.H"
-# include "rhoEqn.H"
+ #include "rhoEqn.H"
-# include "calcVdj.H"
+ #include "calcVdj.H"
-# include "UEqn.H"
+ #include "UEqn.H"
-# include "alphaEqn.H"
+ #include "alphaEqn.H"
-# include "correctViscosity.H"
+ #include "correctViscosity.H"
// --- PISO loop
for (int corr=0; corr<nCorr; corr++)
{
-# include "pEqn.H"
+ #include "pEqn.H"
}
-# include "kEpsilon.H"
+ #include "kEpsilon.H"
runTime.write();
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/createFields.H b/applications/solvers/multiphase/twoLiquidMixingFoam/createFields.H
index b61566d924d..b94bf6c23e6 100644
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/createFields.H
+++ b/applications/solvers/multiphase/twoLiquidMixingFoam/createFields.H
@@ -40,7 +40,7 @@
mesh
);
-# include "createPhi.H"
+ #include "createPhi.H"
Info<< "Reading transportProperties\n" << endl;
twoPhaseMixture twoPhaseProperties(U, phi);
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C
index ce3fb2aa551..a28d9295780 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C
@@ -47,59 +47,58 @@ Description
int main(int argc, char *argv[])
{
+ #include "setRootCase.H"
-# include "setRootCase.H"
+ #include "createTime.H"
+ #include "createMesh.H"
+ #include "readEnvironmentalProperties.H"
+ #include "createFields.H"
+ #include "readPPProperties.H"
+ #include "initContinuityErrs.H"
+ #include "readTimeControls.H"
+ #include "CourantNo.H"
+ #include "setInitialDeltaT.H"
-# include "createTime.H"
-# include "createMesh.H"
-# include "readEnvironmentalProperties.H"
-# include "createFields.H"
-# include "readPPProperties.H"
-# include "initContinuityErrs.H"
-# include "readTimeControls.H"
-# include "CourantNo.H"
-# include "setInitialDeltaT.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+ // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
Info<< "\nStarting time loop\n" << endl;
while (runTime.run())
{
-# include "readTwoPhaseEulerFoamControls.H"
-# include "CourantNos.H"
-# include "setDeltaT.H"
+ #include "readTwoPhaseEulerFoamControls.H"
+ #include "CourantNos.H"
+ #include "setDeltaT.H"
runTime++;
Info<< "Time = " << runTime.timeName() << nl << endl;
-# include "alphaEqn.H"
+ #include "alphaEqn.H"
-# include "liftDragCoeffs.H"
+ #include "liftDragCoeffs.H"
-# include "UEqns.H"
+ #include "UEqns.H"
// --- PISO loop
for (int corr=0; corr<nCorr; corr++)
{
-# include "pEqn.H"
+ #include "pEqn.H"
if (correctAlpha && corr<nCorr-1)
{
-# include "alphaEqn.H"
+ #include "alphaEqn.H"
}
}
-# include "DDtU.H"
+ #include "DDtU.H"
-# include "kEpsilon.H"
+ #include "kEpsilon.H"
if (kineticTheory.on())
{
kineticTheory.solve();
nuEffa += kineticTheory.mua()/rhoa;
}
-# include "write.H"
+ #include "write.H"
Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
<< " ClockTime = " << runTime.elapsedClockTime() << " s"
diff --git a/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C b/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C
index 0843f3acf3b..b9310ffc92c 100644
--- a/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C
+++ b/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C
@@ -42,7 +42,7 @@ Description
#include "incompressible/RAS/RASModel/RASModel.H"
#include "incompressible/LES/LESModel/LESModel.H"
-#include "basicThermo.H"
+#include "basicPsiThermo.H"
#include "compressible/RAS/RASModel/RASModel.H"
#include "compressible/LES/LESModel/LESModel.H"
@@ -194,7 +194,7 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
}
else if (phi.dimensions() == dimensionSet(1, 0, -1, 0, 0))
{
- autoPtr<basicThermo> thermo(basicThermo::New(mesh));
+ autoPtr<basicPsiThermo> thermo(basicPsiThermo::New(mesh));
volScalarField rho
(
diff --git a/applications/utilities/postProcessing/velocityField/Mach/Mach.C b/applications/utilities/postProcessing/velocityField/Mach/Mach.C
index daa4aa2ccf3..2e7c517e9d0 100644
--- a/applications/utilities/postProcessing/velocityField/Mach/Mach.C
+++ b/applications/utilities/postProcessing/velocityField/Mach/Mach.C
@@ -33,7 +33,7 @@ Description
\*---------------------------------------------------------------------------*/
#include "calc.H"
-#include "basicThermo.H"
+#include "basicPsiThermo.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
@@ -66,9 +66,9 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
if (isFile(runTime.constantPath()/"thermophysicalProperties"))
{
// thermophysical Mach
- autoPtr<basicThermo> thermo
+ autoPtr<basicPsiThermo> thermo
(
- basicThermo::New(mesh)
+ basicPsiThermo::New(mesh)
);
volScalarField Cp = thermo->Cp();
diff --git a/applications/utilities/postProcessing/velocityField/Mach/thermophysicalMach.H b/applications/utilities/postProcessing/velocityField/Mach/thermophysicalMach.H
index 4e4ea81b3d8..7283802f779 100644
--- a/applications/utilities/postProcessing/velocityField/Mach/thermophysicalMach.H
+++ b/applications/utilities/postProcessing/velocityField/Mach/thermophysicalMach.H
@@ -18,9 +18,9 @@
{
volVectorField U(Uheader, mesh);
- autoPtr<basicThermo> thermo
+ autoPtr<basicPsiThermo> thermo
(
- basicThermo::New(mesh)
+ basicPsiThermo::New(mesh)
);
volScalarField Cp = thermo->Cp();
diff --git a/applications/utilities/postProcessing/velocityField/Pe/Pe.C b/applications/utilities/postProcessing/velocityField/Pe/Pe.C
index 905074131d9..05c9ca1a0d2 100644
--- a/applications/utilities/postProcessing/velocityField/Pe/Pe.C
+++ b/applications/utilities/postProcessing/velocityField/Pe/Pe.C
@@ -39,7 +39,7 @@ Description
#include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H"
#include "incompressible/RAS/RASModel/RASModel.H"
#include "incompressible/LES/LESModel/LESModel.H"
-#include "basicThermo.H"
+#include "basicPsiThermo.H"
#include "compressible/RAS/RASModel/RASModel.H"
#include "compressible/LES/LESModel/LESModel.H"
@@ -204,7 +204,7 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
{
IOdictionary RASProperties(RASPropertiesHeader);
- autoPtr<basicThermo> thermo(basicThermo::New(mesh));
+ autoPtr<basicPsiThermo> thermo(basicPsiThermo::New(mesh));
volScalarField rho
(
@@ -252,7 +252,7 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
{
IOdictionary LESProperties(LESPropertiesHeader);
- autoPtr<basicThermo> thermo(basicThermo::New(mesh));
+ autoPtr<basicPsiThermo> thermo(basicPsiThermo::New(mesh));
volScalarField rho
(
diff --git a/src/finiteVolume/cfdTools/compressible/compressibleContinuityErrs.H b/src/finiteVolume/cfdTools/compressible/compressibleContinuityErrs.H
index b846a36cde0..9500b6d6713 100644
--- a/src/finiteVolume/cfdTools/compressible/compressibleContinuityErrs.H
+++ b/src/finiteVolume/cfdTools/compressible/compressibleContinuityErrs.H
@@ -33,15 +33,11 @@ Description
{
dimensionedScalar totalMass = fvc::domainIntegrate(rho);
- scalar sumLocalContErr =
- (
- fvc::domainIntegrate(mag(rho - thermo->rho()))/totalMass
- ).value();
-
- scalar globalContErr =
- (
- fvc::domainIntegrate(rho - thermo->rho())/totalMass
- ).value();
+ scalar sumLocalContErr =
+ (fvc::domainIntegrate(mag(rho - thermo.rho()))/totalMass).value();
+
+ scalar globalContErr =
+ (fvc::domainIntegrate(rho - thermo.rho())/totalMass).value();
cumulativeContErr += globalContErr;
diff --git a/src/lagrangian/dieselSpray/spray/spray.C b/src/lagrangian/dieselSpray/spray/spray.C
index 4845d8a2e54..07dbcdbe7ef 100644
--- a/src/lagrangian/dieselSpray/spray/spray.C
+++ b/src/lagrangian/dieselSpray/spray/spray.C
@@ -57,7 +57,7 @@ Foam::spray::spray
const volScalarField& p,
const volScalarField& T,
const basicMultiComponentMixture& composition,
- const PtrList<specieProperties>& gasProperties,
+ const PtrList<gasThermoPhysics>& gasProperties,
const dictionary&,
const dictionary& environmentalProperties
)
@@ -264,7 +264,7 @@ Foam::spray::spray
"spray::spray(const volVectorField& U, "
"const volScalarField& rho, const volScalarField& p, "
"const volScalarField& T, const combustionMixture& composition,"
- "const PtrList<specieProperties>& gaseousFuelProperties, "
+ "const PtrList<gasThermoPhsyics>& gaseousFuelProperties, "
"const dictionary& thermophysicalProperties, "
"const dictionary& environmentalProperties)"
) << "spray::(...) only one wedgePolyPatch found. "
diff --git a/src/lagrangian/dieselSpray/spray/spray.H b/src/lagrangian/dieselSpray/spray/spray.H
index cc1e0ac3823..f416e3cf4ea 100644
--- a/src/lagrangian/dieselSpray/spray/spray.H
+++ b/src/lagrangian/dieselSpray/spray/spray.H
@@ -38,10 +38,10 @@ Description
#include "IOPtrList.H"
#include "interpolation.H"
#include "liquid.H"
-#include "sprayThermoTypes.H"
#include "autoPtr.H"
#include "liquidMixture.H"
#include "Random.H"
+#include "thermoPhysicsTypes.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -127,7 +127,7 @@ class spray
// Composition properties
- const PtrList<specieProperties>& gasProperties_;
+ const PtrList<gasThermoPhysics>& gasProperties_;
const basicMultiComponentMixture& composition_;
List<label> liquidToGasIndex_;
@@ -193,7 +193,7 @@ public:
const volScalarField& p,
const volScalarField& T,
const basicMultiComponentMixture& composition,
- const PtrList<specieProperties>& gasProperties,
+ const PtrList<gasThermoPhysics>& gasProperties,
const dictionary& thermophysicalProperties,
const dictionary& environmentalProperties
);
@@ -257,7 +257,7 @@ public:
inline const vector& g() const;
inline const liquidMixture& fuels() const;
- inline const PtrList<specieProperties>& gasProperties() const;
+ inline const PtrList<gasThermoPhysics>& gasProperties() const;
inline const basicMultiComponentMixture& composition() const;
inline const List<label>& liquidToGasIndex() const;
diff --git a/src/lagrangian/dieselSpray/spray/sprayI.H b/src/lagrangian/dieselSpray/spray/sprayI.H
index 17672c2a1fa..86c063ca6f7 100644
--- a/src/lagrangian/dieselSpray/spray/sprayI.H
+++ b/src/lagrangian/dieselSpray/spray/sprayI.H
@@ -246,7 +246,7 @@ inline const liquidMixture& spray::fuels() const
}
-inline const PtrList<specieProperties>& spray::gasProperties() const
+inline const PtrList<gasThermoPhysics>& spray::gasProperties() const
{
return gasProperties_;
}
diff --git a/src/lagrangian/dieselSpray/sprayThermoTypes/sprayThermoTypes.H b/src/lagrangian/dieselSpray/sprayThermoTypes/sprayThermoTypes.H
deleted file mode 100644
index b52f690b5f8..00000000000
--- a/src/lagrangian/dieselSpray/sprayThermoTypes/sprayThermoTypes.H
+++ /dev/null
@@ -1,56 +0,0 @@
-/*---------------------------------------------------------------------------*\
- ========= |
- \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
- \\ / O peration |
- \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
- \\/ M anipulation |
--------------------------------------------------------------------------------
-License
- This file is part of OpenFOAM.
-
- OpenFOAM is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by the
- Free Software Foundation; either version 2 of the License, or (at your
- option) any later version.
-
- OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- for more details.
-
- You should have received a copy of the GNU General Public License
- along with OpenFOAM; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Typedef
- Foam::specieProperties
-
-Description
- Foam::specieProperties
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef sprayThermoTypes_H
-#define sprayThermoTypes_H
-
-#include "sutherlandTransport.H"
-#include "specieThermo.H"
-#include "janafThermo.H"
-#include "perfectGas.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
- typedef sutherlandTransport<specieThermo<janafThermo<perfectGas> > >
- specieProperties;
-
- // typedef sutherlandTransport<specieThermo<hConstThermo<perfectGas> > >
- // specieProperties;
-}
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/thermophysicalModels/radiation/include/createRadiationModel.H b/src/thermophysicalModels/radiation/include/createRadiationModel.H
index babe3c4dbe1..d61082c36fd 100644
--- a/src/thermophysicalModels/radiation/include/createRadiationModel.H
+++ b/src/thermophysicalModels/radiation/include/createRadiationModel.H
@@ -1,5 +1,5 @@
Info<< "Creating radiation model\n" << endl;
autoPtr<radiation::radiationModel> radiation
(
- radiation::radiationModel::New(thermo->T())
+ radiation::radiationModel::New(thermo.T())
);
--
GitLab