From 912d130bb59e6a1167ebdeeafcc1a9ffd69ee572 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Tue, 3 Jan 2012 14:48:11 +0000
Subject: [PATCH] ENH: Code refactoring/clean-up
---
.../IDDESDelta/IDDESDelta.C | 74 +++++++++----------
1 file changed, 34 insertions(+), 40 deletions(-)
diff --git a/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/IDDESDelta/IDDESDelta.C b/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/IDDESDelta/IDDESDelta.C
index ecf9d4c39c7..4cd85a7cf60 100644
--- a/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/IDDESDelta/IDDESDelta.C
+++ b/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/IDDESDelta/IDDESDelta.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -41,8 +41,6 @@ namespace Foam
void Foam::IDDESDelta::calcDelta()
{
- label nD = mesh().nGeometricD();
-
const volScalarField& hmax = hmax_();
// initialise wallNorm
@@ -50,7 +48,7 @@ void Foam::IDDESDelta::calcDelta()
const volVectorField& n = wallNorm.n();
- tmp<volScalarField> faceToFacenMax
+ tmp<volScalarField> tfaceToFacenMax
(
new volScalarField
(
@@ -67,61 +65,60 @@ void Foam::IDDESDelta::calcDelta()
)
);
+ scalarField& faceToFacenMax = tfaceToFacenMax().internalField();
+
const cellList& cells = mesh().cells();
+ const vectorField& faceCentres = mesh().faceCentres();
- forAll(cells,cellI)
+ forAll(cells, cellI)
{
scalar deltaMaxTmp = 0.0;
- const labelList& cFaces = mesh().cells()[cellI];
- const point& faceCentre = mesh().faceCentres()[cFaces[0]];
+ const labelList& cFaces = cells[cellI];
+ const point& faceCentre = faceCentres[cFaces[0]];
const vector nCell = n[cellI];
forAll(cFaces, cFaceI)
{
label faceI = cFaces[cFaceI];
- const point& faceCentreTwo = mesh().faceCentres()[faceI];
+ const point& faceCentreTwo = faceCentres[faceI];
scalar tmp = (faceCentre - faceCentreTwo) & nCell;
if (tmp > deltaMaxTmp)
{
deltaMaxTmp = tmp;
}
}
- faceToFacenMax()[cellI] = deltaMaxTmp;
+ faceToFacenMax[cellI] = deltaMaxTmp;
}
- if (nD == 3)
- {
- delta_.internalField() =
- deltaCoeff_
- *min
- (
- max
- (
- max(cw_*wallDist(mesh()).y(), cw_*hmax),
- faceToFacenMax()
- ),
- hmax
- );
- }
- else if (nD == 2)
+
+ label nD = mesh().nGeometricD();
+
+ if (nD == 2)
{
WarningIn("IDDESDelta::calcDelta()")
- << "Case is 2D, LES is not strictly applicable\n"
+ << "Case is 2D, LES is not strictly applicable" << nl
<< endl;
-
- delta_.internalField() =
- deltaCoeff_
- *min
- (
- max(max(cw_*wallDist(mesh()).y(), cw_*hmax), faceToFacenMax()),
- hmax
- );
}
- else
+ else if (nD != 3)
{
FatalErrorIn("IDDESDelta::calcDelta()")
- << "Case is not 3D or 2D, LES is not strictly applicable"
- << exit(FatalError);
+ << "Case must be either 2D or 3D" << exit(FatalError);
}
+
+ delta_.internalField() =
+ deltaCoeff_
+ *min
+ (
+ max
+ (
+ max
+ (
+ cw_*wallDist(mesh()).y(),
+ cw_*hmax
+ ),
+ tfaceToFacenMax
+ ),
+ hmax
+ );
}
@@ -136,10 +133,7 @@ Foam::IDDESDelta::IDDESDelta
:
LESdelta(name, mesh),
hmax_(LESdelta::New("hmax", mesh, dd.parent())),
- deltaCoeff_
- (
- readScalar(dd.subDict(type()+"Coeffs").lookup("deltaCoeff"))
- ),
+ deltaCoeff_(readScalar(dd.subDict(type()+"Coeffs").lookup("deltaCoeff"))),
cw_(0.15)
{
dd.subDict(type() + "Coeffs").readIfPresent("cw", cw_);
--
GitLab