exaFOAM/foam-extend4.1-coherent-io
Archived
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Changed turbulence model interface to remove non-const access to U

Browse source
This commit is contained in:
Hrvoje Jasak 2016-06-06 14:59:41 +01:00
parent 3ea2cb128c
commit 4f1adadf23
140 changed files with 256 additions and 253 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
View file

@ -215,11 +215,12 @@ tmp<volSymmTensorField> PDRkEpsilon::devRhoReff() const
}
tmp<fvVectorMatrix> PDRkEpsilon::divDevRhoReff(volVectorField& U) const
tmp<fvVectorMatrix> PDRkEpsilon::divDevRhoReff() const
{
return
(
- fvm::laplacian(muEff(), U) - fvc::div(muEff()*dev2(T(fvc::grad(U))))
- fvm::laplacian(muEff(), U_)
- fvc::div(muEff()*dev2(T(fvc::grad(U_))))
);
}

2
applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H
View file

@ -174,7 +174,7 @@ public:
tmp<volSymmTensorField> devRhoReff() const;
//- Return the source term for the momentum equation
tmp<fvVectorMatrix> divDevRhoReff(volVectorField& U) const;
tmp<fvVectorMatrix> divDevRhoReff() const;
//- Solve the turbulence equations and correct the turbulence viscosity
void correct();

2
applications/solvers/combustion/PDRFoam/UEqn.H
View file

@ -2,7 +2,7 @@
(
betav*fvm::ddt(rho, U)
+ fvm::div(phi, U)
+ turbulence->divDevRhoReff(U)
+ turbulence->divDevRhoReff()
==
betav*rho*g
);

2
applications/solvers/combustion/XiFoam/UEqn.H
View file

@ -2,7 +2,7 @@
(
fvm::ddt(rho, U)
+ fvm::div(phi, U)
+ turbulence->divDevRhoReff(U)
+ turbulence->divDevRhoReff()
==
rho*g
);

2
applications/solvers/combustion/dieselEngineFoam/UEqn.H
View file

@ -2,7 +2,7 @@
(
fvm::ddt(rho, U)
+ fvm::div(phi, U)
+ turbulence->divDevRhoReff(U)
+ turbulence->divDevRhoReff()
==
rho*g
+ dieselSpray.momentumSource()

2
applications/solvers/combustion/engineFoam/UEqn.H
View file

@ -2,7 +2,7 @@
(
fvm::ddt(rho, U)
+ fvm::div(phi, U)
+ turbulence->divDevRhoReff(U)
+ turbulence->divDevRhoReff()
);
if (piso.momentumPredictor())

2
applications/solvers/combustion/fireFoam/UEqn.H
View file

@ -2,7 +2,7 @@ fvVectorMatrix UEqn
(
fvm::ddt(rho, U)
+ fvm::div(phi, U)
+ turbulence->divDevRhoReff(U)
+ turbulence->divDevRhoReff()
);
UEqn.relax();

2
applications/solvers/combustion/reactingFoam/UEqn.H
View file

@ -2,7 +2,7 @@
(
fvm::ddt(rho, U)
+ fvm::div(phi, U)
+ turbulence->divDevRhoReff(U)
+ turbulence->divDevRhoReff()
==
rho*g
);

2
applications/solvers/combustion/rhoReactingFoam/UEqn.H
View file

@ -2,7 +2,7 @@
(
fvm::ddt(rho, U)
+ fvm::div(phi, U)
+ turbulence->divDevRhoReff(U)
+ turbulence->divDevRhoReff()
==
rho*g
);

2
applications/solvers/compressible/rhoPimpleFoam/UEqn.H
View file

@ -4,7 +4,7 @@ tmp<fvVectorMatrix> UEqn
(
fvm::ddt(rho, U)
+ fvm::div(phi, U)
+ turbulence->divDevRhoReff(U)
+ turbulence->divDevRhoReff()
);
UEqn().relax

2
applications/solvers/compressible/rhoPisoFoam/UEqn.H
View file

@ -2,7 +2,7 @@
(
fvm::ddt(rho, U)
+ fvm::div(phi, U)
+ turbulence->divDevRhoReff(U)
+ turbulence->divDevRhoReff()
);
if (piso.momentumPredictor())

2
applications/solvers/compressible/rhoPorousMRFPimpleFoam/UEqn.H
View file

@ -4,7 +4,7 @@ tmp<fvVectorMatrix> UEqn
(
pZones.ddt(rho, U)
+ fvm::div(phi, U)
+ turbulence->divDevRhoReff(U)
+ turbulence->divDevRhoReff()
);
UEqn().relax

2
applications/solvers/compressible/rhoPorousSimpleFoam/UEqn.H
View file

@ -3,7 +3,7 @@
tmp<fvVectorMatrix> UEqn
(
fvm::div(phi, U)
+ turbulence->divDevRhoReff(U)
+ turbulence->divDevRhoReff()
);
UEqn().relax();

2
applications/solvers/compressible/rhoSimpleFoam/UEqn.H
View file

@ -3,7 +3,7 @@
tmp<fvVectorMatrix> UEqn
(
fvm::div(phi, U)
+ turbulence->divDevRhoReff(U)
+ turbulence->divDevRhoReff()
);
UEqn().relax();

2
applications/solvers/compressible/sonicDyMFoam/UEqn.H
View file

@ -2,7 +2,7 @@
(
fvm::ddt(rho, U)
+ fvm::div(phi, U)
+ turbulence->divDevRhoReff(U)
+ turbulence->divDevRhoReff()
);
UEqn.relax

2
applications/solvers/compressible/sonicFoam/UEqn.H
View file

@ -2,7 +2,7 @@
(
fvm::ddt(rho, U)
+ fvm::div(phi, U)
+ turbulence->divDevRhoReff(U)
+ turbulence->divDevRhoReff()
);
UEqn.relax

2
applications/solvers/compressible/steadyCompressibleFoam/UEqn.H
View file

@ -5,7 +5,7 @@
(
fvm::ddt(rho, U)
+ fvm::div(phi, U)
+ turbulence->divDevRhoReff(U)
+ turbulence->divDevRhoReff()
);
UEqn.relax();

2
applications/solvers/compressible/steadyCompressibleMRFFoam/UEqn.H
View file

@ -5,7 +5,7 @@
(
fvm::ddt(rho, U)
+ fvm::div(phi, U)
+ turbulence->divDevRhoReff(U)
+ turbulence->divDevRhoReff()
);
// MRF: add Coriolis force

2
applications/solvers/compressible/steadyCompressibleSRFFoam/UEqn.H
View file

@ -5,7 +5,7 @@
(
fvm::ddt(rho, Urel)
+ fvm::div(phi, Urel)
+ turbulence->divDevRhoReff(Urel)
+ turbulence->divDevRhoReff()
+ rho*SRF->Su()
);

2
applications/solvers/compressible/steadyUniversalFoam/UEqn.H
View file

@ -5,7 +5,7 @@
(
fvm::ddt(rho, U)
+ fvm::div(phi, U)
+ turbulence->divDevRhoReff(U)
+ turbulence->divDevRhoReff()
);
UEqn.relax();

2
applications/solvers/compressible/steadyUniversalMRFFoam/UEqn.H
View file

@ -5,7 +5,7 @@
(
fvm::ddt(rho, U)
+ fvm::div(phi, U)
+ turbulence->divDevRhoReff(U)
+ turbulence->divDevRhoReff()
);
// MRF: add Coriolis force

2
applications/solvers/coupled/MRFPorousFoam/UEqn.H
View file

@ -9,7 +9,7 @@
fvVectorMatrix UEqn
(
fvm::div(phi, U)
+ turbulence->divDevReff(U)
+ turbulence->divDevReff()
);
// Add MRF sources

2
applications/solvers/coupled/conjugateHeatFoam/UEqn.H
View file

@ -4,7 +4,7 @@
(
fvm::ddt(U)
+ fvm::div(phi, U)
+ turbulence->divDevReff(U)
+ turbulence->divDevReff()
);
UEqn.relax();

2
applications/solvers/coupled/conjugateHeatSimpleFoam/UEqn.H
View file

@ -3,7 +3,7 @@
tmp<fvVectorMatrix> UEqn
(
fvm::div(phi, U)
+ turbulence->divDevReff(U)
+ turbulence->divDevReff()
+ fvm::SuSp(-fvc::div(phi), U)
);

2
applications/solvers/coupled/pUCoupledFoam/UEqn.H
View file

@ -9,7 +9,7 @@
fvVectorMatrix UEqn
(
fvm::div(phi, U)
+ turbulence->divDevReff(U)
+ turbulence->divDevReff()
);
rAU = 1.0/UEqn.A();

2
applications/solvers/engine/sonicTurbDyMEngineFoam/UEqn.H
View file

@ -3,7 +3,7 @@
(
fvm::ddt(rho, U)
+ fvm::div(phi, U)
+ turbulence->divDevRhoReff(U)
+ turbulence->divDevRhoReff()
);
UEqn.relax

2
applications/solvers/engine/turbDyMEngineFoam/UEqn.H
View file

@ -2,7 +2,7 @@
(
fvm::ddt(U)
+ fvm::div(phi, U)
+ turbulence->divDevReff(U)
+ turbulence->divDevReff()
);
if (piso.momentumPredictor())

2
applications/solvers/equationReaderDemo/UEqn.H
View file

@ -3,7 +3,7 @@
tmp<fvVectorMatrix> UEqn
(
fvm::div(phi, U)
+ turbulence->divDevReff(U)
+ turbulence->divDevReff()
);
UEqn().relax();

2
applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/UEqn.H
View file

@ -4,7 +4,7 @@
(
fvm::ddt(U)
+ fvm::div(phi, U)
+ turbulence->divDevReff(U)
+ turbulence->divDevReff()
);
UEqn.relax();

2
applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/UEqn.H
View file

@ -3,7 +3,7 @@
tmp<fvVectorMatrix> UEqn
(
fvm::div(phi, U)
+ turbulence->divDevReff(U)
+ turbulence->divDevReff()
);
UEqn().relax();

2
applications/solvers/heatTransfer/buoyantPisoFoam/UEqn.H
View file

@ -4,7 +4,7 @@
(
fvm::ddt(rho, U)
+ fvm::div(phi, U)
+ turbulence->divDevRhoReff(U)
+ turbulence->divDevRhoReff()
);
UEqn.relax();

2
applications/solvers/heatTransfer/buoyantSimpleFoam/UEqn.H
View file

@ -3,7 +3,7 @@
tmp<fvVectorMatrix> UEqn
(
fvm::div(phi, U)
+ turbulence->divDevRhoReff(U)
+ turbulence->divDevRhoReff()
);
UEqn().relax();

2
applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/UEqn.H
View file

@ -3,7 +3,7 @@
(
fvm::ddt(rho, U)
+ fvm::div(phi, U)
+ turb.divDevRhoReff(U)
+ turb.divDevRhoReff()
);
UEqn().relax();

2
applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/fluid/UEqn.H
View file

@ -3,7 +3,7 @@
(
fvm::div(phi, U)
- fvm::Sp(fvc::div(phi), U)
+ turb.divDevRhoReff(U)
+ turb.divDevRhoReff()
);
UEqn().relax();

2
applications/solvers/immersedBoundary/porousSimpleIbFoam/UEqn.H
View file

@ -2,7 +2,7 @@
tmp<fvVectorMatrix> UEqn
(
fvm::div(phi, U)
+ turbulence->divDevReff(U)
+ turbulence->divDevReff()
);
UEqn().relax();

2
applications/solvers/immersedBoundary/simpleIbFoam/UEqn.H
View file

@ -2,7 +2,7 @@
tmp<fvVectorMatrix> UEqn
(
fvm::div(phi, U)
+ turbulence->divDevReff(U)
+ turbulence->divDevReff()
);
UEqn().relax();

2
applications/solvers/incompressible/MRFSimpleFoam/MRFSimpleFoam.C
View file

@ -66,7 +66,7 @@ int main(int argc, char *argv[])
tmp<fvVectorMatrix> UEqn
(
fvm::div(phi, U)
+ turbulence->divDevReff(U)
+ turbulence->divDevReff()
);
mrfZones.addCoriolis(UEqn());

2
applications/solvers/incompressible/boundaryFoam/boundaryFoam.C
View file

@ -60,7 +60,7 @@ int main(int argc, char *argv[])
{
Info<< "Time = " << runTime.timeName() << nl << endl;
fvVectorMatrix divR = turbulence->divDevReff(U);
fvVectorMatrix divR = turbulence->divDevReff();
divR.source() = flowMask & divR.source();
fvVectorMatrix UEqn

2
applications/solvers/incompressible/channelFoam/channelFoam.C
View file

@ -70,7 +70,7 @@ int main(int argc, char *argv[])
fvVectorMatrix HUEqn
(
fvm::div(phi, U)
+ sgsModel->divDevBeff(U)
+ sgsModel->divDevBeff()
==
flowDirection*gradP
);

2
applications/solvers/incompressible/pimpleDyMFoam/UEqn.H
View file

@ -2,7 +2,7 @@
fvVectorMatrix HUEqn
(
fvm::div(phi, U)
+ turbulence->divDevReff(U)
+ turbulence->divDevReff()
);
// Time derivative matrix

2
applications/solvers/incompressible/pimpleFoam/UEqn.H
View file

@ -2,7 +2,7 @@
fvVectorMatrix HUEqn
(
fvm::div(phi, U)
+ turbulence->divDevReff(U)
+ turbulence->divDevReff()
);
// Time derivative matrix

2
applications/solvers/incompressible/pisoFoam/pisoFoam.C
View file

@ -67,7 +67,7 @@ int main(int argc, char *argv[])
(
fvm::ddt(U)
+ fvm::div(phi, U)
+ turbulence->divDevReff(U)
+ turbulence->divDevReff()
);
UEqn.relax();

2
applications/solvers/incompressible/porousSimpleFoam/UEqn.H
View file

@ -3,7 +3,7 @@
tmp<fvVectorMatrix> UEqn
(
fvm::div(phi, U)
+ turbulence->divDevReff(U)
+ turbulence->divDevReff()
);
UEqn().relax();

2
applications/solvers/incompressible/simpleFoam/UEqn.H
View file

@ -3,7 +3,7 @@
tmp<fvVectorMatrix> HUEqn
(
fvm::div(phi, U)
+ turbulence->divDevReff(U)
+ turbulence->divDevReff()
);
// Get under-relaxation factor

5
applications/solvers/incompressible/simpleSRFFoam/UEqn.H
View file

@ -3,12 +3,13 @@
tmp<fvVectorMatrix> HUrelEqn
(
fvm::div(phi, Urel)
+ turbulence->divDevReff(Urel)
+ turbulence->divDevReff()
+ SRF->Su()
);
// Get under-relaxation factor
const scalar UUrf = mesh.solutionDict().equationRelaxationFactor(Urel.name());
const scalar UUrf =
mesh.solutionDict().equationRelaxationFactor(Urel.name());
// Momentum solution
solve(relax(HUrelEqn(), UUrf) == -fvc::grad(p));

2
applications/solvers/incompressible/simpleSRFFoam/simpleSRFFoam.C
View file

@ -69,7 +69,7 @@ int main(int argc, char *argv[])
tmp<fvVectorMatrix> UrelEqn
(
fvm::div(phi, Urel)
+ turbulence->divDevReff(Urel)
+ turbulence->divDevReff()
+ SRF->Su()
);

2
applications/solvers/lagrangian/coalChemistryFoam/UEqn.H
View file

@ -2,7 +2,7 @@
(
fvm::ddt(rho, U)
+ fvm::div(phi, U)
+ turbulence->divDevRhoReff(U)
+ turbulence->divDevRhoReff()
==
rho.dimensionedInternalField()*g
+ coalParcels.SU()

2
applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/UEqn.H
View file

@ -3,7 +3,7 @@
// fvm::ddt(rho, U)
pZones.ddt(rho, U)
+ fvm::div(phi, U)
+ turbulence->divDevRhoReff(U)
+ turbulence->divDevRhoReff()
==
rho.dimensionedInternalField()*g
+ parcels.SU()

2
applications/solvers/lagrangian/reactingParcelFoam/UEqn.H
View file

@ -2,7 +2,7 @@
(
fvm::ddt(rho, U)
+ fvm::div(phi, U)
+ turbulence->divDevRhoReff(U)
+ turbulence->divDevRhoReff()
==
rho.dimensionedInternalField()*g
+ parcels.SU()

5
src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.C
View file

@ -124,11 +124,12 @@ tmp<volSymmTensorField> GenEddyVisc::devRhoBeff() const
}
tmp<fvVectorMatrix> GenEddyVisc::divDevRhoBeff(volVectorField& U) const
tmp<fvVectorMatrix> GenEddyVisc::divDevRhoBeff() const
{
return
(
- fvm::laplacian(muEff(), U) - fvc::div(muEff()*dev2(T(fvc::grad(U))))
- fvm::laplacian(muEff(), U_)
- fvc::div(muEff()*dev2(T(fvc::grad(U_))))
);
}

2
src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.H
View file

@ -143,7 +143,7 @@ public:
//- Returns div(rho*dev(B)).
// This is the additional term due to the filtering of the NSE.
virtual tmp<fvVectorMatrix> divDevRhoBeff(volVectorField& U) const;
virtual tmp<fvVectorMatrix> divDevRhoBeff() const;
//- Correct Eddy-Viscosity and related properties
virtual void correct(const tmp<volTensorField>& gradU);

10
src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.C
View file

@ -136,14 +136,14 @@ tmp<volSymmTensorField> GenSGSStress::devRhoBeff() const
}
tmp<fvVectorMatrix> GenSGSStress::divDevRhoBeff(volVectorField& U) const
tmp<fvVectorMatrix> GenSGSStress::divDevRhoBeff() const
{
return
(
fvc::div(rho()*B_ + 0.05*muSgs_*fvc::grad(U))
+ fvc::laplacian(0.95*muSgs_, U, "laplacian(muEff,U)")
- fvm::laplacian(muEff(), U)
- fvc::div(mu()*dev2(T(fvc::grad(U))))
fvc::div(rho()*B_ + 0.05*muSgs_*fvc::grad(U_))
+ fvc::laplacian(0.95*muSgs_, U_, "laplacian(muEff,U)")
- fvm::laplacian(muEff(), U_)
- fvc::div(mu()*dev2(T(fvc::grad(U_))))
);
}

2
src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.H
View file

@ -147,7 +147,7 @@ public:
//- Returns divergence of B : i.e. the additional term in the
// filtered NSE
virtual tmp<fvVectorMatrix> divDevRhoBeff(volVectorField& U) const;
virtual tmp<fvVectorMatrix> divDevRhoBeff() const;
//- Correct Eddy-Viscosity and related properties
virtual void correct(const tmp<volTensorField>& gradU);

6
src/turbulenceModels/compressible/LES/LESModel/LESModel.H
View file

@ -222,7 +222,7 @@ public:
//- Returns div(rho*dev(B)).
// This is the additional term due to the filtering of the NSE.
virtual tmp<fvVectorMatrix> divDevRhoBeff(volVectorField& U) const = 0;
virtual tmp<fvVectorMatrix> divDevRhoBeff() const = 0;
// RAS compatibility functions for the turbulenceModel base class
@ -252,9 +252,9 @@ public:
}
//- Return the source term for the momentum equation
virtual tmp<fvVectorMatrix> divDevRhoReff(volVectorField& U) const
virtual tmp<fvVectorMatrix> divDevRhoReff() const
{
return divDevRhoBeff(U);
return divDevRhoBeff();
}

5
src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.C
View file

@ -279,11 +279,12 @@ tmp<volScalarField> SpalartAllmaras::epsilon() const
}
tmp<fvVectorMatrix> SpalartAllmaras::divDevRhoBeff(volVectorField& U) const
tmp<fvVectorMatrix> SpalartAllmaras::divDevRhoBeff() const
{
return
(
- fvm::laplacian(muEff(), U) - fvc::div(muEff()*dev2(T(fvc::grad(U))))
- fvm::laplacian(muEff(), U_)
- fvc::div(muEff()*dev2(T(fvc::grad(U_))))
);
}

2
src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.H
View file

@ -166,7 +166,7 @@ public:
//- Returns div(rho*dev(B)).
// This is the additional term due to the filtering of the NSE.
virtual tmp<fvVectorMatrix> divDevRhoBeff(volVectorField& U) const;
virtual tmp<fvVectorMatrix> divDevRhoBeff() const;
//- Correct nuTilda and related properties
virtual void correct(const tmp<volTensorField>& gradU);

16
src/turbulenceModels/compressible/RAS/LRR/LRR.C
View file

@ -260,16 +260,16 @@ tmp<volSymmTensorField> LRR::devRhoReff() const
}
tmp<fvVectorMatrix> LRR::divDevRhoReff(volVectorField& U) const
tmp<fvVectorMatrix> LRR::divDevRhoReff() const
{
if (couplingFactor_.value() > 0.0)
{
return
(
fvc::div(rho_*R_ + couplingFactor_*mut_*fvc::grad(U))
+ fvc::laplacian((1.0 - couplingFactor_)*mut_, U)
- fvm::laplacian(muEff(), U)
- fvc::div(mu()*dev2(T(fvc::grad(U))))
fvc::div(rho_*R_ + couplingFactor_*mut_*fvc::grad(U_))
+ fvc::laplacian((1.0 - couplingFactor_)*mut_, U_)
- fvm::laplacian(muEff(), U_)
- fvc::div(mu()*dev2(T(fvc::grad(U_))))
);
}
else
@ -277,9 +277,9 @@ tmp<fvVectorMatrix> LRR::divDevRhoReff(volVectorField& U) const
return
(
fvc::div(rho_*R_)
+ fvc::laplacian(mut_, U)
- fvm::laplacian(muEff(), U)
- fvc::div(mu()*dev2(T(fvc::grad(U))))
+ fvc::laplacian(mut_, U_)
- fvm::laplacian(muEff(), U_)
- fvc::div(mu()*dev2(T(fvc::grad(U_))))
);
}
}

2
src/turbulenceModels/compressible/RAS/LRR/LRR.H
View file

@ -183,7 +183,7 @@ public:
virtual tmp<volSymmTensorField> devRhoReff() const;
//- Return the source term for the momentum equation
virtual tmp<fvVectorMatrix> divDevRhoReff(volVectorField& U) const;
virtual tmp<fvVectorMatrix> divDevRhoReff() const;
//- Solve the turbulence equations and correct the turbulence viscosity
virtual void correct();

16
src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
View file

@ -289,16 +289,16 @@ tmp<volSymmTensorField> LaunderGibsonRSTM::devRhoReff() const
}
tmp<fvVectorMatrix> LaunderGibsonRSTM::divDevRhoReff(volVectorField& U) const
tmp<fvVectorMatrix> LaunderGibsonRSTM::divDevRhoReff() const
{
if (couplingFactor_.value() > 0.0)
{
return
(
fvc::div(rho_*R_ + couplingFactor_*mut_*fvc::grad(U))
+ fvc::laplacian((1.0 - couplingFactor_)*mut_, U)
- fvm::laplacian(muEff(), U)
- fvc::div(mu()*dev2(T(fvc::grad(U))))
fvc::div(rho_*R_ + couplingFactor_*mut_*fvc::grad(U_))
+ fvc::laplacian((1.0 - couplingFactor_)*mut_, U_)
- fvm::laplacian(muEff(), U_)
- fvc::div(mu()*dev2(T(fvc::grad(U_))))
);
}
else
@ -306,9 +306,9 @@ tmp<fvVectorMatrix> LaunderGibsonRSTM::divDevRhoReff(volVectorField& U) const
return
(
fvc::div(rho_*R_)
+ fvc::laplacian(mut_, U)
- fvm::laplacian(muEff(), U)
- fvc::div(mu()*dev2(T(fvc::grad(U))))
+ fvc::laplacian(mut_, U_)
- fvm::laplacian(muEff(), U_)
- fvc::div(mu()*dev2(T(fvc::grad(U_))))
);
}
}

2
src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H
View file

@ -192,7 +192,7 @@ public:
virtual tmp<volSymmTensorField> devRhoReff() const;
//- Return the source term for the momentum equation
virtual tmp<fvVectorMatrix> divDevRhoReff(volVectorField& U) const;
virtual tmp<fvVectorMatrix> divDevRhoReff() const;
//- Solve the turbulence equations and correct the turbulence viscosity
virtual void correct();

5
src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
View file

@ -240,11 +240,12 @@ tmp<volSymmTensorField> LaunderSharmaKE::devRhoReff() const
}
tmp<fvVectorMatrix> LaunderSharmaKE::divDevRhoReff(volVectorField& U) const
tmp<fvVectorMatrix> LaunderSharmaKE::divDevRhoReff() const
{
return
(
- fvm::laplacian(muEff(), U) - fvc::div(muEff()*dev2(T(fvc::grad(U))))
- fvm::laplacian(muEff(), U_)
- fvc::div(muEff()*dev2(T(fvc::grad(U_))))
);
}

2
src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H
View file

@ -173,7 +173,7 @@ public:
virtual tmp<volSymmTensorField> devRhoReff() const;
//- Return the source term for the momentum equation
virtual tmp<fvVectorMatrix> divDevRhoReff(volVectorField& U) const;
virtual tmp<fvVectorMatrix> divDevRhoReff() const;
//- Solve the turbulence equations and correct the turbulence viscosity
virtual void correct();

2
src/turbulenceModels/compressible/RAS/RASModel/RASModel.H
View file

@ -302,7 +302,7 @@ public:
virtual tmp<volSymmTensorField> devRhoReff() const = 0;
//- Return the source term for the momentum equation
virtual tmp<fvVectorMatrix> divDevRhoReff(volVectorField& U) const = 0;
virtual tmp<fvVectorMatrix> divDevRhoReff() const = 0;
//- Return yPlus for the given patch
virtual tmp<scalarField> yPlus

5
src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.C
View file

@ -239,11 +239,12 @@ tmp<volSymmTensorField> RNGkEpsilon::devRhoReff() const
}
tmp<fvVectorMatrix> RNGkEpsilon::divDevRhoReff(volVectorField& U) const
tmp<fvVectorMatrix> RNGkEpsilon::divDevRhoReff() const
{
return
(
- fvm::laplacian(muEff(), U) - fvc::div(muEff()*dev2(T(fvc::grad(U))))
- fvm::laplacian(muEff(), U_)
- fvc::div(muEff()*dev2(T(fvc::grad(U_))))
);
}

2
src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.H
View file

@ -169,7 +169,7 @@ public:
virtual tmp<volSymmTensorField> devRhoReff() const;
//- Return the effective stress tensor including the laminar stress
virtual tmp<fvVectorMatrix> divDevRhoReff(volVectorField& U) const;
virtual tmp<fvVectorMatrix> divDevRhoReff() const;
//- Solve the turbulence equations and correct the turbulence viscosity
virtual void correct();

6
src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.C
View file

@ -288,14 +288,14 @@ tmp<volSymmTensorField> SpalartAllmaras::devRhoReff() const
}
tmp<fvVectorMatrix> SpalartAllmaras::divDevRhoReff(volVectorField& U) const
tmp<fvVectorMatrix> SpalartAllmaras::divDevRhoReff() const
{
volScalarField muEff_ = muEff();
return
(
- fvm::laplacian(muEff_, U)
- fvc::div(muEff_*dev2(T(fvc::grad(U))))
- fvm::laplacian(muEff_, U_)
- fvc::div(muEff_*dev2(T(fvc::grad(U_))))
);
}

2
src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.H
View file

@ -231,7 +231,7 @@ public:
virtual tmp<volSymmTensorField> devRhoReff() const;
//- Return the source term for the momentum equation
virtual tmp<fvVectorMatrix> divDevRhoReff(volVectorField& U) const;
virtual tmp<fvVectorMatrix> divDevRhoReff() const;
//- Solve the turbulence equations and correct the turbulence viscosity
virtual void correct();

6
src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.C
View file

@ -221,12 +221,12 @@ tmp<volSymmTensorField> kEpsilon::devRhoReff() const
}
tmp<fvVectorMatrix> kEpsilon::divDevRhoReff(volVectorField& U) const
tmp<fvVectorMatrix> kEpsilon::divDevRhoReff() const
{
return
(
- fvm::laplacian(muEff(), U)
- fvc::div(muEff()*dev2(T(fvc::grad(U))))
- fvm::laplacian(muEff(), U_)
- fvc::div(muEff()*dev2(T(fvc::grad(U_))))
);
}

2
src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.H
View file

@ -165,7 +165,7 @@ public:
virtual tmp<volSymmTensorField> devRhoReff() const;
//- Return the source term for the momentum equation
virtual tmp<fvVectorMatrix> divDevRhoReff(volVectorField& U) const;
virtual tmp<fvVectorMatrix> divDevRhoReff() const;
//- Solve the turbulence equations and correct the turbulence viscosity
virtual void correct();

5
src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C
View file

@ -365,11 +365,12 @@ tmp<volSymmTensorField> kOmegaSST::devRhoReff() const
}
tmp<fvVectorMatrix> kOmegaSST::divDevRhoReff(volVectorField& U) const
tmp<fvVectorMatrix> kOmegaSST::divDevRhoReff() const
{
return
(
- fvm::laplacian(muEff(), U) - fvc::div(muEff()*dev2(T(fvc::grad(U))))
- fvm::laplacian(muEff(), U_)
- fvc::div(muEff()*dev2(T(fvc::grad(U_))))
);
}

2
src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.H
View file

@ -290,7 +290,7 @@ public:
virtual tmp<volSymmTensorField> devRhoReff() const;
//- Return the source term for the momentum equation
virtual tmp<fvVectorMatrix> divDevRhoReff(volVectorField& U) const;
virtual tmp<fvVectorMatrix> divDevRhoReff() const;
//- Solve the turbulence equations and correct the turbulence viscosity
virtual void correct();

6
src/turbulenceModels/compressible/RAS/laminar/laminar.C
View file

@ -166,12 +166,12 @@ tmp<volSymmTensorField> laminar::devRhoReff() const
}
tmp<fvVectorMatrix> laminar::divDevRhoReff(volVectorField& U) const
tmp<fvVectorMatrix> laminar::divDevRhoReff() const
{
return
(
- fvm::laplacian(muEff(), U)
- fvc::div(muEff()*dev2(T(fvc::grad(U))))
- fvm::laplacian(muEff(), U_)
- fvc::div(muEff()*dev2(T(fvc::grad(U_))))
);
}

2
src/turbulenceModels/compressible/RAS/laminar/laminar.H
View file

@ -110,7 +110,7 @@ public:
virtual tmp<volSymmTensorField> devRhoReff() const;
//- Return the source term for the momentum equation
virtual tmp<fvVectorMatrix> divDevRhoReff(volVectorField& U) const;
virtual tmp<fvVectorMatrix> divDevRhoReff() const;
//- Correct the laminar viscosity
virtual void correct();

5
src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.C
View file

@ -256,11 +256,12 @@ tmp<volSymmTensorField> realizableKE::devRhoReff() const
}
tmp<fvVectorMatrix> realizableKE::divDevRhoReff(volVectorField& U) const
tmp<fvVectorMatrix> realizableKE::divDevRhoReff() const
{
return
(
- fvm::laplacian(muEff(), U) - fvc::div(muEff()*dev2(T(fvc::grad(U))))
- fvm::laplacian(muEff(), U_)
- fvc::div(muEff()*dev2(T(fvc::grad(U_))))
);
}

2
src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.H
View file

@ -187,7 +187,7 @@ public:
virtual tmp<volSymmTensorField> devRhoReff() const;
//- Return the source term for the momentum equation
virtual tmp<fvVectorMatrix> divDevRhoReff(volVectorField& U) const;
virtual tmp<fvVectorMatrix> divDevRhoReff() const;
//- Solve the turbulence equations and correct the turbulence viscosity
virtual void correct();

6
src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.C
View file

@ -184,12 +184,12 @@ tmp<volSymmTensorField> laminar::devRhoReff() const
}
tmp<fvVectorMatrix> laminar::divDevRhoReff(volVectorField& U) const
tmp<fvVectorMatrix> laminar::divDevRhoReff() const
{
return
(
- fvm::laplacian(muEff(), U)
- fvc::div(muEff()*dev2(T(fvc::grad(U))))
- fvm::laplacian(muEff(), U_)
- fvc::div(muEff()*dev2(T(fvc::grad(U_))))
);
}

2
src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.H
View file

@ -119,7 +119,7 @@ public:
virtual tmp<volSymmTensorField> devRhoReff() const;
//- Return the source term for the momentum equation
virtual tmp<fvVectorMatrix> divDevRhoReff(volVectorField& U) const;
virtual tmp<fvVectorMatrix> divDevRhoReff() const;
//- Correct the laminar viscosity
virtual void correct();

2
src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.H
View file

@ -210,7 +210,7 @@ public:
virtual tmp<volSymmTensorField> devRhoReff() const = 0;
//- Return the source term for the momentum equation
virtual tmp<fvVectorMatrix> divDevRhoReff(volVectorField& U) const = 0;
virtual tmp<fvVectorMatrix> divDevRhoReff() const = 0;
//- Solve the turbulence equations and correct the turbulence viscosity
virtual void correct() = 0;

4
src/turbulenceModels/incompressible/LES/GenEddyVisc/GenEddyVisc.C
View file

@ -86,11 +86,11 @@ tmp<volSymmTensorField> GenEddyVisc::devBeff() const
}
tmp<fvVectorMatrix> GenEddyVisc::divDevBeff(volVectorField& U) const
tmp<fvVectorMatrix> GenEddyVisc::divDevBeff() const
{
return
(
- fvm::laplacian(nuEff(), U) - fvc::div(nuEff()*dev(T(fvc::grad(U))))
- fvm::laplacian(nuEff(), U_) - fvc::div(nuEff()*dev(T(fvc::grad(U_))))
);
}

2
src/turbulenceModels/incompressible/LES/GenEddyVisc/GenEddyVisc.H
View file

@ -116,7 +116,7 @@ public:
//- Return the deviatoric part of the effective sub-grid
// turbulence stress tensor including the laminar stress
virtual tmp<fvVectorMatrix> divDevBeff(volVectorField& U) const;
virtual tmp<fvVectorMatrix> divDevBeff() const;
//- Correct Eddy-Viscosity and related properties
virtual void correct(const tmp<volTensorField>& gradU);

15
src/turbulenceModels/incompressible/LES/GenSGSStress/GenSGSStress.C
View file

@ -128,21 +128,18 @@ tmp<volSymmTensorField> GenSGSStress::devBeff() const
}
tmp<fvVectorMatrix> GenSGSStress::divDevBeff
(
volVectorField& U
) const
tmp<fvVectorMatrix> GenSGSStress::divDevBeff() const
{
if (couplingFactor_.value() > 0.0)
{
return
(
fvc::div(B_ + couplingFactor_*nuSgs_*fvc::grad(U))
fvc::div(B_ + couplingFactor_*nuSgs_*fvc::grad(U_))
+ fvc::laplacian
(
(1.0 - couplingFactor_)*nuSgs_, U, "laplacian(nuEff,U)"
(1.0 - couplingFactor_)*nuSgs_, U_, "laplacian(nuEff,U)"
)
- fvm::laplacian(nuEff(), U)
- fvm::laplacian(nuEff(), U_)
);
}
else
@ -150,8 +147,8 @@ tmp<fvVectorMatrix> GenSGSStress::divDevBeff
return
(
fvc::div(B_)
+ fvc::laplacian(nuSgs_, U, "laplacian(nuEff,U)")
- fvm::laplacian(nuEff(), U)
+ fvc::laplacian(nuSgs_, U_, "laplacian(nuEff,U)")
- fvm::laplacian(nuEff(), U_)
);
}
}

2
src/turbulenceModels/incompressible/LES/GenSGSStress/GenSGSStress.H
View file

@ -127,7 +127,7 @@ public:
//- Returns div(B).
// This is the additional term due to the filtering of the NSE.
virtual tmp<fvVectorMatrix> divDevBeff(volVectorField& U) const;
virtual tmp<fvVectorMatrix> divDevBeff() const;
//- Read LESProperties dictionary
virtual bool read();

6
src/turbulenceModels/incompressible/LES/LESModel/LESModel.H
View file

@ -211,7 +211,7 @@ public:
//- Returns div(dev(Beff)).
// This is the additional term due to the filtering of the NSE.
virtual tmp<fvVectorMatrix> divDevBeff(volVectorField& U) const = 0;
virtual tmp<fvVectorMatrix> divDevBeff() const = 0;
// RAS compatibility functions for the turbulenceModel base class
@ -235,9 +235,9 @@ public:
}
//- Return the source term for the momentum equation
virtual tmp<fvVectorMatrix> divDevReff(volVectorField& U) const
virtual tmp<fvVectorMatrix> divDevReff() const
{
return divDevBeff(U);
return divDevBeff();
}

9
src/turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.C
View file

@ -79,20 +79,17 @@ tmp<volSymmTensorField> Smagorinsky2::B() const
}
tmp<fvVectorMatrix> Smagorinsky2::divDevBeff
(
volVectorField& U
) const
tmp<fvVectorMatrix> Smagorinsky2::divDevBeff() const
{
volSymmTensorField aniNuEff
(
"aniNuEff",
I*nuEff() + cD2_*delta()*symm(fvc::grad(U))
I*nuEff() + cD2_*delta()*symm(fvc::grad(U_))
);
return
(
- fvm::laplacian(aniNuEff, U) - fvc::div(nuEff()*dev(T(fvc::grad(U))))
- fvm::laplacian(aniNuEff, U_) - fvc::div(nuEff()*dev(T(fvc::grad(U_))))
);
}

2
src/turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.H
View file

@ -109,7 +109,7 @@ public:
//- Returns div(B).
// This is the additional term due to the filtering of the NSE.
virtual tmp<fvVectorMatrix> divDevBeff(volVectorField& U) const;
virtual tmp<fvVectorMatrix> divDevBeff() const;
//- Read LESProperties dictionary
virtual bool read();

4
src/turbulenceModels/incompressible/LES/SpalartAllmaras/SpalartAllmaras.C
View file

@ -344,11 +344,11 @@ tmp<volSymmTensorField> SpalartAllmaras::devBeff() const
}
tmp<fvVectorMatrix> SpalartAllmaras::divDevBeff(volVectorField& U) const
tmp<fvVectorMatrix> SpalartAllmaras::divDevBeff() const
{
return
(
- fvm::laplacian(nuEff(), U) - fvc::div(nuEff()*dev(T(fvc::grad(U))))
- fvm::laplacian(nuEff(), U_) - fvc::div(nuEff()*dev(T(fvc::grad(U_))))
);
}

2
src/turbulenceModels/incompressible/LES/SpalartAllmaras/SpalartAllmaras.H
View file

@ -175,7 +175,7 @@ public:
//- Return the deviatoric part of the divergence of Beff
// i.e. the additional term in the filtered NSE.
virtual tmp<fvVectorMatrix> divDevBeff(volVectorField& U) const;
virtual tmp<fvVectorMatrix> divDevBeff() const;
//- Correct nuTilda and related properties
virtual void correct(const tmp<volTensorField>& gradU);

6
src/turbulenceModels/incompressible/LES/dynMixedSmagorinsky/dynMixedSmagorinsky.C
View file

@ -99,12 +99,12 @@ tmp<volSymmTensorField> dynMixedSmagorinsky::devBeff() const
}
tmp<fvVectorMatrix> dynMixedSmagorinsky::divDevBeff(volVectorField& U) const
tmp<fvVectorMatrix> dynMixedSmagorinsky::divDevBeff() const
{
return
(
scaleSimilarity::divDevBeff(U)
+ dynSmagorinsky::divDevBeff(U)
scaleSimilarity::divDevBeff()
+ dynSmagorinsky::divDevBeff()
);
}

2
src/turbulenceModels/incompressible/LES/dynMixedSmagorinsky/dynMixedSmagorinsky.H
View file

@ -126,7 +126,7 @@ public:
//- Returns div(B).
// This is the additional term due to the filtering of the NSE.
tmp<fvVectorMatrix> divDevBeff(volVectorField& U) const;
tmp<fvVectorMatrix> divDevBeff() const;
//- Correct Eddy-Viscosity and related properties
void correct(const tmp<volTensorField>& gradU);

4
src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C
View file

@ -429,11 +429,11 @@ tmp<volSymmTensorField> kOmegaSSTSAS::devBeff() const
}
tmp<fvVectorMatrix> kOmegaSSTSAS::divDevBeff(volVectorField& U) const
tmp<fvVectorMatrix> kOmegaSSTSAS::divDevBeff() const
{
return
(
- fvm::laplacian(nuEff(), U) - fvc::div(nuEff()*dev(T(fvc::grad(U))))
- fvm::laplacian(nuEff(), U_) - fvc::div(nuEff()*dev(T(fvc::grad(U_))))
);
}

2
src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.H
View file

@ -243,7 +243,7 @@ public:
//- Return the deviatoric part of the divergence of Beff
// i.e. the additional term in the filtered NSE.
virtual tmp<fvVectorMatrix> divDevBeff(volVectorField& U) const;
virtual tmp<fvVectorMatrix> divDevBeff() const;
//- Solve the turbulence equations (k-w) and correct the turbulence
// viscosity

4
src/turbulenceModels/incompressible/LES/laminar/laminar.C
View file

@ -140,11 +140,11 @@ tmp<volSymmTensorField> laminar::devBeff() const
}
tmp<fvVectorMatrix> laminar::divDevBeff(volVectorField& U) const
tmp<fvVectorMatrix> laminar::divDevBeff() const
{
return
(
- fvm::laplacian(nu(), U) - fvc::div(nu()*dev(T(fvc::grad(U))))
- fvm::laplacian(nu(), U_) - fvc::div(nu()*dev(T(fvc::grad(U_))))
);
}

2
src/turbulenceModels/incompressible/LES/laminar/laminar.H
View file

@ -108,7 +108,7 @@ public:
//- Return the deviatoric part of the divergence of Beff
// i.e. the additional term in the filtered NSE.
virtual tmp<fvVectorMatrix> divDevBeff(volVectorField& U) const;
virtual tmp<fvVectorMatrix> divDevBeff() const;
//- Read LESProperties dictionary
bool read();

9
src/turbulenceModels/incompressible/LES/mixedSmagorinsky/mixedSmagorinsky.C
View file

@ -99,15 +99,12 @@ tmp<volSymmTensorField> mixedSmagorinsky::devBeff() const
}
tmp<fvVectorMatrix> mixedSmagorinsky::divDevBeff
(
volVectorField& U
) const
tmp<fvVectorMatrix> mixedSmagorinsky::divDevBeff() const
{
return
(
scaleSimilarity::divDevBeff(U)
+ Smagorinsky::divDevBeff(U)
scaleSimilarity::divDevBeff()
+ Smagorinsky::divDevBeff()
);
}

2
src/turbulenceModels/incompressible/LES/mixedSmagorinsky/mixedSmagorinsky.H
View file

@ -131,7 +131,7 @@ public:
//- Implementation of div(B). This is necessary to override
// (and include) the div(B) terms from both the parent classes.
virtual tmp<fvVectorMatrix> divDevBeff(volVectorField& U) const;
virtual tmp<fvVectorMatrix> divDevBeff() const;
//- Correct Eddy-Viscosity and related properties
virtual void correct(const tmp<volTensorField>& gradU);

4
src/turbulenceModels/incompressible/LES/scaleSimilarity/scaleSimilarity.C
View file

@ -83,9 +83,9 @@ tmp<volSymmTensorField> scaleSimilarity::devBeff() const
}
tmp<fvVectorMatrix> scaleSimilarity::divDevBeff(volVectorField& U) const
tmp<fvVectorMatrix> scaleSimilarity::divDevBeff() const
{
return fvm::Su(fvc::div(devBeff()), U);
return fvm::Su(fvc::div(devBeff()), U_);
}

2
src/turbulenceModels/incompressible/LES/scaleSimilarity/scaleSimilarity.H
View file

@ -110,7 +110,7 @@ public:
//- Return the deviatoric part of the divergence of Beff
// i.e. the additional term in the filtered NSE.
virtual tmp<fvVectorMatrix> divDevBeff(volVectorField& U) const;
virtual tmp<fvVectorMatrix> divDevBeff() const;
//- Correct Eddy-Viscosity and related properties
virtual void correct(const tmp<volTensorField>&);

12
src/turbulenceModels/incompressible/RAS/LRR/LRR.C
View file

@ -226,20 +226,20 @@ tmp<volSymmTensorField> LRR::devReff() const
}
tmp<fvVectorMatrix> LRR::divDevReff(volVectorField& U) const
tmp<fvVectorMatrix> LRR::divDevReff() const
{
if (couplingFactor_.value() > 0.0)
{
return
(
fvc::div(R_ + couplingFactor_*nut_*fvc::grad(U), "div(R)")
fvc::div(R_ + couplingFactor_*nut_*fvc::grad(U_), "div(R)")
+ fvc::laplacian
(
(1.0 - couplingFactor_)*nut_,
U,
U_,
"laplacian(nuEff,U)"
)
- fvm::laplacian(nuEff(), U)
- fvm::laplacian(nuEff(), U_)
);
}
else
@ -247,8 +247,8 @@ tmp<fvVectorMatrix> LRR::divDevReff(volVectorField& U) const
return
(
fvc::div(R_)
+ fvc::laplacian(nut_, U, "laplacian(nuEff,U)")
- fvm::laplacian(nuEff(), U)
+ fvc::laplacian(nut_, U_, "laplacian(nuEff,U)")
- fvm::laplacian(nuEff(), U_)
);
}
}

2
src/turbulenceModels/incompressible/RAS/LRR/LRR.H
View file

@ -167,7 +167,7 @@ public:
virtual tmp<volSymmTensorField> devReff() const;
//- Return the source term for the momentum equation
virtual tmp<fvVectorMatrix> divDevReff(volVectorField& U) const;
virtual tmp<fvVectorMatrix> divDevReff() const;
//- Solve the turbulence equations and correct the turbulence viscosity
virtual void correct();

6
src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C
View file

@ -190,12 +190,12 @@ tmp<volSymmTensorField> LamBremhorstKE::devReff() const
}
tmp<fvVectorMatrix> LamBremhorstKE::divDevReff(volVectorField& U) const
tmp<fvVectorMatrix> LamBremhorstKE::divDevReff() const
{
return
(
- fvm::laplacian(nuEff(), U)
- fvc::div(nuEff()*dev(T(fvc::grad(U))))
- fvm::laplacian(nuEff(), U_)
- fvc::div(nuEff()*dev(T(fvc::grad(U_))))
);
}

Some files were not shown because too many files have changed in this diff Show more