From ff290931176db203c05802a1ffec6bf1c72639f4 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Mon, 12 Jan 2015 12:32:38 +0000
Subject: [PATCH] Incompressible turbulence models: Remove the correction of
the laminar transport model Explicitly correct laminar transport at the
application level as is done in the multiphase solvers
---
.../buoyantBoussinesqPimpleFoam.C | 1 +
.../buoyantBoussinesqSimpleFoam.C | 1 +
.../adjointShapeOptimizationFoam.C | 1 +
.../boundaryFoam/boundaryFoam.C | 2 +-
.../pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C | 1 +
.../pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C | 1 +
.../incompressible/pimpleFoam/pimpleFoam.C | 1 +
.../incompressible/pisoFoam/createFields.H | 2 +-
.../incompressible/pisoFoam/pisoFoam.C | 1 +
.../simpleFoam/SRFSimpleFoam/SRFSimpleFoam.C | 1 +
.../porousSimpleFoam/porousSimpleFoam.C | 1 +
.../incompressible/simpleFoam/simpleFoam.C | 1 +
.../potentialFreeSurfaceDyMFoam.C | 1 +
.../potentialFreeSurfaceFoam.C | 1 +
applications/test/PisoFoam/Make/options | 1 +
applications/test/PisoFoam/PisoFoam.C | 2 +-
applications/test/PisoFoam/createFields.H | 48 --------
applications/test/PisoFoam/turbulenceModel.H | 9 ++
applications/test/RhoPimpleFoam/Make/options | 1 +
applications/test/RhoPimpleFoam/UEqn.H | 22 ----
.../test/RhoPimpleFoam/createFields.H | 73 -----------
applications/test/RhoPimpleFoam/pEqn.H | 113 ------------------
.../test/RhoPimpleFoam/rhoPimpleFoam.C | 2 +-
.../test/RhoPimpleFoam/turbulenceModel.H | 9 ++
.../incompressible/LES/DESModel/DESModel.C | 2 +-
.../incompressible/LES/DESModel/DESModel.H | 2 +-
.../DeardorffDiffStress/DeardorffDiffStress.C | 2 +-
.../DeardorffDiffStress/DeardorffDiffStress.H | 2 +-
.../LES/GenEddyVisc/GenEddyVisc.C | 2 +-
.../LES/GenEddyVisc/GenEddyVisc.H | 2 +-
.../LES/GenSGSStress/GenSGSStress.C | 2 +-
.../LES/GenSGSStress/GenSGSStress.H | 2 +-
.../incompressible/LES/LESModel/LESModel.C | 4 +-
.../incompressible/LES/LESModel/LESModel.H | 6 +-
.../LES/LRRDiffStress/LRRDiffStress.C | 2 +-
.../LES/LRRDiffStress/LRRDiffStress.H | 2 +-
.../LES/Smagorinsky/Smagorinsky.C | 2 +-
.../LES/Smagorinsky/Smagorinsky.H | 2 +-
.../LES/Smagorinsky2/Smagorinsky2.C | 2 +-
.../LES/Smagorinsky2/Smagorinsky2.H | 2 +-
.../LES/SpalartAllmaras/SpalartAllmaras.C | 2 +-
.../LES/SpalartAllmaras/SpalartAllmaras.H | 2 +-
.../SpalartAllmarasDDES/SpalartAllmarasDDES.C | 2 +-
.../SpalartAllmarasDDES/SpalartAllmarasDDES.H | 2 +-
.../SpalartAllmarasIDDES.C | 2 +-
.../SpalartAllmarasIDDES.H | 2 +-
.../LES/dynLagrangian/dynLagrangian.C | 2 +-
.../LES/dynLagrangian/dynLagrangian.H | 2 +-
.../LES/dynOneEqEddy/dynOneEqEddy.C | 2 +-
.../LES/dynOneEqEddy/dynOneEqEddy.H | 2 +-
.../homogeneousDynOneEqEddy.C | 2 +-
.../homogeneousDynOneEqEddy.H | 2 +-
.../homogeneousDynSmagorinsky.C | 2 +-
.../homogeneousDynSmagorinsky.H | 2 +-
.../LES/kOmegaSSTSAS/kOmegaSSTSAS.C | 2 +-
.../LES/kOmegaSSTSAS/kOmegaSSTSAS.H | 2 +-
.../incompressible/LES/laminar/laminar.C | 2 +-
.../incompressible/LES/laminar/laminar.H | 2 +-
.../LES/mixedSmagorinsky/mixedSmagorinsky.C | 2 +-
.../LES/mixedSmagorinsky/mixedSmagorinsky.H | 2 +-
.../incompressible/LES/oneEqEddy/oneEqEddy.C | 2 +-
.../incompressible/LES/oneEqEddy/oneEqEddy.H | 2 +-
.../LES/scaleSimilarity/scaleSimilarity.C | 2 +-
.../LES/scaleSimilarity/scaleSimilarity.H | 2 +-
.../LES/spectEddyVisc/spectEddyVisc.C | 2 +-
.../LES/spectEddyVisc/spectEddyVisc.H | 2 +-
.../incompressible/RAS/LRR/LRR.C | 2 +-
.../incompressible/RAS/LRR/LRR.H | 2 +-
.../RAS/LamBremhorstKE/LamBremhorstKE.C | 2 +-
.../RAS/LamBremhorstKE/LamBremhorstKE.H | 2 +-
.../RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C | 2 +-
.../RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H | 2 +-
.../RAS/LaunderSharmaKE/LaunderSharmaKE.C | 2 +-
.../RAS/LaunderSharmaKE/LaunderSharmaKE.H | 2 +-
.../RAS/LienCubicKE/LienCubicKE.C | 2 +-
.../RAS/LienCubicKE/LienCubicKE.H | 2 +-
.../RAS/LienCubicKELowRe/LienCubicKELowRe.C | 2 +-
.../RAS/LienCubicKELowRe/LienCubicKELowRe.H | 2 +-
.../LienLeschzinerLowRe/LienLeschzinerLowRe.C | 2 +-
.../LienLeschzinerLowRe/LienLeschzinerLowRe.H | 2 +-
.../RAS/NonlinearKEShih/NonlinearKEShih.C | 2 +-
.../RAS/NonlinearKEShih/NonlinearKEShih.H | 2 +-
.../incompressible/RAS/RASModel/RASModel.C | 4 +-
.../incompressible/RAS/RASModel/RASModel.H | 6 +-
.../RAS/RNGkEpsilon/RNGkEpsilon.C | 2 +-
.../RAS/RNGkEpsilon/RNGkEpsilon.H | 2 +-
.../RAS/SpalartAllmaras/SpalartAllmaras.C | 2 +-
.../RAS/SpalartAllmaras/SpalartAllmaras.H | 2 +-
.../incompressible/RAS/kEpsilon/kEpsilon.C | 2 +-
.../incompressible/RAS/kEpsilon/kEpsilon.H | 2 +-
.../incompressible/RAS/kOmega/kOmega.C | 2 +-
.../incompressible/RAS/kOmega/kOmega.H | 2 +-
.../incompressible/RAS/kOmegaSST/kOmegaSST.C | 2 +-
.../incompressible/RAS/kOmegaSST/kOmegaSST.H | 2 +-
.../incompressible/RAS/kkLOmega/kkLOmega.C | 2 +-
.../incompressible/RAS/kkLOmega/kkLOmega.H | 2 +-
.../incompressible/RAS/laminar/laminar.C | 2 +-
.../incompressible/RAS/laminar/laminar.H | 2 +-
.../incompressible/RAS/qZeta/qZeta.C | 2 +-
.../incompressible/RAS/qZeta/qZeta.H | 2 +-
.../RAS/realizableKE/realizableKE.C | 2 +-
.../RAS/realizableKE/realizableKE.H | 2 +-
.../incompressible/RAS/v2f/v2f.C | 2 +-
.../incompressible/RAS/v2f/v2f.H | 2 +-
.../turbulenceModel/laminar/laminar.C | 4 +-
.../turbulenceModel/laminar/laminar.H | 4 +-
.../turbulenceModel/turbulenceModel.C | 6 +-
.../turbulenceModel/turbulenceModel.H | 10 +-
108 files changed, 133 insertions(+), 359 deletions(-)
delete mode 100644 applications/test/PisoFoam/createFields.H
create mode 100644 applications/test/PisoFoam/turbulenceModel.H
delete mode 100644 applications/test/RhoPimpleFoam/UEqn.H
delete mode 100644 applications/test/RhoPimpleFoam/createFields.H
delete mode 100644 applications/test/RhoPimpleFoam/pEqn.H
create mode 100644 applications/test/RhoPimpleFoam/turbulenceModel.H
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C
index 43d8a4da534..9b331527cca 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C
@@ -97,6 +97,7 @@ int main(int argc, char *argv[])
if (pimple.turbCorr())
{
+ laminarTransport.correct();
turbulence->correct();
}
}
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C
index 483a723f7ce..3a258e444ee 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C
@@ -81,6 +81,7 @@ int main(int argc, char *argv[])
#include "pEqn.H"
}
+ laminarTransport.correct();
turbulence->correct();
runTime.write();
diff --git a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C
index f796bc9bc8e..a4497e74e00 100644
--- a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C
+++ b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C
@@ -216,6 +216,7 @@ int main(int argc, char *argv[])
Ua.correctBoundaryConditions();
}
+ laminarTransport.correct();
turbulence->correct();
runTime.write();
diff --git a/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C b/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C
index 9b6c0fabfae..097fef130b6 100644
--- a/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C
+++ b/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C
@@ -79,7 +79,7 @@ int main(int argc, char *argv[])
U += (Ubar - UbarStar);
gradP += (Ubar - UbarStar)/(1.0/UEqn.A())().weightedAverage(mesh.V());
-
+ laminarTransport.correct();
turbulence->correct();
Info<< "Uncorrected Ubar = " << (flowDirection & UbarStar.value())
diff --git a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C
index 1eb1edb5c12..ac83a0a3f54 100644
--- a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C
+++ b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C
@@ -82,6 +82,7 @@ int main(int argc, char *argv[])
if (pimple.turbCorr())
{
+ laminarTransport.correct();
turbulence->correct();
}
}
diff --git a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C
index 12b0b438a3f..441891f583a 100644
--- a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C
+++ b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C
@@ -104,6 +104,7 @@ int main(int argc, char *argv[])
if (pimple.turbCorr())
{
+ laminarTransport.correct();
turbulence->correct();
}
}
diff --git a/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C b/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C
index 61873f23978..5c046f4f9be 100644
--- a/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C
+++ b/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C
@@ -83,6 +83,7 @@ int main(int argc, char *argv[])
if (pimple.turbCorr())
{
+ laminarTransport.correct();
turbulence->correct();
}
}
diff --git a/applications/solvers/incompressible/pisoFoam/createFields.H b/applications/solvers/incompressible/pisoFoam/createFields.H
index 7cae304f6f6..85f9ce4793c 100644
--- a/applications/solvers/incompressible/pisoFoam/createFields.H
+++ b/applications/solvers/incompressible/pisoFoam/createFields.H
@@ -26,7 +26,7 @@
mesh
);
-# include "createPhi.H"
+ #include "createPhi.H"
label pRefCell = 0;
diff --git a/applications/solvers/incompressible/pisoFoam/pisoFoam.C b/applications/solvers/incompressible/pisoFoam/pisoFoam.C
index fc5b24ec6a6..59b107417aa 100644
--- a/applications/solvers/incompressible/pisoFoam/pisoFoam.C
+++ b/applications/solvers/incompressible/pisoFoam/pisoFoam.C
@@ -130,6 +130,7 @@ int main(int argc, char *argv[])
}
}
+ laminarTransport.correct();
turbulence->correct();
runTime.write();
diff --git a/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/SRFSimpleFoam.C b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/SRFSimpleFoam.C
index 5387b736db0..57d57028df4 100644
--- a/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/SRFSimpleFoam.C
+++ b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/SRFSimpleFoam.C
@@ -64,6 +64,7 @@ int main(int argc, char *argv[])
#include "pEqn.H"
}
+ laminarTransport.correct();
turbulence->correct();
if (runTime.outputTime())
diff --git a/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/porousSimpleFoam.C b/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/porousSimpleFoam.C
index 01c1dc16fb1..30cb08046a5 100644
--- a/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/porousSimpleFoam.C
+++ b/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/porousSimpleFoam.C
@@ -68,6 +68,7 @@ int main(int argc, char *argv[])
#include "pEqn.H"
}
+ laminarTransport.correct();
turbulence->correct();
runTime.write();
diff --git a/applications/solvers/incompressible/simpleFoam/simpleFoam.C b/applications/solvers/incompressible/simpleFoam/simpleFoam.C
index 80521c39697..04ebb2fbd06 100644
--- a/applications/solvers/incompressible/simpleFoam/simpleFoam.C
+++ b/applications/solvers/incompressible/simpleFoam/simpleFoam.C
@@ -62,6 +62,7 @@ int main(int argc, char *argv[])
#include "pEqn.H"
}
+ laminarTransport.correct();
turbulence->correct();
runTime.write();
diff --git a/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/potentialFreeSurfaceDyMFoam.C b/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/potentialFreeSurfaceDyMFoam.C
index 643f4eac442..767ceb9cec5 100644
--- a/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/potentialFreeSurfaceDyMFoam.C
+++ b/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/potentialFreeSurfaceDyMFoam.C
@@ -134,6 +134,7 @@ int main(int argc, char *argv[])
if (pimple.turbCorr())
{
+ laminarTransport.correct();
turbulence->correct();
}
}
diff --git a/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceFoam.C b/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceFoam.C
index 9b4caeed61e..1e1a9fe9e2e 100644
--- a/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceFoam.C
+++ b/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceFoam.C
@@ -83,6 +83,7 @@ int main(int argc, char *argv[])
if (pimple.turbCorr())
{
+ laminarTransport.correct();
turbulence->correct();
}
}
diff --git a/applications/test/PisoFoam/Make/options b/applications/test/PisoFoam/Make/options
index 23368faba68..d14a833f121 100644
--- a/applications/test/PisoFoam/Make/options
+++ b/applications/test/PisoFoam/Make/options
@@ -1,4 +1,5 @@
EXE_INC = \
+ -I$(FOAM_SOLVERS)/incompressible/pisoFoam \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
-I$(LIB_SRC)/transportModels \
diff --git a/applications/test/PisoFoam/PisoFoam.C b/applications/test/PisoFoam/PisoFoam.C
index d817318a8ab..5e5bd757141 100644
--- a/applications/test/PisoFoam/PisoFoam.C
+++ b/applications/test/PisoFoam/PisoFoam.C
@@ -33,7 +33,7 @@ Description
#include "fvCFD.H"
#include "singlePhaseTransportModel.H"
-#include "IncompressibleTurbulenceModel.H"
+#include "turbulenceModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/test/PisoFoam/createFields.H b/applications/test/PisoFoam/createFields.H
deleted file mode 100644
index d543396a8d5..00000000000
--- a/applications/test/PisoFoam/createFields.H
+++ /dev/null
@@ -1,48 +0,0 @@
- Info<< "Reading field p\n" << endl;
- volScalarField p
- (
- IOobject
- (
- "p",
- runTime.timeName(),
- mesh,
- IOobject::MUST_READ,
- IOobject::AUTO_WRITE
- ),
- mesh
- );
-
- Info<< "Reading field U\n" << endl;
- volVectorField U
- (
- IOobject
- (
- "U",
- runTime.timeName(),
- mesh,
- IOobject::MUST_READ,
- IOobject::AUTO_WRITE
- ),
- mesh
- );
-
- #include "createPhi.H"
-
-
- label pRefCell = 0;
- scalar pRefValue = 0.0;
- setRefCell(p, mesh.solutionDict().subDict("PISO"), pRefCell, pRefValue);
-
-
- singlePhaseTransportModel laminarTransport(U, phi);
-
- autoPtr<IncompressibleTurbulenceModel<transportModel> >
- turbulence
- (
- IncompressibleTurbulenceModel<transportModel>::New
- (
- U,
- phi,
- laminarTransport
- )
- );
diff --git a/applications/test/PisoFoam/turbulenceModel.H b/applications/test/PisoFoam/turbulenceModel.H
new file mode 100644
index 00000000000..77a4ab413d6
--- /dev/null
+++ b/applications/test/PisoFoam/turbulenceModel.H
@@ -0,0 +1,9 @@
+#include "IncompressibleTurbulenceModel.H"
+
+namespace Foam
+{
+ namespace incompressible
+ {
+ typedef IncompressibleTurbulenceModel<transportModel> turbulenceModel;
+ }
+}
diff --git a/applications/test/RhoPimpleFoam/Make/options b/applications/test/RhoPimpleFoam/Make/options
index 44d8f226caa..f8879e9ab5a 100644
--- a/applications/test/RhoPimpleFoam/Make/options
+++ b/applications/test/RhoPimpleFoam/Make/options
@@ -1,4 +1,5 @@
EXE_INC = \
+ -I$(FOAM_SOLVERS)/compressible/rhoPimpleFoam \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
diff --git a/applications/test/RhoPimpleFoam/UEqn.H b/applications/test/RhoPimpleFoam/UEqn.H
deleted file mode 100644
index 1adabbc1f09..00000000000
--- a/applications/test/RhoPimpleFoam/UEqn.H
+++ /dev/null
@@ -1,22 +0,0 @@
-// Solve the Momentum equation
-
-tmp<fvVectorMatrix> UEqn
-(
- fvm::ddt(rho, U)
- + fvm::div(phi, U)
- + turbulence->divDevRhoReff(U)
- ==
- fvOptions(rho, U)
-);
-
-UEqn().relax();
-
-fvOptions.constrain(UEqn());
-
-if (pimple.momentumPredictor())
-{
- solve(UEqn() == -fvc::grad(p));
-
- fvOptions.correct(U);
- K = 0.5*magSqr(U);
-}
diff --git a/applications/test/RhoPimpleFoam/createFields.H b/applications/test/RhoPimpleFoam/createFields.H
deleted file mode 100644
index 3a94360376f..00000000000
--- a/applications/test/RhoPimpleFoam/createFields.H
+++ /dev/null
@@ -1,73 +0,0 @@
- Info<< "Reading thermophysical properties\n" << endl;
-
- autoPtr<psiThermo> pThermo
- (
- psiThermo::New(mesh)
- );
- psiThermo& thermo = pThermo();
- thermo.validate(args.executable(), "h", "e");
-
- volScalarField& p = thermo.p();
- const volScalarField& psi = thermo.psi();
-
- volScalarField rho
- (
- IOobject
- (
- "rho",
- runTime.timeName(),
- mesh,
- IOobject::READ_IF_PRESENT,
- IOobject::AUTO_WRITE
- ),
- thermo.rho()
- );
-
- Info<< "Reading field U\n" << endl;
- volVectorField U
- (
- IOobject
- (
- "U",
- runTime.timeName(),
- mesh,
- IOobject::MUST_READ,
- IOobject::AUTO_WRITE
- ),
- mesh
- );
-
- #include "compressibleCreatePhi.H"
-
- dimensionedScalar rhoMax(pimple.dict().lookup("rhoMax"));
- dimensionedScalar rhoMin(pimple.dict().lookup("rhoMin"));
-
- Info<< "Creating turbulence model\n" << endl;
-
- autoPtr<CompressibleTurbulenceModel<fluidThermo> >
- turbulence
- (
- CompressibleTurbulenceModel<fluidThermo>::New
- (
- rho,
- U,
- phi,
- thermo
- )
- );
-
- Info<< "Creating field dpdt\n" << endl;
- volScalarField dpdt
- (
- IOobject
- (
- "dpdt",
- runTime.timeName(),
- mesh
- ),
- mesh,
- dimensionedScalar("dpdt", p.dimensions()/dimTime, 0)
- );
-
- Info<< "Creating field kinetic energy K\n" << endl;
- volScalarField K("K", 0.5*magSqr(U));
diff --git a/applications/test/RhoPimpleFoam/pEqn.H b/applications/test/RhoPimpleFoam/pEqn.H
deleted file mode 100644
index 465e81d0e9f..00000000000
--- a/applications/test/RhoPimpleFoam/pEqn.H
+++ /dev/null
@@ -1,113 +0,0 @@
-rho = thermo.rho();
-rho = max(rho, rhoMin);
-rho = min(rho, rhoMax);
-rho.relax();
-
-volScalarField rAU(1.0/UEqn().A());
-volVectorField HbyA("HbyA", U);
-HbyA = rAU*UEqn().H();
-
-if (pimple.nCorrPISO() <= 1)
-{
- UEqn.clear();
-}
-
-if (pimple.transonic())
-{
- surfaceScalarField phid
- (
- "phid",
- fvc::interpolate(psi)
- *(
- (fvc::interpolate(HbyA) & mesh.Sf())
- + fvc::ddtCorr(rAU, rho, U, phi)
- )
- );
-
- fvOptions.makeRelative(fvc::interpolate(psi), phid);
-
- volScalarField Dp("Dp", rho*rAU);
-
- while (pimple.correctNonOrthogonal())
- {
- fvScalarMatrix pEqn
- (
- fvm::ddt(psi, p)
- + fvm::div(phid, p)
- - fvm::laplacian(Dp, p)
- ==
- fvOptions(psi, p, rho.name())
- );
-
- fvOptions.constrain(pEqn);
-
- pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
-
- if (pimple.finalNonOrthogonalIter())
- {
- phi == pEqn.flux();
- }
- }
-}
-else
-{
- surfaceScalarField phiHbyA
- (
- "phiHbyA",
- fvc::interpolate(rho)
- *(
- (fvc::interpolate(HbyA) & mesh.Sf())
- + fvc::ddtCorr(rAU, rho, U, phi)
- )
- );
-
- fvOptions.makeRelative(fvc::interpolate(rho), phiHbyA);
-
- volScalarField Dp("Dp", rho*rAU);
-
- while (pimple.correctNonOrthogonal())
- {
- // Pressure corrector
- fvScalarMatrix pEqn
- (
- fvm::ddt(psi, p)
- + fvc::div(phiHbyA)
- - fvm::laplacian(Dp, p)
- ==
- fvOptions(psi, p, rho.name())
- );
-
- fvOptions.constrain(pEqn);
-
- pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
-
- if (pimple.finalNonOrthogonalIter())
- {
- phi = phiHbyA + pEqn.flux();
- }
- }
-}
-
-#include "rhoEqn.H"
-#include "compressibleContinuityErrs.H"
-
-// Explicitly relax pressure for momentum corrector
-p.relax();
-
-// Recalculate density from the relaxed pressure
-rho = thermo.rho();
-rho = max(rho, rhoMin);
-rho = min(rho, rhoMax);
-rho.relax();
-Info<< "rho max/min : " << max(rho).value()
- << " " << min(rho).value() << endl;
-
-U = HbyA - rAU*fvc::grad(p);
-U.correctBoundaryConditions();
-fvOptions.correct(U);
-K = 0.5*magSqr(U);
-
-if (thermo.dpdt())
-{
- dpdt = fvc::ddt(p);
-}
diff --git a/applications/test/RhoPimpleFoam/rhoPimpleFoam.C b/applications/test/RhoPimpleFoam/rhoPimpleFoam.C
index 2a17c938f44..6c6c4e99ab4 100644
--- a/applications/test/RhoPimpleFoam/rhoPimpleFoam.C
+++ b/applications/test/RhoPimpleFoam/rhoPimpleFoam.C
@@ -35,7 +35,7 @@ Description
#include "fvCFD.H"
#include "psiThermo.H"
-#include "CompressibleTurbulenceModel.H"
+#include "turbulenceModel.H"
#include "bound.H"
#include "pimpleControl.H"
#include "fvIOoptionList.H"
diff --git a/applications/test/RhoPimpleFoam/turbulenceModel.H b/applications/test/RhoPimpleFoam/turbulenceModel.H
new file mode 100644
index 00000000000..23547aa0c52
--- /dev/null
+++ b/applications/test/RhoPimpleFoam/turbulenceModel.H
@@ -0,0 +1,9 @@
+#include "CompressibleTurbulenceModel.H"
+
+namespace Foam
+{
+ namespace compressible
+ {
+ typedef CompressibleTurbulenceModel<fluidThermo> turbulenceModel;
+ }
+}
diff --git a/src/turbulenceModels/incompressible/LES/DESModel/DESModel.C b/src/turbulenceModels/incompressible/LES/DESModel/DESModel.C
index 3722f9cce60..3b792cac9fe 100644
--- a/src/turbulenceModels/incompressible/LES/DESModel/DESModel.C
+++ b/src/turbulenceModels/incompressible/LES/DESModel/DESModel.C
@@ -39,7 +39,7 @@ DESModel::DESModel
const word& type,
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName
)
:
diff --git a/src/turbulenceModels/incompressible/LES/DESModel/DESModel.H b/src/turbulenceModels/incompressible/LES/DESModel/DESModel.H
index 07f0c5c1c99..e89c26993f7 100644
--- a/src/turbulenceModels/incompressible/LES/DESModel/DESModel.H
+++ b/src/turbulenceModels/incompressible/LES/DESModel/DESModel.H
@@ -84,7 +84,7 @@ public:
const word& type,
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName
);
diff --git a/src/turbulenceModels/incompressible/LES/DeardorffDiffStress/DeardorffDiffStress.C b/src/turbulenceModels/incompressible/LES/DeardorffDiffStress/DeardorffDiffStress.C
index 02b9d6c6c3c..095205925da 100644
--- a/src/turbulenceModels/incompressible/LES/DeardorffDiffStress/DeardorffDiffStress.C
+++ b/src/turbulenceModels/incompressible/LES/DeardorffDiffStress/DeardorffDiffStress.C
@@ -55,7 +55,7 @@ DeardorffDiffStress::DeardorffDiffStress
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName,
const word& modelName
)
diff --git a/src/turbulenceModels/incompressible/LES/DeardorffDiffStress/DeardorffDiffStress.H b/src/turbulenceModels/incompressible/LES/DeardorffDiffStress/DeardorffDiffStress.H
index f3b8c6c4489..b7083fffc34 100644
--- a/src/turbulenceModels/incompressible/LES/DeardorffDiffStress/DeardorffDiffStress.H
+++ b/src/turbulenceModels/incompressible/LES/DeardorffDiffStress/DeardorffDiffStress.H
@@ -105,7 +105,7 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName = turbulenceModel::typeName,
const word& modelName = typeName
);
diff --git a/src/turbulenceModels/incompressible/LES/GenEddyVisc/GenEddyVisc.C b/src/turbulenceModels/incompressible/LES/GenEddyVisc/GenEddyVisc.C
index 69795c56d7a..b42e07c4839 100644
--- a/src/turbulenceModels/incompressible/LES/GenEddyVisc/GenEddyVisc.C
+++ b/src/turbulenceModels/incompressible/LES/GenEddyVisc/GenEddyVisc.C
@@ -45,7 +45,7 @@ GenEddyVisc::GenEddyVisc
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName,
const word& modelName
)
diff --git a/src/turbulenceModels/incompressible/LES/GenEddyVisc/GenEddyVisc.H b/src/turbulenceModels/incompressible/LES/GenEddyVisc/GenEddyVisc.H
index e1dc9c2b373..2eff45a1a13 100644
--- a/src/turbulenceModels/incompressible/LES/GenEddyVisc/GenEddyVisc.H
+++ b/src/turbulenceModels/incompressible/LES/GenEddyVisc/GenEddyVisc.H
@@ -91,7 +91,7 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName = turbulenceModel::typeName,
const word& modelName = typeName
);
diff --git a/src/turbulenceModels/incompressible/LES/GenSGSStress/GenSGSStress.C b/src/turbulenceModels/incompressible/LES/GenSGSStress/GenSGSStress.C
index 1618fb7f3be..e6f91636ced 100644
--- a/src/turbulenceModels/incompressible/LES/GenSGSStress/GenSGSStress.C
+++ b/src/turbulenceModels/incompressible/LES/GenSGSStress/GenSGSStress.C
@@ -45,7 +45,7 @@ GenSGSStress::GenSGSStress
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName,
const word& modelName
)
diff --git a/src/turbulenceModels/incompressible/LES/GenSGSStress/GenSGSStress.H b/src/turbulenceModels/incompressible/LES/GenSGSStress/GenSGSStress.H
index 4f24f791358..6b31f1e21e3 100644
--- a/src/turbulenceModels/incompressible/LES/GenSGSStress/GenSGSStress.H
+++ b/src/turbulenceModels/incompressible/LES/GenSGSStress/GenSGSStress.H
@@ -91,7 +91,7 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName = turbulenceModel::typeName,
const word& modelName = typeName
);
diff --git a/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C b/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C
index f2e2434446e..cb0311e2542 100644
--- a/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C
+++ b/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C
@@ -57,7 +57,7 @@ LESModel::LESModel
const word& type,
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName
)
:
@@ -95,7 +95,7 @@ autoPtr<LESModel> LESModel::New
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName
)
{
diff --git a/src/turbulenceModels/incompressible/LES/LESModel/LESModel.H b/src/turbulenceModels/incompressible/LES/LESModel/LESModel.H
index d08086234b8..dcb3550eac5 100644
--- a/src/turbulenceModels/incompressible/LES/LESModel/LESModel.H
+++ b/src/turbulenceModels/incompressible/LES/LESModel/LESModel.H
@@ -122,7 +122,7 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName
),
(U, phi, transport, turbulenceModelName)
@@ -137,7 +137,7 @@ public:
const word& type,
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName = turbulenceModel::typeName
);
@@ -149,7 +149,7 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/LES/LRRDiffStress/LRRDiffStress.C b/src/turbulenceModels/incompressible/LES/LRRDiffStress/LRRDiffStress.C
index 4c2ce31f9dc..553313a05b2 100644
--- a/src/turbulenceModels/incompressible/LES/LRRDiffStress/LRRDiffStress.C
+++ b/src/turbulenceModels/incompressible/LES/LRRDiffStress/LRRDiffStress.C
@@ -55,7 +55,7 @@ LRRDiffStress::LRRDiffStress
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName,
const word& modelName
)
diff --git a/src/turbulenceModels/incompressible/LES/LRRDiffStress/LRRDiffStress.H b/src/turbulenceModels/incompressible/LES/LRRDiffStress/LRRDiffStress.H
index 62aaaa3ef04..dc52ad57b0b 100644
--- a/src/turbulenceModels/incompressible/LES/LRRDiffStress/LRRDiffStress.H
+++ b/src/turbulenceModels/incompressible/LES/LRRDiffStress/LRRDiffStress.H
@@ -102,7 +102,7 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName = turbulenceModel::typeName,
const word& modelName = typeName
);
diff --git a/src/turbulenceModels/incompressible/LES/Smagorinsky/Smagorinsky.C b/src/turbulenceModels/incompressible/LES/Smagorinsky/Smagorinsky.C
index ed1e3309343..6b64382670e 100644
--- a/src/turbulenceModels/incompressible/LES/Smagorinsky/Smagorinsky.C
+++ b/src/turbulenceModels/incompressible/LES/Smagorinsky/Smagorinsky.C
@@ -55,7 +55,7 @@ Smagorinsky::Smagorinsky
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName,
const word& modelName
)
diff --git a/src/turbulenceModels/incompressible/LES/Smagorinsky/Smagorinsky.H b/src/turbulenceModels/incompressible/LES/Smagorinsky/Smagorinsky.H
index 8af2bbe08a5..51403f97f38 100644
--- a/src/turbulenceModels/incompressible/LES/Smagorinsky/Smagorinsky.H
+++ b/src/turbulenceModels/incompressible/LES/Smagorinsky/Smagorinsky.H
@@ -99,7 +99,7 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName = turbulenceModel::typeName,
const word& modelName = typeName
);
diff --git a/src/turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.C b/src/turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.C
index 84fc1fc7be5..1f6b8357763 100644
--- a/src/turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.C
+++ b/src/turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.C
@@ -46,7 +46,7 @@ Smagorinsky2::Smagorinsky2
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName,
const word& modelName
)
diff --git a/src/turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.H b/src/turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.H
index b51528f945e..f83aaca3679 100644
--- a/src/turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.H
+++ b/src/turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.H
@@ -96,7 +96,7 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName = turbulenceModel::typeName,
const word& modelName = typeName
);
diff --git a/src/turbulenceModels/incompressible/LES/SpalartAllmaras/SpalartAllmaras.C b/src/turbulenceModels/incompressible/LES/SpalartAllmaras/SpalartAllmaras.C
index 2c174d55cee..9b5414d206f 100644
--- a/src/turbulenceModels/incompressible/LES/SpalartAllmaras/SpalartAllmaras.C
+++ b/src/turbulenceModels/incompressible/LES/SpalartAllmaras/SpalartAllmaras.C
@@ -180,7 +180,7 @@ SpalartAllmaras::SpalartAllmaras
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName,
const word& modelName
)
diff --git a/src/turbulenceModels/incompressible/LES/SpalartAllmaras/SpalartAllmaras.H b/src/turbulenceModels/incompressible/LES/SpalartAllmaras/SpalartAllmaras.H
index 3b69a746b89..f5753ebfcc0 100644
--- a/src/turbulenceModels/incompressible/LES/SpalartAllmaras/SpalartAllmaras.H
+++ b/src/turbulenceModels/incompressible/LES/SpalartAllmaras/SpalartAllmaras.H
@@ -157,7 +157,7 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName = turbulenceModel::typeName,
const word& modelName = typeName
);
diff --git a/src/turbulenceModels/incompressible/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.C b/src/turbulenceModels/incompressible/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.C
index 06a83c1e897..bda4345e68a 100644
--- a/src/turbulenceModels/incompressible/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.C
+++ b/src/turbulenceModels/incompressible/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.C
@@ -99,7 +99,7 @@ SpalartAllmarasDDES::SpalartAllmarasDDES
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName,
const word& modelName
)
diff --git a/src/turbulenceModels/incompressible/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.H b/src/turbulenceModels/incompressible/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.H
index 70b6f5cf9b4..834e1274a74 100644
--- a/src/turbulenceModels/incompressible/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.H
+++ b/src/turbulenceModels/incompressible/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.H
@@ -100,7 +100,7 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName = turbulenceModel::typeName,
const word& modelName = typeName
);
diff --git a/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C b/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C
index 7ac42ffb480..bb71aae104f 100644
--- a/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C
+++ b/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C
@@ -146,7 +146,7 @@ SpalartAllmarasIDDES::SpalartAllmarasIDDES
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName,
const word& modelName
)
diff --git a/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H b/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H
index c2565efb500..3d8c27d3165 100644
--- a/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H
+++ b/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H
@@ -109,7 +109,7 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName = turbulenceModel::typeName,
const word& modelName = typeName
);
diff --git a/src/turbulenceModels/incompressible/LES/dynLagrangian/dynLagrangian.C b/src/turbulenceModels/incompressible/LES/dynLagrangian/dynLagrangian.C
index 24ef2ab2316..7a9aef81480 100644
--- a/src/turbulenceModels/incompressible/LES/dynLagrangian/dynLagrangian.C
+++ b/src/turbulenceModels/incompressible/LES/dynLagrangian/dynLagrangian.C
@@ -58,7 +58,7 @@ dynLagrangian::dynLagrangian
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName,
const word& modelName
)
diff --git a/src/turbulenceModels/incompressible/LES/dynLagrangian/dynLagrangian.H b/src/turbulenceModels/incompressible/LES/dynLagrangian/dynLagrangian.H
index 533b063750c..ab9b945cc00 100644
--- a/src/turbulenceModels/incompressible/LES/dynLagrangian/dynLagrangian.H
+++ b/src/turbulenceModels/incompressible/LES/dynLagrangian/dynLagrangian.H
@@ -137,7 +137,7 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName = turbulenceModel::typeName,
const word& modelName = typeName
);
diff --git a/src/turbulenceModels/incompressible/LES/dynOneEqEddy/dynOneEqEddy.C b/src/turbulenceModels/incompressible/LES/dynOneEqEddy/dynOneEqEddy.C
index 5e125d53108..dba62a3379b 100644
--- a/src/turbulenceModels/incompressible/LES/dynOneEqEddy/dynOneEqEddy.C
+++ b/src/turbulenceModels/incompressible/LES/dynOneEqEddy/dynOneEqEddy.C
@@ -106,7 +106,7 @@ dynOneEqEddy::dynOneEqEddy
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName,
const word& modelName
)
diff --git a/src/turbulenceModels/incompressible/LES/dynOneEqEddy/dynOneEqEddy.H b/src/turbulenceModels/incompressible/LES/dynOneEqEddy/dynOneEqEddy.H
index 6a9384f406f..be4a0dd29d2 100644
--- a/src/turbulenceModels/incompressible/LES/dynOneEqEddy/dynOneEqEddy.H
+++ b/src/turbulenceModels/incompressible/LES/dynOneEqEddy/dynOneEqEddy.H
@@ -135,7 +135,7 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName = turbulenceModel::typeName,
const word& modelName = typeName
);
diff --git a/src/turbulenceModels/incompressible/LES/homogeneousDynOneEqEddy/homogeneousDynOneEqEddy.C b/src/turbulenceModels/incompressible/LES/homogeneousDynOneEqEddy/homogeneousDynOneEqEddy.C
index d84f830d88b..67a8bfb499d 100644
--- a/src/turbulenceModels/incompressible/LES/homogeneousDynOneEqEddy/homogeneousDynOneEqEddy.C
+++ b/src/turbulenceModels/incompressible/LES/homogeneousDynOneEqEddy/homogeneousDynOneEqEddy.C
@@ -122,7 +122,7 @@ homogeneousDynOneEqEddy::homogeneousDynOneEqEddy
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName,
const word& modelName
)
diff --git a/src/turbulenceModels/incompressible/LES/homogeneousDynOneEqEddy/homogeneousDynOneEqEddy.H b/src/turbulenceModels/incompressible/LES/homogeneousDynOneEqEddy/homogeneousDynOneEqEddy.H
index 68e01833459..4bb645ab4ea 100644
--- a/src/turbulenceModels/incompressible/LES/homogeneousDynOneEqEddy/homogeneousDynOneEqEddy.H
+++ b/src/turbulenceModels/incompressible/LES/homogeneousDynOneEqEddy/homogeneousDynOneEqEddy.H
@@ -113,7 +113,7 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName = turbulenceModel::typeName,
const word& modelName = typeName
);
diff --git a/src/turbulenceModels/incompressible/LES/homogeneousDynSmagorinsky/homogeneousDynSmagorinsky.C b/src/turbulenceModels/incompressible/LES/homogeneousDynSmagorinsky/homogeneousDynSmagorinsky.C
index 89f91c85fd1..6ed27e27e05 100644
--- a/src/turbulenceModels/incompressible/LES/homogeneousDynSmagorinsky/homogeneousDynSmagorinsky.C
+++ b/src/turbulenceModels/incompressible/LES/homogeneousDynSmagorinsky/homogeneousDynSmagorinsky.C
@@ -110,7 +110,7 @@ homogeneousDynSmagorinsky::homogeneousDynSmagorinsky
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName,
const word& modelName
)
diff --git a/src/turbulenceModels/incompressible/LES/homogeneousDynSmagorinsky/homogeneousDynSmagorinsky.H b/src/turbulenceModels/incompressible/LES/homogeneousDynSmagorinsky/homogeneousDynSmagorinsky.H
index cc95bb047ae..00d03369a9c 100644
--- a/src/turbulenceModels/incompressible/LES/homogeneousDynSmagorinsky/homogeneousDynSmagorinsky.H
+++ b/src/turbulenceModels/incompressible/LES/homogeneousDynSmagorinsky/homogeneousDynSmagorinsky.H
@@ -126,7 +126,7 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName = turbulenceModel::typeName,
const word& modelName = typeName
);
diff --git a/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C b/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C
index 43f722f92dd..ad7daf84ae2 100644
--- a/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C
+++ b/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C
@@ -120,7 +120,7 @@ kOmegaSSTSAS::kOmegaSSTSAS
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName,
const word& modelName
)
diff --git a/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.H b/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.H
index c0a6dd90ba0..b10a0e9ed1c 100644
--- a/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.H
+++ b/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.H
@@ -199,7 +199,7 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName = turbulenceModel::typeName,
const word& modelName = typeName
);
diff --git a/src/turbulenceModels/incompressible/LES/laminar/laminar.C b/src/turbulenceModels/incompressible/LES/laminar/laminar.C
index 5a78c213ee3..5e818da1014 100644
--- a/src/turbulenceModels/incompressible/LES/laminar/laminar.C
+++ b/src/turbulenceModels/incompressible/LES/laminar/laminar.C
@@ -47,7 +47,7 @@ laminar::laminar
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName,
const word& modelName
)
diff --git a/src/turbulenceModels/incompressible/LES/laminar/laminar.H b/src/turbulenceModels/incompressible/LES/laminar/laminar.H
index 777a9228a73..e99db3e4c15 100644
--- a/src/turbulenceModels/incompressible/LES/laminar/laminar.H
+++ b/src/turbulenceModels/incompressible/LES/laminar/laminar.H
@@ -76,7 +76,7 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName = turbulenceModel::typeName,
const word& modelName = typeName
);
diff --git a/src/turbulenceModels/incompressible/LES/mixedSmagorinsky/mixedSmagorinsky.C b/src/turbulenceModels/incompressible/LES/mixedSmagorinsky/mixedSmagorinsky.C
index b17f4ea572a..c0b80e63dde 100644
--- a/src/turbulenceModels/incompressible/LES/mixedSmagorinsky/mixedSmagorinsky.C
+++ b/src/turbulenceModels/incompressible/LES/mixedSmagorinsky/mixedSmagorinsky.C
@@ -46,7 +46,7 @@ mixedSmagorinsky::mixedSmagorinsky
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName,
const word& modelName
)
diff --git a/src/turbulenceModels/incompressible/LES/mixedSmagorinsky/mixedSmagorinsky.H b/src/turbulenceModels/incompressible/LES/mixedSmagorinsky/mixedSmagorinsky.H
index c48932d0874..8218fed13b1 100644
--- a/src/turbulenceModels/incompressible/LES/mixedSmagorinsky/mixedSmagorinsky.H
+++ b/src/turbulenceModels/incompressible/LES/mixedSmagorinsky/mixedSmagorinsky.H
@@ -102,7 +102,7 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName = turbulenceModel::typeName,
const word& modelName = typeName
);
diff --git a/src/turbulenceModels/incompressible/LES/oneEqEddy/oneEqEddy.C b/src/turbulenceModels/incompressible/LES/oneEqEddy/oneEqEddy.C
index e31d5e1a4de..dd2b47987a6 100644
--- a/src/turbulenceModels/incompressible/LES/oneEqEddy/oneEqEddy.C
+++ b/src/turbulenceModels/incompressible/LES/oneEqEddy/oneEqEddy.C
@@ -56,7 +56,7 @@ oneEqEddy::oneEqEddy
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName,
const word& modelName
)
diff --git a/src/turbulenceModels/incompressible/LES/oneEqEddy/oneEqEddy.H b/src/turbulenceModels/incompressible/LES/oneEqEddy/oneEqEddy.H
index 1b7472d7876..e8983565e60 100644
--- a/src/turbulenceModels/incompressible/LES/oneEqEddy/oneEqEddy.H
+++ b/src/turbulenceModels/incompressible/LES/oneEqEddy/oneEqEddy.H
@@ -105,7 +105,7 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName = turbulenceModel::typeName,
const word& modelName = typeName
);
diff --git a/src/turbulenceModels/incompressible/LES/scaleSimilarity/scaleSimilarity.C b/src/turbulenceModels/incompressible/LES/scaleSimilarity/scaleSimilarity.C
index 61322de356f..97f347a2533 100644
--- a/src/turbulenceModels/incompressible/LES/scaleSimilarity/scaleSimilarity.C
+++ b/src/turbulenceModels/incompressible/LES/scaleSimilarity/scaleSimilarity.C
@@ -44,7 +44,7 @@ scaleSimilarity::scaleSimilarity
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName,
const word& modelName
)
diff --git a/src/turbulenceModels/incompressible/LES/scaleSimilarity/scaleSimilarity.H b/src/turbulenceModels/incompressible/LES/scaleSimilarity/scaleSimilarity.H
index f159ebab741..83b88823fce 100644
--- a/src/turbulenceModels/incompressible/LES/scaleSimilarity/scaleSimilarity.H
+++ b/src/turbulenceModels/incompressible/LES/scaleSimilarity/scaleSimilarity.H
@@ -87,7 +87,7 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName = turbulenceModel::typeName,
const word& modelName = typeName
);
diff --git a/src/turbulenceModels/incompressible/LES/spectEddyVisc/spectEddyVisc.C b/src/turbulenceModels/incompressible/LES/spectEddyVisc/spectEddyVisc.C
index d599e46c49b..026d705520e 100644
--- a/src/turbulenceModels/incompressible/LES/spectEddyVisc/spectEddyVisc.C
+++ b/src/turbulenceModels/incompressible/LES/spectEddyVisc/spectEddyVisc.C
@@ -65,7 +65,7 @@ spectEddyVisc::spectEddyVisc
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName,
const word& modelName
)
diff --git a/src/turbulenceModels/incompressible/LES/spectEddyVisc/spectEddyVisc.H b/src/turbulenceModels/incompressible/LES/spectEddyVisc/spectEddyVisc.H
index a223a9d076f..500345f8b23 100644
--- a/src/turbulenceModels/incompressible/LES/spectEddyVisc/spectEddyVisc.H
+++ b/src/turbulenceModels/incompressible/LES/spectEddyVisc/spectEddyVisc.H
@@ -107,7 +107,7 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName = turbulenceModel::typeName,
const word& modelName = typeName
);
diff --git a/src/turbulenceModels/incompressible/RAS/LRR/LRR.C b/src/turbulenceModels/incompressible/RAS/LRR/LRR.C
index bcb4417d663..0f04332a15b 100644
--- a/src/turbulenceModels/incompressible/RAS/LRR/LRR.C
+++ b/src/turbulenceModels/incompressible/RAS/LRR/LRR.C
@@ -49,7 +49,7 @@ LRR::LRR
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName,
const word& modelName
)
diff --git a/src/turbulenceModels/incompressible/RAS/LRR/LRR.H b/src/turbulenceModels/incompressible/RAS/LRR/LRR.H
index f60f0a66304..ca8602e90dc 100644
--- a/src/turbulenceModels/incompressible/RAS/LRR/LRR.H
+++ b/src/turbulenceModels/incompressible/RAS/LRR/LRR.H
@@ -115,7 +115,7 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName = turbulenceModel::typeName,
const word& modelName = typeName
);
diff --git a/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C b/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C
index 76b038c0142..c23bc4b0b21 100644
--- a/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C
+++ b/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C
@@ -48,7 +48,7 @@ LamBremhorstKE::LamBremhorstKE
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName,
const word& modelName
)
diff --git a/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.H b/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.H
index e58ce52d295..30e590cad7d 100644
--- a/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.H
+++ b/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.H
@@ -96,7 +96,7 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName = turbulenceModel::typeName,
const word& modelName = typeName
);
diff --git a/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C b/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
index 177b3435ae7..b8d55d9b3cb 100644
--- a/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
+++ b/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
@@ -49,7 +49,7 @@ LaunderGibsonRSTM::LaunderGibsonRSTM
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName,
const word& modelName
)
diff --git a/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H b/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H
index 6ff290d60b1..921e2f4685f 100644
--- a/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H
+++ b/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H
@@ -127,7 +127,7 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName = turbulenceModel::typeName,
const word& modelName = typeName
);
diff --git a/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C b/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
index ee2027180de..842bf9206df 100644
--- a/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
+++ b/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
@@ -64,7 +64,7 @@ LaunderSharmaKE::LaunderSharmaKE
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName,
const word& modelName
)
diff --git a/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H b/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H
index 9396df87b9d..fc51ea5288f 100644
--- a/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H
+++ b/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H
@@ -108,7 +108,7 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName = turbulenceModel::typeName,
const word& modelName = typeName
);
diff --git a/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C b/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C
index e346ccd831b..3f0de6860fa 100644
--- a/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C
+++ b/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C
@@ -48,7 +48,7 @@ LienCubicKE::LienCubicKE
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName,
const word& modelName
)
diff --git a/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.H b/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.H
index 78771f9d6e0..6da2c34b4f7 100644
--- a/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.H
+++ b/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.H
@@ -104,7 +104,7 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName = turbulenceModel::typeName,
const word& modelName = typeName
);
diff --git a/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.C b/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.C
index 4b880bc5657..12a05b4feff 100644
--- a/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.C
+++ b/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.C
@@ -49,7 +49,7 @@ LienCubicKELowRe::LienCubicKELowRe
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName,
const word& modelName
)
diff --git a/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.H b/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.H
index b86b0cb0503..a7dcac84c2c 100644
--- a/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.H
+++ b/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.H
@@ -134,7 +134,7 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName = turbulenceModel::typeName,
const word& modelName = typeName
);
diff --git a/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.C b/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.C
index eab7aed0fea..5b4c77477cd 100644
--- a/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.C
+++ b/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.C
@@ -49,7 +49,7 @@ LienLeschzinerLowRe::LienLeschzinerLowRe
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName,
const word& modelName
)
diff --git a/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.H b/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.H
index 430b0d5f0b7..c9d664ce0d4 100644
--- a/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.H
+++ b/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.H
@@ -104,7 +104,7 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName = turbulenceModel::typeName,
const word& modelName = typeName
);
diff --git a/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C b/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C
index 68fb68c0c63..18edb809e9c 100644
--- a/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C
+++ b/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C
@@ -48,7 +48,7 @@ NonlinearKEShih::NonlinearKEShih
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName,
const word& modelName
)
diff --git a/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.H b/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.H
index b7c89fac1bf..db87b2e8186 100644
--- a/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.H
+++ b/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.H
@@ -107,7 +107,7 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName = turbulenceModel::typeName,
const word& modelName = typeName
);
diff --git a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C
index 29c06018608..f31f51ecadf 100644
--- a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C
+++ b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C
@@ -57,7 +57,7 @@ RASModel::RASModel
const word& type,
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName
)
:
@@ -99,7 +99,7 @@ autoPtr<RASModel> RASModel::New
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName
)
{
diff --git a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.H b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.H
index 4e890bb2051..17487459ee9 100644
--- a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.H
+++ b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.H
@@ -130,7 +130,7 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName
),
(U, phi, transport, turbulenceModelName)
@@ -145,7 +145,7 @@ public:
const word& type,
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName = turbulenceModel::typeName
);
@@ -157,7 +157,7 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.C b/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.C
index 1cca2780aab..0ce8c19086f 100644
--- a/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.C
+++ b/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.C
@@ -48,7 +48,7 @@ RNGkEpsilon::RNGkEpsilon
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName,
const word& modelName
)
diff --git a/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.H b/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.H
index df35dcadb87..15528839004 100644
--- a/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.H
+++ b/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.H
@@ -114,7 +114,7 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName = turbulenceModel::typeName,
const word& modelName = typeName
);
diff --git a/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.C b/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.C
index e083bca6b66..5612ead2d37 100644
--- a/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.C
+++ b/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.C
@@ -143,7 +143,7 @@ SpalartAllmaras::SpalartAllmaras
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName,
const word& modelName
)
diff --git a/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.H b/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.H
index dfa6d875e9f..554ad12d329 100644
--- a/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.H
+++ b/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.H
@@ -159,7 +159,7 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName = turbulenceModel::typeName,
const word& modelName = typeName
);
diff --git a/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.C b/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.C
index e662da52ba3..9f9c95f5aac 100644
--- a/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.C
+++ b/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.C
@@ -48,7 +48,7 @@ kEpsilon::kEpsilon
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName,
const word& modelName
)
diff --git a/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.H b/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.H
index f3b8f55864a..7bd9fcf118d 100644
--- a/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.H
+++ b/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.H
@@ -111,7 +111,7 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName = turbulenceModel::typeName,
const word& modelName = typeName
);
diff --git a/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.C b/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.C
index 26dc7160805..8543937160e 100644
--- a/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.C
+++ b/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.C
@@ -48,7 +48,7 @@ kOmega::kOmega
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName,
const word& modelName
)
diff --git a/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.H b/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.H
index d0c9e3ad2f6..bfadb1fd618 100644
--- a/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.H
+++ b/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.H
@@ -114,7 +114,7 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName = turbulenceModel::typeName,
const word& modelName = typeName
);
diff --git a/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C b/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C
index b7563e4e827..9eada0bf271 100644
--- a/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C
+++ b/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C
@@ -117,7 +117,7 @@ kOmegaSST::kOmegaSST
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName,
const word& modelName
)
diff --git a/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.H b/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.H
index 98bdec767e0..c64f5e36b32 100644
--- a/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.H
+++ b/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.H
@@ -206,7 +206,7 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName = turbulenceModel::typeName,
const word& modelName = typeName
);
diff --git a/src/turbulenceModels/incompressible/RAS/kkLOmega/kkLOmega.C b/src/turbulenceModels/incompressible/RAS/kkLOmega/kkLOmega.C
index 352cccf9cfe..b7e8231ca34 100644
--- a/src/turbulenceModels/incompressible/RAS/kkLOmega/kkLOmega.C
+++ b/src/turbulenceModels/incompressible/RAS/kkLOmega/kkLOmega.C
@@ -206,7 +206,7 @@ kkLOmega::kkLOmega
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName,
const word& modelName
)
diff --git a/src/turbulenceModels/incompressible/RAS/kkLOmega/kkLOmega.H b/src/turbulenceModels/incompressible/RAS/kkLOmega/kkLOmega.H
index ec988644a09..65a14ce357e 100644
--- a/src/turbulenceModels/incompressible/RAS/kkLOmega/kkLOmega.H
+++ b/src/turbulenceModels/incompressible/RAS/kkLOmega/kkLOmega.H
@@ -200,7 +200,7 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName = turbulenceModel::typeName,
const word& modelName = typeName
);
diff --git a/src/turbulenceModels/incompressible/RAS/laminar/laminar.C b/src/turbulenceModels/incompressible/RAS/laminar/laminar.C
index f0597b58da5..6d2abd699dc 100644
--- a/src/turbulenceModels/incompressible/RAS/laminar/laminar.C
+++ b/src/turbulenceModels/incompressible/RAS/laminar/laminar.C
@@ -46,7 +46,7 @@ laminar::laminar
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName,
const word& modelName
)
diff --git a/src/turbulenceModels/incompressible/RAS/laminar/laminar.H b/src/turbulenceModels/incompressible/RAS/laminar/laminar.H
index 29426dadaf3..8b2069364fc 100644
--- a/src/turbulenceModels/incompressible/RAS/laminar/laminar.H
+++ b/src/turbulenceModels/incompressible/RAS/laminar/laminar.H
@@ -70,7 +70,7 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName = turbulenceModel::typeName,
const word& modelName = typeName
);
diff --git a/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.C b/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.C
index 44d39008431..e655d1628e2 100644
--- a/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.C
+++ b/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.C
@@ -74,7 +74,7 @@ qZeta::qZeta
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName,
const word& modelName
)
diff --git a/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.H b/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.H
index d45f686af7b..1566771cbe1 100644
--- a/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.H
+++ b/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.H
@@ -119,7 +119,7 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName = turbulenceModel::typeName,
const word& modelName = typeName
);
diff --git a/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.C b/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.C
index 959fca9dc3a..b2ee7ffdfbc 100644
--- a/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.C
+++ b/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.C
@@ -93,7 +93,7 @@ realizableKE::realizableKE
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName,
const word& modelName
)
diff --git a/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.H b/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.H
index 3f32089a6c9..3a4850e542b 100644
--- a/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.H
+++ b/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.H
@@ -125,7 +125,7 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName = turbulenceModel::typeName,
const word& modelName = typeName
);
diff --git a/src/turbulenceModels/incompressible/RAS/v2f/v2f.C b/src/turbulenceModels/incompressible/RAS/v2f/v2f.C
index ea5fb187280..ec16b6f665f 100644
--- a/src/turbulenceModels/incompressible/RAS/v2f/v2f.C
+++ b/src/turbulenceModels/incompressible/RAS/v2f/v2f.C
@@ -93,7 +93,7 @@ v2f::v2f
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName,
const word& modelName
)
diff --git a/src/turbulenceModels/incompressible/RAS/v2f/v2f.H b/src/turbulenceModels/incompressible/RAS/v2f/v2f.H
index c426984b08b..d29c846fc36 100644
--- a/src/turbulenceModels/incompressible/RAS/v2f/v2f.H
+++ b/src/turbulenceModels/incompressible/RAS/v2f/v2f.H
@@ -186,7 +186,7 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName = turbulenceModel::typeName,
const word& modelName = typeName
);
diff --git a/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.C b/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.C
index 65a6e2e6850..f12f3000aac 100644
--- a/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.C
+++ b/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.C
@@ -50,7 +50,7 @@ laminar::laminar
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName
)
:
@@ -64,7 +64,7 @@ autoPtr<laminar> laminar::New
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName
)
{
diff --git a/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.H b/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.H
index 9c8588015f0..ed39e695191 100644
--- a/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.H
+++ b/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.H
@@ -65,7 +65,7 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName = turbulenceModel::typeName
);
@@ -77,7 +77,7 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName = turbulenceModel::typeName
);
diff --git a/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.C b/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.C
index 9de75af54f0..9015850baa8 100644
--- a/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.C
+++ b/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.C
@@ -46,7 +46,7 @@ turbulenceModel::turbulenceModel
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName
)
:
@@ -77,7 +77,7 @@ autoPtr<turbulenceModel> turbulenceModel::New
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName
)
{
@@ -128,8 +128,6 @@ autoPtr<turbulenceModel> turbulenceModel::New
void turbulenceModel::correct()
{
- transportModel_.correct();
-
if (mesh_.changing())
{
y_.correct();
diff --git a/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.H b/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.H
index f4eeba47e94..1095e72eaf8 100644
--- a/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.H
+++ b/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.H
@@ -82,7 +82,7 @@ protected:
const volVectorField& U_;
const surfaceScalarField& phi_;
- transportModel& transportModel_;
+ const transportModel& transportModel_;
//- Near wall distance boundary field
nearWallDist y_;
@@ -115,7 +115,7 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName
),
(U, phi, transport, turbulenceModelName)
@@ -129,7 +129,7 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName = typeName
);
@@ -141,7 +141,7 @@ public:
(
const volVectorField& U,
const surfaceScalarField& phi,
- transportModel& transport,
+ const transportModel& transport,
const word& turbulenceModelName = typeName
);
@@ -175,7 +175,7 @@ public:
}
//- Access function to incompressible transport model
- inline transportModel& transport() const
+ inline const transportModel& transport() const
{
return transportModel_;
}
--
GitLab