From aa5a119be61bc5cfe653e5a7db592d7f54f817fb Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Tue, 27 Nov 2012 17:11:56 +0000
Subject: [PATCH] ENH: Updated turbulence code/utilities affected by updates to
turbulence model behaviour
---
.../turbulence/PDRkEpsilon/PDRkEpsilon.C | 2 +-
.../postProcessing/wall/yPlusRAS/yPlusRAS.C | 4 +--
.../applyBoundaryLayer/applyBoundaryLayer.C | 2 +-
.../applyWallFunctionBoundaryConditions.C | 28 ++++++++-----------
.../utilities/yPlusRAS/yPlusRAS.C | 4 +--
.../fixedShearStressFvPatchVectorField.C | 5 ++--
6 files changed, 21 insertions(+), 24 deletions(-)
diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
index 44c4f6052fb..fb61460facf 100644
--- a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
@@ -116,7 +116,7 @@ void PDRkEpsilon::correct()
}
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();
// Update espsilon and G at the wall
diff --git a/applications/utilities/postProcessing/wall/yPlusRAS/yPlusRAS.C b/applications/utilities/postProcessing/wall/yPlusRAS/yPlusRAS.C
index 2f8b1503418..58f6a7b063a 100644
--- a/applications/utilities/postProcessing/wall/yPlusRAS/yPlusRAS.C
+++ b/applications/utilities/postProcessing/wall/yPlusRAS/yPlusRAS.C
@@ -55,7 +55,7 @@ void calcIncompressibleYPlus
volScalarField& yPlus
)
{
- typedef incompressible::RASModels::nutWallFunctionFvPatchScalarField
+ typedef incompressible::nutWallFunctionFvPatchScalarField
wallFunctionPatchField;
#include "createPhi.H"
@@ -107,7 +107,7 @@ void calcCompressibleYPlus
volScalarField& yPlus
)
{
- typedef compressible::RASModels::mutWallFunctionFvPatchScalarField
+ typedef compressible::mutWallFunctionFvPatchScalarField
wallFunctionPatchField;
IOobject rhoHeader
diff --git a/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C b/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
index 13c5841c3ae..b4a83722e6e 100644
--- a/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
+++ b/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
@@ -136,7 +136,7 @@ int main(int argc, char *argv[])
}
// 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
diff --git a/applications/utilities/preProcessing/applyWallFunctionBoundaryConditions/applyWallFunctionBoundaryConditions.C b/applications/utilities/preProcessing/applyWallFunctionBoundaryConditions/applyWallFunctionBoundaryConditions.C
index 9b89af1c4de..1e15f00c5ab 100644
--- a/applications/utilities/preProcessing/applyWallFunctionBoundaryConditions/applyWallFunctionBoundaryConditions.C
+++ b/applications/utilities/preProcessing/applyWallFunctionBoundaryConditions/applyWallFunctionBoundaryConditions.C
@@ -232,43 +232,42 @@ void updateCompressibleCase(const fvMesh& mesh)
(
mesh,
"mut",
- compressible::RASModels::mutkWallFunctionFvPatchScalarField::typeName,
+ compressible::mutkWallFunctionFvPatchScalarField::typeName,
"0"
);
replaceBoundaryType
(
mesh,
"epsilon",
- compressible::RASModels::epsilonWallFunctionFvPatchScalarField::
- typeName,
+ compressible::epsilonWallFunctionFvPatchScalarField::typeName,
"0"
);
replaceBoundaryType
(
mesh,
"omega",
- compressible::RASModels::omegaWallFunctionFvPatchScalarField::typeName,
+ compressible::omegaWallFunctionFvPatchScalarField::typeName,
"0"
);
replaceBoundaryType
(
mesh,
"k",
- compressible::RASModels::kqRWallFunctionFvPatchField<scalar>::typeName,
+ compressible::kqRWallFunctionFvPatchField<scalar>::typeName,
"0"
);
replaceBoundaryType
(
mesh,
"q",
- compressible::RASModels::kqRWallFunctionFvPatchField<scalar>::typeName,
+ compressible::kqRWallFunctionFvPatchField<scalar>::typeName,
"0"
);
replaceBoundaryType
(
mesh,
"R",
- compressible::RASModels::kqRWallFunctionFvPatchField<symmTensor>::
+ compressible::kqRWallFunctionFvPatchField<symmTensor>::
typeName,
"(0 0 0 0 0 0)"
);
@@ -284,14 +283,14 @@ void updateIncompressibleCase(const fvMesh& mesh)
(
mesh,
"nut",
- incompressible::RASModels::nutkWallFunctionFvPatchScalarField::typeName,
+ incompressible::nutkWallFunctionFvPatchScalarField::typeName,
"0"
);
replaceBoundaryType
(
mesh,
"epsilon",
- incompressible::RASModels::epsilonWallFunctionFvPatchScalarField::
+ incompressible::epsilonWallFunctionFvPatchScalarField::
typeName,
"0"
);
@@ -299,7 +298,7 @@ void updateIncompressibleCase(const fvMesh& mesh)
(
mesh,
"omega",
- incompressible::RASModels::omegaWallFunctionFvPatchScalarField::
+ incompressible::omegaWallFunctionFvPatchScalarField::
typeName,
"0"
);
@@ -307,24 +306,21 @@ void updateIncompressibleCase(const fvMesh& mesh)
(
mesh,
"k",
- incompressible::RASModels::kqRWallFunctionFvPatchField<scalar>::
- typeName,
+ incompressible::kqRWallFunctionFvPatchField<scalar>::typeName,
"0"
);
replaceBoundaryType
(
mesh,
"q",
- incompressible::RASModels::kqRWallFunctionFvPatchField<scalar>::
- typeName,
+ incompressible::kqRWallFunctionFvPatchField<scalar>::typeName,
"0"
);
replaceBoundaryType
(
mesh,
"R",
- incompressible::RASModels::kqRWallFunctionFvPatchField<symmTensor>::
- typeName,
+ incompressible::kqRWallFunctionFvPatchField<symmTensor>::typeName,
"(0 0 0 0 0 0)"
);
}
diff --git a/src/postProcessing/functionObjects/utilities/yPlusRAS/yPlusRAS.C b/src/postProcessing/functionObjects/utilities/yPlusRAS/yPlusRAS.C
index 8d81c05bfe1..de584f6105a 100644
--- a/src/postProcessing/functionObjects/utilities/yPlusRAS/yPlusRAS.C
+++ b/src/postProcessing/functionObjects/utilities/yPlusRAS/yPlusRAS.C
@@ -56,7 +56,7 @@ void Foam::yPlusRAS::calcIncompressibleYPlus
volScalarField& yPlus
)
{
- typedef incompressible::RASModels::nutWallFunctionFvPatchScalarField
+ typedef incompressible::nutWallFunctionFvPatchScalarField
wallFunctionPatchField;
const incompressible::RASModel& model =
@@ -114,7 +114,7 @@ void Foam::yPlusRAS::calcCompressibleYPlus
volScalarField& yPlus
)
{
- typedef compressible::RASModels::mutWallFunctionFvPatchScalarField
+ typedef compressible::mutWallFunctionFvPatchScalarField
wallFunctionPatchField;
const compressible::RASModel& model =
diff --git a/src/turbulenceModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C b/src/turbulenceModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C
index 0f1d19bb2e0..7afc74c400d 100644
--- a/src/turbulenceModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C
+++ b/src/turbulenceModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C
@@ -28,8 +28,9 @@ License
#include "addToRunTimeSelectionTable.H"
#include "fvPatchFieldMapper.H"
#include "volFields.H"
-#include "incompressible/RAS/RASModel/RASModel.H"
-#include "compressible/RAS/RASModel/RASModel.H"
+#include "surfaceFields.H"
+#include "incompressible/turbulenceModel/turbulenceModel.H"
+#include "compressible/turbulenceModel/turbulenceModel.H"
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
--
GitLab