ENH: Updated turbulence code/utilities affected by updates to turbulence model behaviour

This commit is contained in:
andy
2012-11-27 17:11:56 +00:00
parent 74aec19f79
commit aa5a119be6
6 changed files with 21 additions and 24 deletions

View File

@ -116,7 +116,7 @@ void PDRkEpsilon::correct()
} }
tmp<volTensorField> tgradU = fvc::grad(U_); tmp<volTensorField> tgradU = fvc::grad(U_);
volScalarField G("RASModel.G", mut_*(tgradU() && dev(twoSymm(tgradU())))); volScalarField G(type() + ".G", mut_*(tgradU() && dev(twoSymm(tgradU()))));
tgradU.clear(); tgradU.clear();
// Update espsilon and G at the wall // Update espsilon and G at the wall

View File

@ -55,7 +55,7 @@ void calcIncompressibleYPlus
volScalarField& yPlus volScalarField& yPlus
) )
{ {
typedef incompressible::RASModels::nutWallFunctionFvPatchScalarField typedef incompressible::nutWallFunctionFvPatchScalarField
wallFunctionPatchField; wallFunctionPatchField;
#include "createPhi.H" #include "createPhi.H"
@ -107,7 +107,7 @@ void calcCompressibleYPlus
volScalarField& yPlus volScalarField& yPlus
) )
{ {
typedef compressible::RASModels::mutWallFunctionFvPatchScalarField typedef compressible::mutWallFunctionFvPatchScalarField
wallFunctionPatchField; wallFunctionPatchField;
IOobject rhoHeader IOobject rhoHeader

View File

@ -136,7 +136,7 @@ int main(int argc, char *argv[])
} }
// Create G field - used by RAS wall functions // Create G field - used by RAS wall functions
volScalarField G("RASModel.G", nut*2*sqr(S)); volScalarField G(turbulence().type() + ".G", nut*2*sqr(S));
//--- Read and modify turbulence fields //--- Read and modify turbulence fields

View File

@ -232,43 +232,42 @@ void updateCompressibleCase(const fvMesh& mesh)
( (
mesh, mesh,
"mut", "mut",
compressible::RASModels::mutkWallFunctionFvPatchScalarField::typeName, compressible::mutkWallFunctionFvPatchScalarField::typeName,
"0" "0"
); );
replaceBoundaryType replaceBoundaryType
( (
mesh, mesh,
"epsilon", "epsilon",
compressible::RASModels::epsilonWallFunctionFvPatchScalarField:: compressible::epsilonWallFunctionFvPatchScalarField::typeName,
typeName,
"0" "0"
); );
replaceBoundaryType replaceBoundaryType
( (
mesh, mesh,
"omega", "omega",
compressible::RASModels::omegaWallFunctionFvPatchScalarField::typeName, compressible::omegaWallFunctionFvPatchScalarField::typeName,
"0" "0"
); );
replaceBoundaryType replaceBoundaryType
( (
mesh, mesh,
"k", "k",
compressible::RASModels::kqRWallFunctionFvPatchField<scalar>::typeName, compressible::kqRWallFunctionFvPatchField<scalar>::typeName,
"0" "0"
); );
replaceBoundaryType replaceBoundaryType
( (
mesh, mesh,
"q", "q",
compressible::RASModels::kqRWallFunctionFvPatchField<scalar>::typeName, compressible::kqRWallFunctionFvPatchField<scalar>::typeName,
"0" "0"
); );
replaceBoundaryType replaceBoundaryType
( (
mesh, mesh,
"R", "R",
compressible::RASModels::kqRWallFunctionFvPatchField<symmTensor>:: compressible::kqRWallFunctionFvPatchField<symmTensor>::
typeName, typeName,
"(0 0 0 0 0 0)" "(0 0 0 0 0 0)"
); );
@ -284,14 +283,14 @@ void updateIncompressibleCase(const fvMesh& mesh)
( (
mesh, mesh,
"nut", "nut",
incompressible::RASModels::nutkWallFunctionFvPatchScalarField::typeName, incompressible::nutkWallFunctionFvPatchScalarField::typeName,
"0" "0"
); );
replaceBoundaryType replaceBoundaryType
( (
mesh, mesh,
"epsilon", "epsilon",
incompressible::RASModels::epsilonWallFunctionFvPatchScalarField:: incompressible::epsilonWallFunctionFvPatchScalarField::
typeName, typeName,
"0" "0"
); );
@ -299,7 +298,7 @@ void updateIncompressibleCase(const fvMesh& mesh)
( (
mesh, mesh,
"omega", "omega",
incompressible::RASModels::omegaWallFunctionFvPatchScalarField:: incompressible::omegaWallFunctionFvPatchScalarField::
typeName, typeName,
"0" "0"
); );
@ -307,24 +306,21 @@ void updateIncompressibleCase(const fvMesh& mesh)
( (
mesh, mesh,
"k", "k",
incompressible::RASModels::kqRWallFunctionFvPatchField<scalar>:: incompressible::kqRWallFunctionFvPatchField<scalar>::typeName,
typeName,
"0" "0"
); );
replaceBoundaryType replaceBoundaryType
( (
mesh, mesh,
"q", "q",
incompressible::RASModels::kqRWallFunctionFvPatchField<scalar>:: incompressible::kqRWallFunctionFvPatchField<scalar>::typeName,
typeName,
"0" "0"
); );
replaceBoundaryType replaceBoundaryType
( (
mesh, mesh,
"R", "R",
incompressible::RASModels::kqRWallFunctionFvPatchField<symmTensor>:: incompressible::kqRWallFunctionFvPatchField<symmTensor>::typeName,
typeName,
"(0 0 0 0 0 0)" "(0 0 0 0 0 0)"
); );
} }

View File

@ -56,7 +56,7 @@ void Foam::yPlusRAS::calcIncompressibleYPlus
volScalarField& yPlus volScalarField& yPlus
) )
{ {
typedef incompressible::RASModels::nutWallFunctionFvPatchScalarField typedef incompressible::nutWallFunctionFvPatchScalarField
wallFunctionPatchField; wallFunctionPatchField;
const incompressible::RASModel& model = const incompressible::RASModel& model =
@ -114,7 +114,7 @@ void Foam::yPlusRAS::calcCompressibleYPlus
volScalarField& yPlus volScalarField& yPlus
) )
{ {
typedef compressible::RASModels::mutWallFunctionFvPatchScalarField typedef compressible::mutWallFunctionFvPatchScalarField
wallFunctionPatchField; wallFunctionPatchField;
const compressible::RASModel& model = const compressible::RASModel& model =

View File

@ -28,8 +28,9 @@ License
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
#include "fvPatchFieldMapper.H" #include "fvPatchFieldMapper.H"
#include "volFields.H" #include "volFields.H"
#include "incompressible/RAS/RASModel/RASModel.H" #include "surfaceFields.H"
#include "compressible/RAS/RASModel/RASModel.H" #include "incompressible/turbulenceModel/turbulenceModel.H"
#include "compressible/turbulenceModel/turbulenceModel.H"
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //