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

changes to turbulence models

Browse source
This commit is contained in:
Henrik Rusche 2010-11-16 15:23:36 +01:00
parent 0c1213be0a
commit 7f259a3ded
55 changed files with 609 additions and 217 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
applications/solvers/coupled/conjugateHeatFoam/conjugateHeatFoam.C
View file

@ -46,6 +46,7 @@ int main(int argc, char *argv[])
# include "createTime.H"
# include "createFluidMesh.H"
# include "attachPatches.H"
# include "createSolidMesh.H"
# include "createFields.H"
# include "createSolidFields.H"

3
applications/solvers/coupled/conjugateHeatFoam/createFields.H
View file

@ -64,13 +64,10 @@
# include "createPhi.H"
label pRefCell = 0;
scalar pRefValue = 0.0;
setRefCell(p, mesh.solutionDict().subDict("PISO"), pRefCell, pRefValue);
# include "attachPatches.H"
Info<< "Reading field DT\n" << endl;
volScalarField DT
(

5
applications/solvers/coupled/conjugateHeatFoam/createFluidMesh.H
View file

@ -1,6 +1,8 @@
Info<< "Create mesh for time = "
<< runTime.timeName() << nl << endl;
Info << "f1" << endl;
fvMesh mesh
(
IOobject
@ -11,3 +13,6 @@
IOobject::MUST_READ
)
);
Info << "f2" << endl;

5
applications/solvers/coupled/conjugateHeatFoam/createSolidMesh.H
View file

@ -1,3 +1,5 @@
Info << "s1" << endl;
fvMesh solidMesh
(
IOobject
@ -8,3 +10,6 @@
IOobject::MUST_READ
)
);
Info << "s2" << endl;

4
etc/cshrc
View file

@ -126,8 +126,8 @@ if ( ! $?WM_ARCH_OPTION ) setenv WM_ARCH_OPTION 64
if ( ! $?WM_PRECISION_OPTION ) setenv WM_PRECISION_OPTION DP
# WM_COMPILE_OPTION = Opt | Debug | Prof
#if ( ! $?WM_COMPILE_OPTION ) setenv WM_COMPILE_OPTION Opt
setenv WM_COMPILE_OPTION Opt
if ( ! $?WM_COMPILE_OPTION ) setenv WM_COMPILE_OPTION Opt
#setenv WM_COMPILE_OPTION Opt
#setenv WM_COMPILE_OPTION Debug
# WM_MPLIB = | OPENMPI | MPICH | MPICH-GM | HPMPI | GAMMA | MPI | QSMPI

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

@ -76,7 +76,7 @@ GenEddyVisc::GenEddyVisc
(
"k",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),
@ -89,7 +89,7 @@ GenEddyVisc::GenEddyVisc
(
"muSgs",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),
@ -102,7 +102,7 @@ GenEddyVisc::GenEddyVisc
(
"alphaSgs",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),

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

@ -80,7 +80,7 @@ GenSGSStress::GenSGSStress
(
"B",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),
@ -93,7 +93,7 @@ GenSGSStress::GenSGSStress
(
"muSgs",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),
@ -106,7 +106,7 @@ GenSGSStress::GenSGSStress
(
"alphaSgs",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),
@ -127,7 +127,7 @@ tmp<volSymmTensorField> GenSGSStress::devRhoBeff() const
(
"devRhoReff",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),

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

@ -220,7 +220,7 @@ SpalartAllmaras::SpalartAllmaras
(
"nuTilda",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),
@ -234,7 +234,7 @@ SpalartAllmaras::SpalartAllmaras
(
"muSgs",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),
@ -247,7 +247,7 @@ SpalartAllmaras::SpalartAllmaras
(
"alphaSgs",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),

2
src/turbulenceModels/compressible/LES/vanDriestDelta/vanDriestDelta.C
View file

@ -61,7 +61,7 @@ void vanDriestDelta::calcDelta()
(
"ystar",
mesh_.time().constant(),
mesh_
U.db()
),
mesh_,
dimensionedScalar("ystar", dimLength, GREAT)

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

@ -161,7 +161,7 @@ LRR::LRR
(
"R",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),
@ -173,7 +173,7 @@ LRR::LRR
(
"k",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
@ -185,7 +185,7 @@ LRR::LRR
(
"epsilon",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
@ -197,7 +197,7 @@ LRR::LRR
(
"mut",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
@ -209,7 +209,7 @@ LRR::LRR
(
"alphat",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
@ -250,7 +250,7 @@ tmp<volSymmTensorField> LRR::devRhoReff() const
(
"devRhoReff",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),

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

@ -190,7 +190,7 @@ LaunderGibsonRSTM::LaunderGibsonRSTM
(
"R",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),
@ -202,7 +202,7 @@ LaunderGibsonRSTM::LaunderGibsonRSTM
(
"k",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
@ -214,7 +214,7 @@ LaunderGibsonRSTM::LaunderGibsonRSTM
(
"epsilon",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
@ -226,7 +226,7 @@ LaunderGibsonRSTM::LaunderGibsonRSTM
(
"mut",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
@ -238,7 +238,7 @@ LaunderGibsonRSTM::LaunderGibsonRSTM
(
"alphat",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
@ -279,7 +279,7 @@ tmp<volSymmTensorField> LaunderGibsonRSTM::devRhoReff() const
(
"devRhoReff",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),

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

@ -141,7 +141,7 @@ LaunderSharmaKE::LaunderSharmaKE
(
"k",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),
@ -154,7 +154,7 @@ LaunderSharmaKE::LaunderSharmaKE
(
"epsilon",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),
@ -167,7 +167,7 @@ LaunderSharmaKE::LaunderSharmaKE
(
"mut",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
@ -180,7 +180,7 @@ LaunderSharmaKE::LaunderSharmaKE
(
"alphat",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
@ -209,7 +209,7 @@ tmp<volSymmTensorField> LaunderSharmaKE::R() const
(
"R",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
@ -230,7 +230,7 @@ tmp<volSymmTensorField> LaunderSharmaKE::devRhoReff() const
(
"devRhoReff",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),

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

@ -143,7 +143,7 @@ RNGkEpsilon::RNGkEpsilon
(
"k",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
@ -155,7 +155,7 @@ RNGkEpsilon::RNGkEpsilon
(
"epsilon",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
@ -167,7 +167,7 @@ RNGkEpsilon::RNGkEpsilon
(
"mut",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
@ -179,7 +179,7 @@ RNGkEpsilon::RNGkEpsilon
(
"alphat",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
@ -208,7 +208,7 @@ tmp<volSymmTensorField> RNGkEpsilon::R() const
(
"R",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
@ -229,7 +229,7 @@ tmp<volSymmTensorField> RNGkEpsilon::devRhoReff() const
(
"devRhoReff",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),

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

@ -205,7 +205,7 @@ SpalartAllmaras::SpalartAllmaras
(
"nuTilda",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),
@ -218,7 +218,7 @@ SpalartAllmaras::SpalartAllmaras
(
"mut",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),
@ -231,7 +231,7 @@ SpalartAllmaras::SpalartAllmaras
(
"alphat",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
@ -259,7 +259,7 @@ tmp<volSymmTensorField> SpalartAllmaras::R() const
(
"R",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
@ -279,7 +279,7 @@ tmp<volSymmTensorField> SpalartAllmaras::devRhoReff() const
(
"devRhoReff",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),

161
src/turbulenceModels/compressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C
View file

@ -46,14 +46,15 @@ namespace compressible
tmp<volScalarField> autoCreateAlphat
(
const word& fieldName,
const fvMesh& mesh
const fvMesh& mesh,
const objectRegistry& obj
)
{
IOobject alphatHeader
(
fieldName,
mesh.time().timeName(),
mesh,
obj,
IOobject::MUST_READ,
IOobject::NO_WRITE,
false
@ -94,7 +95,7 @@ tmp<volScalarField> autoCreateAlphat
(
fieldName,
mesh.time().timeName(),
mesh,
obj,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
@ -113,17 +114,28 @@ tmp<volScalarField> autoCreateAlphat
}
tmp<volScalarField> autoCreateMut
tmp<volScalarField> autoCreateAlphat
(
const word& fieldName,
const fvMesh& mesh
)
{
return autoCreateAlphat(fieldName, mesh, mesh);
}
tmp<volScalarField> autoCreateMut
(
const word& fieldName,
const fvMesh& mesh,
const objectRegistry& obj
)
{
IOobject mutHeader
(
fieldName,
mesh.time().timeName(),
mesh,
obj,
IOobject::MUST_READ,
IOobject::NO_WRITE,
false
@ -164,7 +176,7 @@ tmp<volScalarField> autoCreateMut
(
fieldName,
mesh.time().timeName(),
mesh,
obj,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
@ -183,17 +195,28 @@ tmp<volScalarField> autoCreateMut
}
tmp<volScalarField> autoCreateLowReMut
tmp<volScalarField> autoCreateMut
(
const word& fieldName,
const fvMesh& mesh
)
{
return autoCreateMut(fieldName, mesh, mesh);
}
tmp<volScalarField> autoCreateLowReMut
(
const word& fieldName,
const fvMesh& mesh,
const objectRegistry& obj
)
{
IOobject mutHeader
(
fieldName,
mesh.time().timeName(),
mesh,
obj,
IOobject::MUST_READ,
IOobject::NO_WRITE,
false
@ -234,7 +257,7 @@ tmp<volScalarField> autoCreateLowReMut
(
fieldName,
mesh.time().timeName(),
mesh,
obj,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
@ -253,6 +276,37 @@ tmp<volScalarField> autoCreateLowReMut
}
tmp<volScalarField> autoCreateLowReMut
(
const word& fieldName,
const fvMesh& mesh
)
{
return autoCreateLowReMut(fieldName, mesh, mesh);
}
tmp<volScalarField> autoCreateEpsilon
(
const word& fieldName,
const fvMesh& mesh,
const objectRegistry& obj
)
{
return
autoCreateWallFunctionField
<
scalar,
RASModels::epsilonWallFunctionFvPatchScalarField
>
(
fieldName,
mesh,
obj
);
}
tmp<volScalarField> autoCreateEpsilon
(
const word& fieldName,
@ -267,11 +321,33 @@ tmp<volScalarField> autoCreateEpsilon
>
(
fieldName,
mesh,
mesh
);
}
tmp<volScalarField> autoCreateOmega
(
const word& fieldName,
const fvMesh& mesh,
const objectRegistry& obj
)
{
return
autoCreateWallFunctionField
<
scalar,
RASModels::omegaWallFunctionFvPatchScalarField
>
(
fieldName,
mesh,
obj
);
}
tmp<volScalarField> autoCreateOmega
(
const word& fieldName,
@ -286,11 +362,33 @@ tmp<volScalarField> autoCreateOmega
>
(
fieldName,
mesh,
mesh
);
}
tmp<volScalarField> autoCreateK
(
const word& fieldName,
const fvMesh& mesh,
const objectRegistry& obj
)
{
return
autoCreateWallFunctionField
<
scalar,
RASModels::kqRWallFunctionFvPatchField<scalar>
>
(
fieldName,
mesh,
obj
);
}
tmp<volScalarField> autoCreateK
(
const word& fieldName,
@ -305,11 +403,33 @@ tmp<volScalarField> autoCreateK
>
(
fieldName,
mesh,
mesh
);
}
tmp<volScalarField> autoCreateQ
(
const word& fieldName,
const fvMesh& mesh,
const objectRegistry& obj
)
{
return
autoCreateWallFunctionField
<
scalar,
RASModels::kqRWallFunctionFvPatchField<scalar>
>
(
fieldName,
mesh,
obj
);
}
tmp<volScalarField> autoCreateQ
(
const word& fieldName,
@ -324,11 +444,33 @@ tmp<volScalarField> autoCreateQ
>
(
fieldName,
mesh,
mesh
);
}
tmp<volSymmTensorField> autoCreateR
(
const word& fieldName,
const fvMesh& mesh,
const objectRegistry& obj
)
{
return
autoCreateWallFunctionField
<
symmTensor,
RASModels::kqRWallFunctionFvPatchField<symmTensor>
>
(
fieldName,
mesh,
obj
);
}
tmp<volSymmTensorField> autoCreateR
(
const word& fieldName,
@ -343,6 +485,7 @@ tmp<volSymmTensorField> autoCreateR
>
(
fieldName,
mesh,
mesh
);
}

59
src/turbulenceModels/compressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.H
View file

@ -47,6 +47,13 @@ namespace Foam
namespace compressible
{
//- mut
tmp<volScalarField> autoCreateMut
(
const word& fieldName,
const fvMesh& mesh,
const objectRegistry& obj
);
tmp<volScalarField> autoCreateMut
(
const word& fieldName,
@ -54,6 +61,13 @@ namespace compressible
);
//- mut for Low-Reynolds number models
tmp<volScalarField> autoCreateLowReMut
(
const word& fieldName,
const fvMesh& mesh,
const objectRegistry& obj
);
tmp<volScalarField> autoCreateLowReMut
(
const word& fieldName,
@ -61,6 +75,13 @@ namespace compressible
);
//- alphat
tmp<volScalarField> autoCreateAlphat
(
const word& fieldName,
const fvMesh& mesh,
const objectRegistry& obj
);
tmp<volScalarField> autoCreateAlphat
(
const word& fieldName,
@ -68,6 +89,13 @@ namespace compressible
);
//- epsilon
tmp<volScalarField> autoCreateEpsilon
(
const word& fieldName,
const fvMesh& mesh,
const objectRegistry& obj
);
tmp<volScalarField> autoCreateEpsilon
(
const word& fieldName,
@ -75,6 +103,13 @@ namespace compressible
);
//- omega
tmp<volScalarField> autoCreateOmega
(
const word& fieldName,
const fvMesh& mesh,
const objectRegistry& obj
);
tmp<volScalarField> autoCreateOmega
(
const word& fieldName,
@ -82,6 +117,13 @@ namespace compressible
);
//- k
tmp<volScalarField> autoCreateK
(
const word& fieldName,
const fvMesh& mesh,
const objectRegistry& obj
);
tmp<volScalarField> autoCreateK
(
const word& fieldName,
@ -89,6 +131,13 @@ namespace compressible
);
//- Q
tmp<volScalarField> autoCreateQ
(
const word& fieldName,
const fvMesh& mesh,
const objectRegistry& obj
);
tmp<volScalarField> autoCreateQ
(
const word& fieldName,
@ -96,6 +145,13 @@ namespace compressible
);
//- R
tmp<volSymmTensorField> autoCreateR
(
const word& fieldName,
const fvMesh& mesh,
const objectRegistry& obj
);
tmp<volSymmTensorField> autoCreateR
(
const word& fieldName,
@ -108,7 +164,8 @@ namespace compressible
autoCreateWallFunctionField
(
const word& fieldName,
const fvMesh& mesh
const fvMesh& mesh,
const objectRegistry& obj
);

11
src/turbulenceModels/compressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctionsTemplates.C
View file

@ -42,14 +42,15 @@ tmp<GeometricField<Type, fvPatchField, volMesh> >
autoCreateWallFunctionField
(
const word& fieldName,
const fvMesh& mesh
const fvMesh& mesh,
const objectRegistry& obj
)
{
IOobject mutHeader
(
"mut",
mesh.time().timeName(),
mesh,
obj,
IOobject::MUST_READ
);
@ -65,7 +66,7 @@ autoCreateWallFunctionField
(
fieldName,
mesh.time().timeName(),
mesh,
obj,
IOobject::MUST_READ,
IOobject::NO_WRITE,
false
@ -84,7 +85,7 @@ autoCreateWallFunctionField
(
fieldName,
mesh.time().timeName(),
mesh,
obj,
IOobject::MUST_READ,
IOobject::NO_WRITE,
false
@ -140,7 +141,7 @@ autoCreateWallFunctionField
(
fieldName,
mesh.time().timeName(),
mesh,
obj,
IOobject::NO_READ,
IOobject::NO_WRITE,
false

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

@ -125,7 +125,7 @@ kEpsilon::kEpsilon
(
"k",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
@ -137,7 +137,7 @@ kEpsilon::kEpsilon
(
"epsilon",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
@ -149,7 +149,7 @@ kEpsilon::kEpsilon
(
"mut",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
@ -161,7 +161,7 @@ kEpsilon::kEpsilon
(
"alphat",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
@ -190,7 +190,7 @@ tmp<volSymmTensorField> kEpsilon::R() const
(
"R",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
@ -211,7 +211,7 @@ tmp<volSymmTensorField> kEpsilon::devRhoReff() const
(
"devRhoReff",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),

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

@ -215,7 +215,7 @@ kOmegaSST::kOmegaSST
(
"k",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
@ -227,7 +227,7 @@ kOmegaSST::kOmegaSST
(
"omega",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
@ -239,7 +239,7 @@ kOmegaSST::kOmegaSST
(
"mut",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
@ -251,7 +251,7 @@ kOmegaSST::kOmegaSST
(
"alphat",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
@ -290,7 +290,7 @@ tmp<volSymmTensorField> kOmegaSST::R() const
(
"R",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
@ -311,7 +311,7 @@ tmp<volSymmTensorField> kOmegaSST::devRhoReff() const
(
"devRhoReff",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),

12
src/turbulenceModels/compressible/RAS/kOmegaSST_LowRe/kOmegaSST_LowRe.C
View file

@ -234,7 +234,7 @@ kOmegaSST_LowRe::kOmegaSST_LowRe
(
"k",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),
@ -247,7 +247,7 @@ kOmegaSST_LowRe::kOmegaSST_LowRe
(
"omega",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),
@ -260,7 +260,7 @@ kOmegaSST_LowRe::kOmegaSST_LowRe
(
"mut",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
@ -272,7 +272,7 @@ kOmegaSST_LowRe::kOmegaSST_LowRe
(
"alphat",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
@ -311,7 +311,7 @@ tmp<volSymmTensorField> kOmegaSST_LowRe::R() const
(
"R",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
@ -332,7 +332,7 @@ tmp<volSymmTensorField> kOmegaSST_LowRe::devRhoReff() const
(
"devRhoReff",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),

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

@ -67,7 +67,7 @@ tmp<volScalarField> laminar::mut() const
(
"mut",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
@ -88,7 +88,7 @@ tmp<volScalarField> laminar::k() const
(
"k",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
@ -109,7 +109,7 @@ tmp<volScalarField> laminar::epsilon() const
(
"epsilon",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
@ -133,7 +133,7 @@ tmp<volSymmTensorField> laminar::R() const
(
"R",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
@ -157,7 +157,7 @@ tmp<volSymmTensorField> laminar::devRhoReff() const
(
"devRhoReff",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),

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

@ -157,7 +157,7 @@ realizableKE::realizableKE
(
"k",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
@ -169,7 +169,7 @@ realizableKE::realizableKE
(
"epsilon",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
@ -181,7 +181,7 @@ realizableKE::realizableKE
(
"mut",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
@ -193,7 +193,7 @@ realizableKE::realizableKE
(
"alphat",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
@ -225,7 +225,7 @@ tmp<volSymmTensorField> realizableKE::R() const
(
"R",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
@ -246,7 +246,7 @@ tmp<volSymmTensorField> realizableKE::devRhoReff() const
(
"devRhoReff",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),

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

@ -85,7 +85,7 @@ tmp<volScalarField> laminar::mut() const
(
"mut",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
@ -106,7 +106,7 @@ tmp<volScalarField> laminar::k() const
(
"k",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
@ -127,7 +127,7 @@ tmp<volScalarField> laminar::epsilon() const
(
"epsilon",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
@ -151,7 +151,7 @@ tmp<volSymmTensorField> laminar::R() const
(
"R",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
@ -175,7 +175,7 @@ tmp<volSymmTensorField> laminar::devRhoReff() const
(
"devRhoReff",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),

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

@ -62,7 +62,7 @@ GenEddyVisc::GenEddyVisc
(
"nuSgs",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),

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

@ -72,7 +72,7 @@ GenSGSStress::GenSGSStress
(
"B",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),
@ -85,7 +85,7 @@ GenSGSStress::GenSGSStress
(
"nuSgs",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
@ -119,7 +119,7 @@ tmp<volSymmTensorField> GenSGSStress::devBeff() const
(
"devRhoReff",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),

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

@ -255,7 +255,7 @@ SpalartAllmaras::SpalartAllmaras
(
"nuTilda",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),
@ -268,7 +268,7 @@ SpalartAllmaras::SpalartAllmaras
(
"nuSgs",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),

2
src/turbulenceModels/incompressible/LES/dynOneEqEddy/dynOneEqEddy.C
View file

@ -117,7 +117,7 @@ dynOneEqEddy::dynOneEqEddy
(
"k",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),

2
src/turbulenceModels/incompressible/LES/dynSmagorinsky/dynSmagorinsky.C
View file

@ -108,7 +108,7 @@ dynSmagorinsky::dynSmagorinsky
(
"k",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),

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

@ -291,7 +291,7 @@ kOmegaSSTSAS::kOmegaSSTSAS
(
"k",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),
@ -304,7 +304,7 @@ kOmegaSSTSAS::kOmegaSSTSAS
(
"omega",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),
@ -317,7 +317,7 @@ kOmegaSSTSAS::kOmegaSSTSAS
(
"nuSgs",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),

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

@ -67,7 +67,7 @@ tmp<volScalarField> laminar::k() const
(
"k",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
@ -92,7 +92,7 @@ tmp<volScalarField> laminar::nuSgs() const
(
"nuSgs",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
@ -121,7 +121,7 @@ tmp<volSymmTensorField> laminar::B() const
(
"B",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),

2
src/turbulenceModels/incompressible/LES/locDynOneEqEddy/locDynOneEqEddy.C
View file

@ -108,7 +108,7 @@ locDynOneEqEddy::locDynOneEqEddy
(
"k",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),

2
src/turbulenceModels/incompressible/LES/oneEqEddy/oneEqEddy.C
View file

@ -69,7 +69,7 @@ oneEqEddy::oneEqEddy
(
"k",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),

2
src/turbulenceModels/incompressible/LES/vanDriestDelta/vanDriestDelta.C
View file

@ -60,7 +60,7 @@ void vanDriestDelta::calcDelta()
(
"ystar",
mesh_.time().constant(),
mesh_
U.db()
),
mesh_,
dimensionedScalar("ystar", dimLength, GREAT)

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

@ -142,7 +142,7 @@ LRR::LRR
(
"R",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
@ -154,7 +154,7 @@ LRR::LRR
(
"k",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
@ -166,7 +166,7 @@ LRR::LRR
(
"epsilon",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
@ -178,7 +178,7 @@ LRR::LRR
(
"nut",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
@ -216,7 +216,7 @@ tmp<volSymmTensorField> LRR::devReff() const
(
"devRhoReff",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),

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

@ -97,7 +97,7 @@ LamBremhorstKE::LamBremhorstKE
(
"k",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),
@ -110,7 +110,7 @@ LamBremhorstKE::LamBremhorstKE
(
"epsilon",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),
@ -133,7 +133,7 @@ LamBremhorstKE::LamBremhorstKE
(
"nut",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
@ -159,7 +159,7 @@ tmp<volSymmTensorField> LamBremhorstKE::R() const
(
"R",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
@ -180,7 +180,7 @@ tmp<volSymmTensorField> LamBremhorstKE::devReff() const
(
"devRhoReff",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),

10
src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
View file

@ -180,7 +180,7 @@ LaunderGibsonRSTM::LaunderGibsonRSTM
(
"R",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
@ -192,7 +192,7 @@ LaunderGibsonRSTM::LaunderGibsonRSTM
(
"k",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
@ -204,7 +204,7 @@ LaunderGibsonRSTM::LaunderGibsonRSTM
(
"epsilon",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
@ -216,7 +216,7 @@ LaunderGibsonRSTM::LaunderGibsonRSTM
(
"nut",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
@ -254,7 +254,7 @@ tmp<volSymmTensorField> LaunderGibsonRSTM::devReff() const
(
"devRhoReff",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),

10
src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
View file

@ -113,7 +113,7 @@ LaunderSharmaKE::LaunderSharmaKE
(
"k",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),
@ -126,7 +126,7 @@ LaunderSharmaKE::LaunderSharmaKE
(
"epsilon",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),
@ -139,7 +139,7 @@ LaunderSharmaKE::LaunderSharmaKE
(
"nut",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
@ -165,7 +165,7 @@ tmp<volSymmTensorField> LaunderSharmaKE::R() const
(
"R",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
@ -186,7 +186,7 @@ tmp<volSymmTensorField> LaunderSharmaKE::devReff() const
(
"devRhoReff",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),

10
src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C
View file

@ -151,7 +151,7 @@ LienCubicKE::LienCubicKE
(
"k",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
@ -163,7 +163,7 @@ LienCubicKE::LienCubicKE
(
"epsilon",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
@ -191,7 +191,7 @@ LienCubicKE::LienCubicKE
(
"nut",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
@ -245,7 +245,7 @@ tmp<volSymmTensorField> LienCubicKE::R() const
(
"R",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
@ -266,7 +266,7 @@ tmp<volSymmTensorField> LienCubicKE::devReff() const
(
"devRhoReff",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),

10
src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.C
View file

@ -197,7 +197,7 @@ LienCubicKELowRe::LienCubicKELowRe
(
"k",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),
@ -210,7 +210,7 @@ LienCubicKELowRe::LienCubicKELowRe
(
"epsilon",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),
@ -239,7 +239,7 @@ LienCubicKELowRe::LienCubicKELowRe
(
"nut",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
@ -311,7 +311,7 @@ tmp<volSymmTensorField> LienCubicKELowRe::R() const
(
"R",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
@ -332,7 +332,7 @@ tmp<volSymmTensorField> LienCubicKELowRe::devReff() const
(
"devRhoReff",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),

10
src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.C
View file

@ -143,7 +143,7 @@ LienLeschzinerLowRe::LienLeschzinerLowRe
(
"k",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),
@ -156,7 +156,7 @@ LienLeschzinerLowRe::LienLeschzinerLowRe
(
"epsilon",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),
@ -173,7 +173,7 @@ LienLeschzinerLowRe::LienLeschzinerLowRe
(
"epsilon",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
@ -203,7 +203,7 @@ tmp<volSymmTensorField> LienLeschzinerLowRe::R() const
(
"R",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
@ -224,7 +224,7 @@ tmp<volSymmTensorField> LienLeschzinerLowRe::devReff() const
(
"devRhoReff",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),

8
src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C
View file

@ -169,7 +169,7 @@ NonlinearKEShih::NonlinearKEShih
(
"k",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),
@ -182,7 +182,7 @@ NonlinearKEShih::NonlinearKEShih
(
"epsilon",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),
@ -235,7 +235,7 @@ tmp<volSymmTensorField> NonlinearKEShih::R() const
(
"R",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
@ -256,7 +256,7 @@ tmp<volSymmTensorField> NonlinearKEShih::devReff() const
(
"devRhoReff",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),

10
src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.C
View file

@ -124,7 +124,7 @@ RNGkEpsilon::RNGkEpsilon
(
"k",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
@ -136,7 +136,7 @@ RNGkEpsilon::RNGkEpsilon
(
"epsilon",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
@ -148,7 +148,7 @@ RNGkEpsilon::RNGkEpsilon
(
"nut",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
@ -175,7 +175,7 @@ tmp<volSymmTensorField> RNGkEpsilon::R() const
(
"R",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
@ -196,7 +196,7 @@ tmp<volSymmTensorField> RNGkEpsilon::devReff() const
(
"devRhoReff",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),

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

@ -196,7 +196,7 @@ SpalartAllmaras::SpalartAllmaras
(
"nuTilda",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),
@ -209,7 +209,7 @@ SpalartAllmaras::SpalartAllmaras
(
"nut",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),
@ -243,7 +243,7 @@ tmp<volScalarField> SpalartAllmaras::k() const
(
"k",
runTime_.timeName(),
mesh_
U_.db()
),
mesh_,
dimensionedScalar("0", dimensionSet(0, 2, -2, 0, 0), 0)
@ -262,7 +262,7 @@ tmp<volScalarField> SpalartAllmaras::epsilon() const
(
"epsilon",
runTime_.timeName(),
mesh_
U_.db()
),
mesh_,
dimensionedScalar("0", dimensionSet(0, 2, -3, 0, 0), 0)
@ -281,7 +281,7 @@ tmp<volSymmTensorField> SpalartAllmaras::R() const
(
"R",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
@ -301,7 +301,7 @@ tmp<volSymmTensorField> SpalartAllmaras::devReff() const
(
"devRhoReff",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),

140
src/turbulenceModels/incompressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C
View file

@ -45,14 +45,15 @@ namespace incompressible
tmp<volScalarField> autoCreateNut
(
const word& fieldName,
const fvMesh& mesh
const fvMesh& mesh,
const objectRegistry& obj
)
{
IOobject nutHeader
(
fieldName,
mesh.time().timeName(),
mesh,
obj,
IOobject::MUST_READ,
IOobject::NO_WRITE,
false
@ -112,17 +113,28 @@ tmp<volScalarField> autoCreateNut
}
tmp<volScalarField> autoCreateLowReNut
tmp<volScalarField> autoCreateNut
(
const word& fieldName,
const fvMesh& mesh
)
{
return autoCreateNut(fieldName, mesh, mesh);
}
tmp<volScalarField> autoCreateLowReNut
(
const word& fieldName,
const fvMesh& mesh,
const objectRegistry& obj
)
{
IOobject nutHeader
(
fieldName,
mesh.time().timeName(),
mesh,
obj,
IOobject::MUST_READ,
IOobject::NO_WRITE,
false
@ -182,6 +194,37 @@ tmp<volScalarField> autoCreateLowReNut
}
tmp<volScalarField> autoCreateLowReNut
(
const word& fieldName,
const fvMesh& mesh
)
{
return autoCreateLowReNut(fieldName, mesh, mesh);
}
tmp<volScalarField> autoCreateEpsilon
(
const word& fieldName,
const fvMesh& mesh,
const objectRegistry& obj
)
{
return
autoCreateWallFunctionField
<
scalar,
RASModels::epsilonWallFunctionFvPatchScalarField
>
(
fieldName,
mesh,
obj
);
}
tmp<volScalarField> autoCreateEpsilon
(
const word& fieldName,
@ -196,11 +239,33 @@ tmp<volScalarField> autoCreateEpsilon
>
(
fieldName,
mesh,
mesh
);
}
tmp<volScalarField> autoCreateOmega
(
const word& fieldName,
const fvMesh& mesh,
const objectRegistry& obj
)
{
return
autoCreateWallFunctionField
<
scalar,
RASModels::omegaWallFunctionFvPatchScalarField
>
(
fieldName,
mesh,
obj
);
}
tmp<volScalarField> autoCreateOmega
(
const word& fieldName,
@ -215,11 +280,33 @@ tmp<volScalarField> autoCreateOmega
>
(
fieldName,
mesh,
mesh
);
}
tmp<volScalarField> autoCreateK
(
const word& fieldName,
const fvMesh& mesh,
const objectRegistry& obj
)
{
return
autoCreateWallFunctionField
<
scalar,
RASModels::kqRWallFunctionFvPatchField<scalar>
>
(
fieldName,
mesh,
obj
);
}
tmp<volScalarField> autoCreateK
(
const word& fieldName,
@ -234,11 +321,33 @@ tmp<volScalarField> autoCreateK
>
(
fieldName,
mesh,
mesh
);
}
tmp<volScalarField> autoCreateQ
(
const word& fieldName,
const fvMesh& mesh,
const objectRegistry& obj
)
{
return
autoCreateWallFunctionField
<
scalar,
RASModels::kqRWallFunctionFvPatchField<scalar>
>
(
fieldName,
mesh,
obj
);
}
tmp<volScalarField> autoCreateQ
(
const word& fieldName,
@ -253,11 +362,33 @@ tmp<volScalarField> autoCreateQ
>
(
fieldName,
mesh,
mesh
);
}
tmp<volSymmTensorField> autoCreateR
(
const word& fieldName,
const fvMesh& mesh,
const objectRegistry& obj
)
{
return
autoCreateWallFunctionField
<
symmTensor,
RASModels::kqRWallFunctionFvPatchField<symmTensor>
>
(
fieldName,
mesh,
obj
);
}
tmp<volSymmTensorField> autoCreateR
(
const word& fieldName,
@ -272,6 +403,7 @@ tmp<volSymmTensorField> autoCreateR
>
(
fieldName,
mesh,
mesh
);
}

52
src/turbulenceModels/incompressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.H
View file

@ -47,6 +47,13 @@ namespace Foam
namespace incompressible
{
//- nut
tmp<volScalarField> autoCreateNut
(
const word& fieldName,
const fvMesh& mesh,
const objectRegistry& obj
);
tmp<volScalarField> autoCreateNut
(
const word& fieldName,
@ -54,6 +61,13 @@ namespace incompressible
);
//- nut for Low-Reynolds number models
tmp<volScalarField> autoCreateLowReNut
(
const word& fieldName,
const fvMesh& mesh,
const objectRegistry& obj
);
tmp<volScalarField> autoCreateLowReNut
(
const word& fieldName,
@ -61,6 +75,13 @@ namespace incompressible
);
//- epsilon
tmp<volScalarField> autoCreateEpsilon
(
const word& fieldName,
const fvMesh& mesh,
const objectRegistry& obj
);
tmp<volScalarField> autoCreateEpsilon
(
const word& fieldName,
@ -68,6 +89,13 @@ namespace incompressible
);
//- omega
tmp<volScalarField> autoCreateOmega
(
const word& fieldName,
const fvMesh& mesh,
const objectRegistry& obj
);
tmp<volScalarField> autoCreateOmega
(
const word& fieldName,
@ -75,6 +103,13 @@ namespace incompressible
);
//- k
tmp<volScalarField> autoCreateK
(
const word& fieldName,
const fvMesh& mesh,
const objectRegistry& obj
);
tmp<volScalarField> autoCreateK
(
const word& fieldName,
@ -82,6 +117,13 @@ namespace incompressible
);
//- Q
tmp<volScalarField> autoCreateQ
(
const word& fieldName,
const fvMesh& mesh,
const objectRegistry& obj
);
tmp<volScalarField> autoCreateQ
(
const word& fieldName,
@ -89,6 +131,13 @@ namespace incompressible
);
//- R
tmp<volSymmTensorField> autoCreateR
(
const word& fieldName,
const fvMesh& mesh,
const objectRegistry& obj
);
tmp<volSymmTensorField> autoCreateR
(
const word& fieldName,
@ -101,7 +150,8 @@ namespace incompressible
autoCreateWallFunctionField
(
const word& fieldName,
const fvMesh& mesh
const fvMesh& mesh,
const objectRegistry& obj
);

11
src/turbulenceModels/incompressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctionsTemplates.C
View file

@ -42,14 +42,15 @@ tmp<GeometricField<Type, fvPatchField, volMesh> >
autoCreateWallFunctionField
(
const word& fieldName,
const fvMesh& mesh
const fvMesh& mesh,
const objectRegistry& obj
)
{
IOobject nutHeader
(
"nut",
mesh.time().timeName(),
mesh,
obj,
IOobject::MUST_READ
);
@ -65,7 +66,7 @@ autoCreateWallFunctionField
(
fieldName,
mesh.time().timeName(),
mesh,
obj,
IOobject::MUST_READ,
IOobject::NO_WRITE,
false
@ -84,7 +85,7 @@ autoCreateWallFunctionField
(
fieldName,
mesh.time().timeName(),
mesh,
obj,
IOobject::MUST_READ,
IOobject::NO_WRITE,
false
@ -140,7 +141,7 @@ autoCreateWallFunctionField
(
fieldName,
mesh.time().timeName(),
mesh,
obj,
IOobject::NO_READ,
IOobject::NO_WRITE,
false

10
src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.C
View file

@ -97,7 +97,7 @@ kEpsilon::kEpsilon
(
"k",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
@ -109,7 +109,7 @@ kEpsilon::kEpsilon
(
"epsilon",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
@ -121,7 +121,7 @@ kEpsilon::kEpsilon
(
"nut",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
@ -147,7 +147,7 @@ tmp<volSymmTensorField> kEpsilon::R() const
(
"R",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
@ -168,7 +168,7 @@ tmp<volSymmTensorField> kEpsilon::devReff() const
(
"devRhoReff",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),

10
src/turbulenceModels/incompressible/RAS/kOmega/kOmega.C
View file

@ -106,7 +106,7 @@ kOmega::kOmega
(
"k",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
@ -118,7 +118,7 @@ kOmega::kOmega
(
"omega",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
@ -130,7 +130,7 @@ kOmega::kOmega
(
"nut",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
@ -156,7 +156,7 @@ tmp<volSymmTensorField> kOmega::R() const
(
"R",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
@ -177,7 +177,7 @@ tmp<volSymmTensorField> kOmega::devReff() const
(
"devRhoReff",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),

16
src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C
View file

@ -205,11 +205,11 @@ kOmegaSST::kOmegaSST
(
"k",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
autoCreateK("k", mesh_)
autoCreateK("k", mesh_, U_.db())
),
omega_
(
@ -217,11 +217,11 @@ kOmegaSST::kOmegaSST
(
"omega",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
autoCreateOmega("omega", mesh_)
autoCreateOmega("omega", mesh_, U_.db())
),
nut_
(
@ -229,11 +229,11 @@ kOmegaSST::kOmegaSST
(
"nut",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
autoCreateNut("nut", mesh_)
autoCreateNut("nut", mesh_, U_.db())
)
{
bound(omega_, omega0_);
@ -257,7 +257,7 @@ tmp<volSymmTensorField> kOmegaSST::R() const
(
"R",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
@ -278,7 +278,7 @@ tmp<volSymmTensorField> kOmegaSST::devReff() const
(
"devRhoReff",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),

10
src/turbulenceModels/incompressible/RAS/kOmegaSST_LowRe/kOmegaSST_LowRe.C
View file

@ -226,7 +226,7 @@ kOmegaSST_LowRe::kOmegaSST_LowRe
(
"k",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),
@ -239,7 +239,7 @@ kOmegaSST_LowRe::kOmegaSST_LowRe
(
"omega",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),
@ -251,7 +251,7 @@ kOmegaSST_LowRe::kOmegaSST_LowRe
(
"nut",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
@ -279,7 +279,7 @@ tmp<volSymmTensorField> kOmegaSST_LowRe::R() const
(
"R",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
@ -300,7 +300,7 @@ tmp<volSymmTensorField> kOmegaSST_LowRe::devReff() const
(
"devRhoReff",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),

10
src/turbulenceModels/incompressible/RAS/laminar/laminar.C
View file

@ -66,7 +66,7 @@ tmp<volScalarField> laminar::nut() const
(
"nut",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
@ -87,7 +87,7 @@ tmp<volScalarField> laminar::k() const
(
"k",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
@ -108,7 +108,7 @@ tmp<volScalarField> laminar::epsilon() const
(
"epsilon",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
@ -132,7 +132,7 @@ tmp<volSymmTensorField> laminar::R() const
(
"R",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
@ -156,7 +156,7 @@ tmp<volSymmTensorField> laminar::devReff() const
(
"devRhoReff",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),

14
src/turbulenceModels/incompressible/RAS/qZeta/qZeta.C
View file

@ -132,7 +132,7 @@ qZeta::qZeta
(
"k",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),
@ -145,7 +145,7 @@ qZeta::qZeta
(
"epsilon",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),
@ -158,7 +158,7 @@ qZeta::qZeta
(
"q",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
@ -172,7 +172,7 @@ qZeta::qZeta
(
"zeta",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
@ -186,7 +186,7 @@ qZeta::qZeta
(
"nut",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
@ -212,7 +212,7 @@ tmp<volSymmTensorField> qZeta::R() const
(
"R",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
@ -233,7 +233,7 @@ tmp<volSymmTensorField> qZeta::devReff() const
(
"devRhoReff",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),

10
src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.C
View file

@ -147,7 +147,7 @@ realizableKE::realizableKE
(
"k",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
@ -159,7 +159,7 @@ realizableKE::realizableKE
(
"epsilon",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
@ -171,7 +171,7 @@ realizableKE::realizableKE
(
"nut",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
@ -200,7 +200,7 @@ tmp<volSymmTensorField> realizableKE::R() const
(
"R",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
@ -221,7 +221,7 @@ tmp<volSymmTensorField> realizableKE::devReff() const
(
"devRhoReff",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),

10
src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.C
View file

@ -83,7 +83,7 @@ tmp<volScalarField> laminar::nut() const
(
"nut",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
@ -110,7 +110,7 @@ tmp<volScalarField> laminar::k() const
(
"k",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
@ -131,7 +131,7 @@ tmp<volScalarField> laminar::epsilon() const
(
"epsilon",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
@ -155,7 +155,7 @@ tmp<volSymmTensorField> laminar::R() const
(
"R",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
@ -179,7 +179,7 @@ tmp<volSymmTensorField> laminar::devReff() const
(
"devRhoReff",
runTime_.timeName(),
mesh_,
U_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),

2
wmake/rules/linux64Gcc/c++
View file

@ -2,7 +2,7 @@
c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast -Wnon-virtual-dtor
CC = g++ -m64
CC = ccache g++ -m64
include $(RULES)/c++$(WM_COMPILE_OPTION)