From d320fab4ab8ebbae8b354c61e4ac008d3ccb2d9d Mon Sep 17 00:00:00 2001 From: andy Date: Mon, 3 Aug 2009 11:10:13 +0100 Subject: [PATCH] Refactoring of nut wall function BCs - names updated to reflect what they are based on, e.g. either k or U --- .../incompressible/RAS/Make/files | 10 +-- .../backwardsCompatibilityWallFunctions.C | 4 +- ...nutURoughWallFunctionFvPatchScalarField.C} | 67 ++++++++----------- ...nutURoughWallFunctionFvPatchScalarField.H} | 58 +++++++--------- ...USpaldingWallFunctionFvPatchScalarField.C} | 53 +++++++-------- ...USpaldingWallFunctionFvPatchScalarField.H} | 44 ++++++------ .../nutUWallFunctionFvPatchScalarField.C} | 49 ++++++-------- .../nutUWallFunctionFvPatchScalarField.H} | 50 ++++++-------- ...nutkRoughWallFunctionFvPatchScalarField.C} | 52 +++++++------- ...nutkRoughWallFunctionFvPatchScalarField.H} | 42 ++++++------ .../nutkWallFunctionFvPatchScalarField.C} | 36 +++++----- .../nutkWallFunctionFvPatchScalarField.H} | 38 +++++------ 12 files changed, 232 insertions(+), 271 deletions(-) rename src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/{nutSpalartAllmarasStandardRoughWallFunction/nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.C => nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C} (79%) rename src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/{nutSpalartAllmarasStandardRoughWallFunction/nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.H => nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.H} (73%) rename src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/{nutSpalartAllmarasWallFunction/nutSpalartAllmarasWallFunctionFvPatchScalarField.C => nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.C} (77%) rename src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/{nutSpalartAllmarasWallFunction/nutSpalartAllmarasWallFunctionFvPatchScalarField.H => nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.H} (74%) rename src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/{nutSpalartAllmarasStandardWallFunction/nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C => nutUWallFunction/nutUWallFunctionFvPatchScalarField.C} (74%) rename src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/{nutSpalartAllmarasStandardWallFunction/nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.H => nutUWallFunction/nutUWallFunctionFvPatchScalarField.H} (70%) rename src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/{nutRoughWallFunction/nutRoughWallFunctionFvPatchScalarField.C => nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.C} (76%) rename src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/{nutRoughWallFunction/nutRoughWallFunctionFvPatchScalarField.H => nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.H} (79%) rename src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/{nutWallFunction/nutWallFunctionFvPatchScalarField.C => nutkWallFunction/nutkWallFunctionFvPatchScalarField.C} (82%) rename src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/{nutWallFunction/nutWallFunctionFvPatchScalarField.H => nutkWallFunction/nutkWallFunctionFvPatchScalarField.H} (82%) diff --git a/src/turbulenceModels/incompressible/RAS/Make/files b/src/turbulenceModels/incompressible/RAS/Make/files index e7ac20e59e..d81b1735b8 100644 --- a/src/turbulenceModels/incompressible/RAS/Make/files +++ b/src/turbulenceModels/incompressible/RAS/Make/files @@ -21,11 +21,11 @@ LamBremhorstKE/LamBremhorstKE.C wallFunctions = derivedFvPatchFields/wallFunctions nutWallFunctions = $(wallFunctions)/nutWallFunctions -$(nutWallFunctions)/nutWallFunction/nutWallFunctionFvPatchScalarField.C -$(nutWallFunctions)/nutRoughWallFunction/nutRoughWallFunctionFvPatchScalarField.C -$(nutWallFunctions)/nutSpalartAllmarasWallFunction/nutSpalartAllmarasWallFunctionFvPatchScalarField.C -$(nutWallFunctions)/nutSpalartAllmarasStandardWallFunction/nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C -$(nutWallFunctions)/nutSpalartAllmarasStandardRoughWallFunction/nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.C +$(nutWallFunctions)/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.C +$(nutWallFunctions)/nutkWallFunction/nutkWallFunctionFvPatchScalarField.C +$(nutWallFunctions)/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C +$(nutWallFunctions)/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.C +$(nutWallFunctions)/nutUWallFunction/nutUWallFunctionFvPatchScalarField.C epsilonWallFunctions = $(wallFunctions)/epsilonWallFunctions $(epsilonWallFunctions)/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C diff --git a/src/turbulenceModels/incompressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C b/src/turbulenceModels/incompressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C index bfa6bb78a1..f71feb939d 100644 --- a/src/turbulenceModels/incompressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C +++ b/src/turbulenceModels/incompressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C @@ -27,7 +27,7 @@ License #include "backwardsCompatibilityWallFunctions.H" #include "calculatedFvPatchField.H" -#include "nutWallFunctionFvPatchScalarField.H" +#include "nutkWallFunctionFvPatchScalarField.H" #include "epsilonWallFunctionFvPatchScalarField.H" #include "kqRWallFunctionFvPatchField.H" #include "omegaWallFunctionFvPatchScalarField.H" @@ -75,7 +75,7 @@ tmp autoCreateNut if (isType(bm[patchI])) { nutBoundaryTypes[patchI] = - RASModels::nutWallFunctionFvPatchScalarField::typeName; + RASModels::nutkWallFunctionFvPatchScalarField::typeName; } else { diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardRoughWallFunction/nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C similarity index 79% rename from src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardRoughWallFunction/nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.C rename to src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C index 760559f679..a85c647467 100644 --- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardRoughWallFunction/nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.C +++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ -#include "nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.H" +#include "nutURoughWallFunctionFvPatchScalarField.H" #include "RASModel.H" #include "fvPatchFieldMapper.H" #include "volFields.H" @@ -41,8 +41,7 @@ namespace RASModels // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // -tmp -nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::calcNut() const +tmp nutURoughWallFunctionFvPatchScalarField::calcNut() const { const label patchI = patch().index(); @@ -73,8 +72,7 @@ nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::calcNut() const } -tmp -nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::calcYPlus +tmp nutURoughWallFunctionFvPatchScalarField::calcYPlus ( const scalarField& magUp ) const @@ -120,8 +118,8 @@ nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::calcYPlus dKsPlusdYPlus = 1; } - // Additional tuning parameter (fudge factor) - nominally = 1 - dKsPlusdYPlus *= roughnessFudgeFactor_; + // Additional tuning parameter - nominally = 1 + dKsPlusdYPlus *= roughnessFactor_; do { @@ -200,82 +198,76 @@ nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::calcYPlus // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField:: -nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField +nutURoughWallFunctionFvPatchScalarField::nutURoughWallFunctionFvPatchScalarField ( const fvPatch& p, const DimensionedField& iF ) : - nutWallFunctionFvPatchScalarField(p, iF), + nutkWallFunctionFvPatchScalarField(p, iF), roughnessHeight_(pTraits::zero), roughnessConstant_(pTraits::zero), - roughnessFudgeFactor_(pTraits::zero) + roughnessFactor_(pTraits::zero) {} -nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField:: -nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField +nutURoughWallFunctionFvPatchScalarField::nutURoughWallFunctionFvPatchScalarField ( - const nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField& ptf, + const nutURoughWallFunctionFvPatchScalarField& ptf, const fvPatch& p, const DimensionedField& iF, const fvPatchFieldMapper& mapper ) : - nutWallFunctionFvPatchScalarField(ptf, p, iF, mapper), + nutkWallFunctionFvPatchScalarField(ptf, p, iF, mapper), roughnessHeight_(ptf.roughnessHeight_), roughnessConstant_(ptf.roughnessConstant_), - roughnessFudgeFactor_(ptf.roughnessFudgeFactor_) + roughnessFactor_(ptf.roughnessFactor_) {} -nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField:: -nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField +nutURoughWallFunctionFvPatchScalarField::nutURoughWallFunctionFvPatchScalarField ( const fvPatch& p, const DimensionedField& iF, const dictionary& dict ) : - nutWallFunctionFvPatchScalarField(p, iF, dict), + nutkWallFunctionFvPatchScalarField(p, iF, dict), roughnessHeight_(readScalar(dict.lookup("roughnessHeight"))), roughnessConstant_(readScalar(dict.lookup("roughnessConstant"))), - roughnessFudgeFactor_(readScalar(dict.lookup("roughnessFudgeFactor"))) + roughnessFactor_(readScalar(dict.lookup("roughnessFactor"))) {} -nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField:: -nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField +nutURoughWallFunctionFvPatchScalarField::nutURoughWallFunctionFvPatchScalarField ( - const nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField& rwfpsf + const nutURoughWallFunctionFvPatchScalarField& rwfpsf ) : - nutWallFunctionFvPatchScalarField(rwfpsf), + nutkWallFunctionFvPatchScalarField(rwfpsf), roughnessHeight_(rwfpsf.roughnessHeight_), roughnessConstant_(rwfpsf.roughnessConstant_), - roughnessFudgeFactor_(rwfpsf.roughnessFudgeFactor_) + roughnessFactor_(rwfpsf.roughnessFactor_) {} -nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField:: -nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField +nutURoughWallFunctionFvPatchScalarField::nutURoughWallFunctionFvPatchScalarField ( - const nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField& rwfpsf, + const nutURoughWallFunctionFvPatchScalarField& rwfpsf, const DimensionedField& iF ) : - nutWallFunctionFvPatchScalarField(rwfpsf, iF), + nutkWallFunctionFvPatchScalarField(rwfpsf, iF), roughnessHeight_(rwfpsf.roughnessHeight_), roughnessConstant_(rwfpsf.roughnessConstant_), - roughnessFudgeFactor_(rwfpsf.roughnessFudgeFactor_) + roughnessFactor_(rwfpsf.roughnessFactor_) {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -tmp -nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::yPlus() const +tmp nutURoughWallFunctionFvPatchScalarField::yPlus() const { const label patchI = patch().index(); @@ -287,10 +279,7 @@ nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::yPlus() const } -void nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::write -( - Ostream& os -) const +void nutURoughWallFunctionFvPatchScalarField::write(Ostream& os) const { fvPatchField::write(os); writeLocalEntries(os); @@ -298,8 +287,8 @@ void nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::write << roughnessHeight_ << token::END_STATEMENT << nl; os.writeKeyword("roughnessConstant") << roughnessConstant_ << token::END_STATEMENT << nl; - os.writeKeyword("roughnessFudgeFactor") - << roughnessFudgeFactor_ << token::END_STATEMENT << nl; + os.writeKeyword("roughnessFactor") + << roughnessFactor_ << token::END_STATEMENT << nl; writeEntry("value", os); } @@ -309,7 +298,7 @@ void nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::write makePatchTypeField ( fvPatchScalarField, - nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField + nutURoughWallFunctionFvPatchScalarField ); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardRoughWallFunction/nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.H similarity index 73% rename from src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardRoughWallFunction/nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.H rename to src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.H index 8d72e5ad13..1fbb24f9c5 100644 --- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardRoughWallFunction/nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.H +++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.H @@ -23,21 +23,20 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Class - Foam::incompressible::RASModels:: - nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField + Foam::incompressible::RASModels::nutURoughWallFunctionFvPatchScalarField Description - Wall function boundary condition for rough walls + Wall function boundary condition for rough walls, based on velocity. SourceFiles nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C \*---------------------------------------------------------------------------*/ -#ifndef nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField_H -#define nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField_H +#ifndef nutURoughWallFunctionFvPatchScalarField_H +#define nutURoughWallFunctionFvPatchScalarField_H -#include "nutWallFunctionFvPatchScalarField.H" +#include "nutkWallFunctionFvPatchScalarField.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -49,12 +48,12 @@ namespace RASModels { /*---------------------------------------------------------------------------*\ -Class nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField Declaration + Class nutURoughWallFunctionFvPatchScalarField Declaration \*---------------------------------------------------------------------------*/ -class nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField +class nutURoughWallFunctionFvPatchScalarField : - public nutWallFunctionFvPatchScalarField + public nutkWallFunctionFvPatchScalarField { // Private data @@ -67,7 +66,7 @@ class nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField scalar roughnessConstant_; //- Scale factor - scalar roughnessFudgeFactor_; + scalar roughnessFactor_; // Protected member functions @@ -82,20 +81,20 @@ class nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField public: //- Runtime type information - TypeName("nutSpalartAllmarasStandardRoughWallFunction"); + TypeName("nutURoughWallFunction"); // Constructors //- Construct from patch and internal field - nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField + nutURoughWallFunctionFvPatchScalarField ( const fvPatch&, const DimensionedField& ); //- Construct from patch, internal field and dictionary - nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField + nutURoughWallFunctionFvPatchScalarField ( const fvPatch&, const DimensionedField&, @@ -103,20 +102,20 @@ public: ); //- Construct by mapping given - // nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField + // nutURoughWallFunctionFvPatchScalarField // onto a new patch - nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField + nutURoughWallFunctionFvPatchScalarField ( - const nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField&, + const nutURoughWallFunctionFvPatchScalarField&, const fvPatch&, const DimensionedField&, const fvPatchFieldMapper& ); //- Construct as copy - nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField + nutURoughWallFunctionFvPatchScalarField ( - const nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField& + const nutURoughWallFunctionFvPatchScalarField& ); //- Construct and return a clone @@ -124,17 +123,14 @@ public: { return tmp ( - new nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField - ( - *this - ) + new nutURoughWallFunctionFvPatchScalarField(*this) ); } //- Construct as copy setting internal field reference - nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField + nutURoughWallFunctionFvPatchScalarField ( - const nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField&, + const nutURoughWallFunctionFvPatchScalarField&, const DimensionedField& ); @@ -146,11 +142,7 @@ public: { return tmp ( - new nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField - ( - *this, - iF - ) + new nutURoughWallFunctionFvPatchScalarField(*this, iF) ); } @@ -185,16 +177,16 @@ public: } //- Return the roughness scale factor - const scalar& roughnessFudgeFactor() const + const scalar& roughnessFactor() const { - return roughnessFudgeFactor_; + return roughnessFactor_; } //- Return reference to the roughness scale factor to allow // adjustment - scalar& roughnessFudgeFactor() + scalar& roughnessFactor() { - return roughnessFudgeFactor_; + return roughnessFactor_; } diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasWallFunction/nutSpalartAllmarasWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.C similarity index 77% rename from src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasWallFunction/nutSpalartAllmarasWallFunctionFvPatchScalarField.C rename to src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.C index 8b968a4fa2..f24001bc6e 100644 --- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasWallFunction/nutSpalartAllmarasWallFunctionFvPatchScalarField.C +++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.C @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ -#include "nutSpalartAllmarasWallFunctionFvPatchScalarField.H" +#include "nutUSpaldingWallFunctionFvPatchScalarField.H" #include "RASModel.H" #include "fvPatchFieldMapper.H" #include "volFields.H" @@ -41,8 +41,7 @@ namespace RASModels // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // -tmp -nutSpalartAllmarasWallFunctionFvPatchScalarField::calcNut() const +tmp nutUSpaldingWallFunctionFvPatchScalarField::calcNut() const { const label patchI = patch().index(); @@ -55,7 +54,7 @@ nutSpalartAllmarasWallFunctionFvPatchScalarField::calcNut() const } -tmp nutSpalartAllmarasWallFunctionFvPatchScalarField::calcUTau +tmp nutUSpaldingWallFunctionFvPatchScalarField::calcUTau ( const scalarField& magGradU ) const @@ -114,67 +113,66 @@ tmp nutSpalartAllmarasWallFunctionFvPatchScalarField::calcUTau // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -nutSpalartAllmarasWallFunctionFvPatchScalarField:: -nutSpalartAllmarasWallFunctionFvPatchScalarField +nutUSpaldingWallFunctionFvPatchScalarField:: +nutUSpaldingWallFunctionFvPatchScalarField ( const fvPatch& p, const DimensionedField& iF ) : - nutWallFunctionFvPatchScalarField(p, iF) + nutkWallFunctionFvPatchScalarField(p, iF) {} -nutSpalartAllmarasWallFunctionFvPatchScalarField:: -nutSpalartAllmarasWallFunctionFvPatchScalarField +nutUSpaldingWallFunctionFvPatchScalarField:: +nutUSpaldingWallFunctionFvPatchScalarField ( - const nutSpalartAllmarasWallFunctionFvPatchScalarField& ptf, + const nutUSpaldingWallFunctionFvPatchScalarField& ptf, const fvPatch& p, const DimensionedField& iF, const fvPatchFieldMapper& mapper ) : - nutWallFunctionFvPatchScalarField(ptf, p, iF, mapper) + nutkWallFunctionFvPatchScalarField(ptf, p, iF, mapper) {} -nutSpalartAllmarasWallFunctionFvPatchScalarField:: -nutSpalartAllmarasWallFunctionFvPatchScalarField +nutUSpaldingWallFunctionFvPatchScalarField:: +nutUSpaldingWallFunctionFvPatchScalarField ( const fvPatch& p, const DimensionedField& iF, const dictionary& dict ) : - nutWallFunctionFvPatchScalarField(p, iF, dict) + nutkWallFunctionFvPatchScalarField(p, iF, dict) {} -nutSpalartAllmarasWallFunctionFvPatchScalarField:: -nutSpalartAllmarasWallFunctionFvPatchScalarField +nutUSpaldingWallFunctionFvPatchScalarField:: +nutUSpaldingWallFunctionFvPatchScalarField ( - const nutSpalartAllmarasWallFunctionFvPatchScalarField& wfpsf + const nutUSpaldingWallFunctionFvPatchScalarField& wfpsf ) : - nutWallFunctionFvPatchScalarField(wfpsf) + nutkWallFunctionFvPatchScalarField(wfpsf) {} -nutSpalartAllmarasWallFunctionFvPatchScalarField:: -nutSpalartAllmarasWallFunctionFvPatchScalarField +nutUSpaldingWallFunctionFvPatchScalarField:: +nutUSpaldingWallFunctionFvPatchScalarField ( - const nutSpalartAllmarasWallFunctionFvPatchScalarField& wfpsf, + const nutUSpaldingWallFunctionFvPatchScalarField& wfpsf, const DimensionedField& iF ) : - nutWallFunctionFvPatchScalarField(wfpsf, iF) + nutkWallFunctionFvPatchScalarField(wfpsf, iF) {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -tmp -nutSpalartAllmarasWallFunctionFvPatchScalarField::yPlus() const +tmp nutUSpaldingWallFunctionFvPatchScalarField::yPlus() const { const label patchI = patch().index(); @@ -187,10 +185,7 @@ nutSpalartAllmarasWallFunctionFvPatchScalarField::yPlus() const } -void nutSpalartAllmarasWallFunctionFvPatchScalarField::write -( - Ostream& os -) const +void nutUSpaldingWallFunctionFvPatchScalarField::write(Ostream& os) const { fvPatchField::write(os); writeLocalEntries(os); @@ -203,7 +198,7 @@ void nutSpalartAllmarasWallFunctionFvPatchScalarField::write makePatchTypeField ( fvPatchScalarField, - nutSpalartAllmarasWallFunctionFvPatchScalarField + nutUSpaldingWallFunctionFvPatchScalarField ); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasWallFunction/nutSpalartAllmarasWallFunctionFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.H similarity index 74% rename from src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasWallFunction/nutSpalartAllmarasWallFunctionFvPatchScalarField.H rename to src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.H index 36f2aadb15..de663d32a9 100644 --- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasWallFunction/nutSpalartAllmarasWallFunctionFvPatchScalarField.H +++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.H @@ -23,21 +23,21 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Class - Foam::incompressible::RASModels:: - nutSpalartAllmarasWallFunctionFvPatchScalarField + Foam::incompressible::RASModels::nutUSpaldingWallFunctionFvPatchScalarField Description - Wall function boundary condition for walls + Wall function boundary condition for walls, based on velocity, using + Spaldings law to give a continuous nut profile to the wall (y+ = 0) SourceFiles - nutSpalartAllmarasWallFunctionFvPatchScalarField.C + nutUSpaldingWallFunctionFvPatchScalarField.C \*---------------------------------------------------------------------------*/ -#ifndef nutSpalartAllmarasWallFunctionFvPatchScalarField_H -#define nutSpalartAllmarasWallFunctionFvPatchScalarField_H +#ifndef nutUSpaldingWallFunctionFvPatchScalarField_H +#define nutUSpaldingWallFunctionFvPatchScalarField_H -#include "nutWallFunctionFvPatchScalarField.H" +#include "nutkWallFunctionFvPatchScalarField.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -49,12 +49,12 @@ namespace RASModels { /*---------------------------------------------------------------------------*\ - Class nutSpalartAllmarasWallFunctionFvPatch Declaration + Class nutUSpaldingWallFunctionFvPatch Declaration \*---------------------------------------------------------------------------*/ -class nutSpalartAllmarasWallFunctionFvPatchScalarField +class nutUSpaldingWallFunctionFvPatchScalarField : - public nutWallFunctionFvPatchScalarField + public nutkWallFunctionFvPatchScalarField { protected: @@ -70,20 +70,20 @@ protected: public: //- Runtime type information - TypeName("nutSpalartAllmarasWallFunction"); + TypeName("nutUSpaldingWallFunction"); // Constructors //- Construct from patch and internal field - nutSpalartAllmarasWallFunctionFvPatchScalarField + nutUSpaldingWallFunctionFvPatchScalarField ( const fvPatch&, const DimensionedField& ); //- Construct from patch, internal field and dictionary - nutSpalartAllmarasWallFunctionFvPatchScalarField + nutUSpaldingWallFunctionFvPatchScalarField ( const fvPatch&, const DimensionedField&, @@ -91,20 +91,20 @@ public: ); //- Construct by mapping given - // nutSpalartAllmarasWallFunctionFvPatchScalarField + // nutUSpaldingWallFunctionFvPatchScalarField // onto a new patch - nutSpalartAllmarasWallFunctionFvPatchScalarField + nutUSpaldingWallFunctionFvPatchScalarField ( - const nutSpalartAllmarasWallFunctionFvPatchScalarField&, + const nutUSpaldingWallFunctionFvPatchScalarField&, const fvPatch&, const DimensionedField&, const fvPatchFieldMapper& ); //- Construct as copy - nutSpalartAllmarasWallFunctionFvPatchScalarField + nutUSpaldingWallFunctionFvPatchScalarField ( - const nutSpalartAllmarasWallFunctionFvPatchScalarField& + const nutUSpaldingWallFunctionFvPatchScalarField& ); //- Construct and return a clone @@ -112,14 +112,14 @@ public: { return tmp ( - new nutSpalartAllmarasWallFunctionFvPatchScalarField(*this) + new nutUSpaldingWallFunctionFvPatchScalarField(*this) ); } //- Construct as copy setting internal field reference - nutSpalartAllmarasWallFunctionFvPatchScalarField + nutUSpaldingWallFunctionFvPatchScalarField ( - const nutSpalartAllmarasWallFunctionFvPatchScalarField&, + const nutUSpaldingWallFunctionFvPatchScalarField&, const DimensionedField& ); @@ -131,7 +131,7 @@ public: { return tmp ( - new nutSpalartAllmarasWallFunctionFvPatchScalarField(*this, iF) + new nutUSpaldingWallFunctionFvPatchScalarField(*this, iF) ); } diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardWallFunction/nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.C similarity index 74% rename from src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardWallFunction/nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C rename to src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.C index e3c3e55671..bccc07672f 100644 --- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardWallFunction/nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C +++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.C @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ -#include "nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.H" +#include "nutUWallFunctionFvPatchScalarField.H" #include "RASModel.H" #include "fvPatchFieldMapper.H" #include "volFields.H" @@ -41,8 +41,7 @@ namespace RASModels // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // -tmp -nutSpalartAllmarasStandardWallFunctionFvPatchScalarField::calcNut() const +tmp nutUWallFunctionFvPatchScalarField::calcNut() const { const label patchI = patch().index(); @@ -70,8 +69,7 @@ nutSpalartAllmarasStandardWallFunctionFvPatchScalarField::calcNut() const } -tmp -nutSpalartAllmarasStandardWallFunctionFvPatchScalarField::calcYPlus +tmp nutUWallFunctionFvPatchScalarField::calcYPlus ( const scalarField& magUp ) const @@ -111,67 +109,61 @@ nutSpalartAllmarasStandardWallFunctionFvPatchScalarField::calcYPlus // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -nutSpalartAllmarasStandardWallFunctionFvPatchScalarField:: -nutSpalartAllmarasStandardWallFunctionFvPatchScalarField +nutUWallFunctionFvPatchScalarField::nutUWallFunctionFvPatchScalarField ( const fvPatch& p, const DimensionedField& iF ) : - nutWallFunctionFvPatchScalarField(p, iF) + nutkWallFunctionFvPatchScalarField(p, iF) {} -nutSpalartAllmarasStandardWallFunctionFvPatchScalarField:: -nutSpalartAllmarasStandardWallFunctionFvPatchScalarField +nutUWallFunctionFvPatchScalarField::nutUWallFunctionFvPatchScalarField ( - const nutSpalartAllmarasStandardWallFunctionFvPatchScalarField& ptf, + const nutUWallFunctionFvPatchScalarField& ptf, const fvPatch& p, const DimensionedField& iF, const fvPatchFieldMapper& mapper ) : - nutWallFunctionFvPatchScalarField(ptf, p, iF, mapper) + nutkWallFunctionFvPatchScalarField(ptf, p, iF, mapper) {} -nutSpalartAllmarasStandardWallFunctionFvPatchScalarField:: -nutSpalartAllmarasStandardWallFunctionFvPatchScalarField +nutUWallFunctionFvPatchScalarField::nutUWallFunctionFvPatchScalarField ( const fvPatch& p, const DimensionedField& iF, const dictionary& dict ) : - nutWallFunctionFvPatchScalarField(p, iF, dict) + nutkWallFunctionFvPatchScalarField(p, iF, dict) {} -nutSpalartAllmarasStandardWallFunctionFvPatchScalarField:: -nutSpalartAllmarasStandardWallFunctionFvPatchScalarField +nutUWallFunctionFvPatchScalarField::nutUWallFunctionFvPatchScalarField ( - const nutSpalartAllmarasStandardWallFunctionFvPatchScalarField& sawfpsf + const nutUWallFunctionFvPatchScalarField& sawfpsf ) : - nutWallFunctionFvPatchScalarField(sawfpsf) + nutkWallFunctionFvPatchScalarField(sawfpsf) {} -nutSpalartAllmarasStandardWallFunctionFvPatchScalarField:: -nutSpalartAllmarasStandardWallFunctionFvPatchScalarField +nutUWallFunctionFvPatchScalarField::nutUWallFunctionFvPatchScalarField ( - const nutSpalartAllmarasStandardWallFunctionFvPatchScalarField& sawfpsf, + const nutUWallFunctionFvPatchScalarField& sawfpsf, const DimensionedField& iF ) : - nutWallFunctionFvPatchScalarField(sawfpsf, iF) + nutkWallFunctionFvPatchScalarField(sawfpsf, iF) {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -tmp -nutSpalartAllmarasStandardWallFunctionFvPatchScalarField::yPlus() const +tmp nutUWallFunctionFvPatchScalarField::yPlus() const { const label patchI = patch().index(); const RASModel& rasModel = db().lookupObject("RASProperties"); @@ -182,10 +174,7 @@ nutSpalartAllmarasStandardWallFunctionFvPatchScalarField::yPlus() const } -void nutSpalartAllmarasStandardWallFunctionFvPatchScalarField::write -( - Ostream& os -) const +void nutUWallFunctionFvPatchScalarField::write(Ostream& os) const { fvPatchField::write(os); writeLocalEntries(os); @@ -198,7 +187,7 @@ void nutSpalartAllmarasStandardWallFunctionFvPatchScalarField::write makePatchTypeField ( fvPatchScalarField, - nutSpalartAllmarasStandardWallFunctionFvPatchScalarField + nutUWallFunctionFvPatchScalarField ); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardWallFunction/nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.H similarity index 70% rename from src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardWallFunction/nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.H rename to src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.H index f54bb57c8a..32bd0aad51 100644 --- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardWallFunction/nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.H +++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.H @@ -23,21 +23,20 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Class - Foam::incompressible::RASModels:: - nutSpalartAllmarasStandardWallFunctionFvPatchScalarField + Foam::incompressible::RASModels::nutUWallFunctionFvPatchScalarField Description - Wall function boundary condition for walls + Wall function boundary condition for walls, based on velocity. SourceFiles - nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C + nutUWallFunctionFvPatchScalarField.C \*---------------------------------------------------------------------------*/ -#ifndef nutSpalartAllmarasStandardWallFunctionFvPatchScalarField_H -#define nutSpalartAllmarasStandardWallFunctionFvPatchScalarField_H +#ifndef nutUWallFunctionFvPatchScalarField_H +#define nutUWallFunctionFvPatchScalarField_H -#include "nutWallFunctionFvPatchScalarField.H" +#include "nutkWallFunctionFvPatchScalarField.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -49,12 +48,12 @@ namespace RASModels { /*---------------------------------------------------------------------------*\ - Class nutSpalartAllmarasStandardWallFunctionFvPatchScalarField Declaration + Class nutUWallFunctionFvPatchScalarField Declaration \*---------------------------------------------------------------------------*/ -class nutSpalartAllmarasStandardWallFunctionFvPatchScalarField +class nutUWallFunctionFvPatchScalarField : - public nutWallFunctionFvPatchScalarField + public nutkWallFunctionFvPatchScalarField { protected: @@ -70,20 +69,20 @@ protected: public: //- Runtime type information - TypeName("nutSpalartAllmarasStandardWallFunction"); + TypeName("nutUWallFunction"); // Constructors //- Construct from patch and internal field - nutSpalartAllmarasStandardWallFunctionFvPatchScalarField + nutUWallFunctionFvPatchScalarField ( const fvPatch&, const DimensionedField& ); //- Construct from patch, internal field and dictionary - nutSpalartAllmarasStandardWallFunctionFvPatchScalarField + nutUWallFunctionFvPatchScalarField ( const fvPatch&, const DimensionedField&, @@ -91,20 +90,20 @@ public: ); //- Construct by mapping given - // nutSpalartAllmarasStandardWallFunctionFvPatchScalarField + // nutUWallFunctionFvPatchScalarField // onto a new patch - nutSpalartAllmarasStandardWallFunctionFvPatchScalarField + nutUWallFunctionFvPatchScalarField ( - const nutSpalartAllmarasStandardWallFunctionFvPatchScalarField&, + const nutUWallFunctionFvPatchScalarField&, const fvPatch&, const DimensionedField&, const fvPatchFieldMapper& ); //- Construct as copy - nutSpalartAllmarasStandardWallFunctionFvPatchScalarField + nutUWallFunctionFvPatchScalarField ( - const nutSpalartAllmarasStandardWallFunctionFvPatchScalarField& + const nutUWallFunctionFvPatchScalarField& ); //- Construct and return a clone @@ -112,17 +111,14 @@ public: { return tmp ( - new nutSpalartAllmarasStandardWallFunctionFvPatchScalarField - ( - *this - ) + new nutUWallFunctionFvPatchScalarField(*this) ); } //- Construct as copy setting internal field reference - nutSpalartAllmarasStandardWallFunctionFvPatchScalarField + nutUWallFunctionFvPatchScalarField ( - const nutSpalartAllmarasStandardWallFunctionFvPatchScalarField&, + const nutUWallFunctionFvPatchScalarField&, const DimensionedField& ); @@ -134,11 +130,7 @@ public: { return tmp ( - new nutSpalartAllmarasStandardWallFunctionFvPatchScalarField - ( - *this, - iF - ) + new nutUWallFunctionFvPatchScalarField(*this, iF) ); } diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutRoughWallFunction/nutRoughWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.C similarity index 76% rename from src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutRoughWallFunction/nutRoughWallFunctionFvPatchScalarField.C rename to src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.C index 48d9ba1dde..f81cb76c5c 100644 --- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutRoughWallFunction/nutRoughWallFunctionFvPatchScalarField.C +++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.C @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ -#include "nutRoughWallFunctionFvPatchScalarField.H" +#include "nutkRoughWallFunctionFvPatchScalarField.H" #include "RASModel.H" #include "fvPatchFieldMapper.H" #include "volFields.H" @@ -41,7 +41,7 @@ namespace RASModels // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // -scalar nutRoughWallFunctionFvPatchScalarField::fnRough +scalar nutkRoughWallFunctionFvPatchScalarField::fnRough ( const scalar KsPlus, const scalar Cs @@ -64,7 +64,7 @@ scalar nutRoughWallFunctionFvPatchScalarField::fnRough } -tmp nutRoughWallFunctionFvPatchScalarField::calcNut() const +tmp nutkRoughWallFunctionFvPatchScalarField::calcNut() const { const label patchI = patch().index(); @@ -128,63 +128,63 @@ tmp nutRoughWallFunctionFvPatchScalarField::calcNut() const // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -nutRoughWallFunctionFvPatchScalarField::nutRoughWallFunctionFvPatchScalarField +nutkRoughWallFunctionFvPatchScalarField::nutkRoughWallFunctionFvPatchScalarField ( const fvPatch& p, const DimensionedField& iF ) : - nutWallFunctionFvPatchScalarField(p, iF), + nutkWallFunctionFvPatchScalarField(p, iF), Ks_(p.size(), 0.0), Cs_(p.size(), 0.0) {} -nutRoughWallFunctionFvPatchScalarField::nutRoughWallFunctionFvPatchScalarField +nutkRoughWallFunctionFvPatchScalarField::nutkRoughWallFunctionFvPatchScalarField ( - const nutRoughWallFunctionFvPatchScalarField& ptf, + const nutkRoughWallFunctionFvPatchScalarField& ptf, const fvPatch& p, const DimensionedField& iF, const fvPatchFieldMapper& mapper ) : - nutWallFunctionFvPatchScalarField(ptf, p, iF, mapper), + nutkWallFunctionFvPatchScalarField(ptf, p, iF, mapper), Ks_(ptf.Ks_, mapper), Cs_(ptf.Cs_, mapper) {} -nutRoughWallFunctionFvPatchScalarField::nutRoughWallFunctionFvPatchScalarField +nutkRoughWallFunctionFvPatchScalarField::nutkRoughWallFunctionFvPatchScalarField ( const fvPatch& p, const DimensionedField& iF, const dictionary& dict ) : - nutWallFunctionFvPatchScalarField(p, iF, dict), + nutkWallFunctionFvPatchScalarField(p, iF, dict), Ks_("Ks", dict, p.size()), Cs_("Cs", dict, p.size()) {} -nutRoughWallFunctionFvPatchScalarField::nutRoughWallFunctionFvPatchScalarField +nutkRoughWallFunctionFvPatchScalarField::nutkRoughWallFunctionFvPatchScalarField ( - const nutRoughWallFunctionFvPatchScalarField& rwfpsf + const nutkRoughWallFunctionFvPatchScalarField& rwfpsf ) : - nutWallFunctionFvPatchScalarField(rwfpsf), + nutkWallFunctionFvPatchScalarField(rwfpsf), Ks_(rwfpsf.Ks_), Cs_(rwfpsf.Cs_) {} -nutRoughWallFunctionFvPatchScalarField::nutRoughWallFunctionFvPatchScalarField +nutkRoughWallFunctionFvPatchScalarField::nutkRoughWallFunctionFvPatchScalarField ( - const nutRoughWallFunctionFvPatchScalarField& rwfpsf, + const nutkRoughWallFunctionFvPatchScalarField& rwfpsf, const DimensionedField& iF ) : - nutWallFunctionFvPatchScalarField(rwfpsf, iF), + nutkWallFunctionFvPatchScalarField(rwfpsf, iF), Ks_(rwfpsf.Ks_), Cs_(rwfpsf.Cs_) {} @@ -192,34 +192,34 @@ nutRoughWallFunctionFvPatchScalarField::nutRoughWallFunctionFvPatchScalarField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -void nutRoughWallFunctionFvPatchScalarField::autoMap +void nutkRoughWallFunctionFvPatchScalarField::autoMap ( const fvPatchFieldMapper& m ) { - nutWallFunctionFvPatchScalarField::autoMap(m); + nutkWallFunctionFvPatchScalarField::autoMap(m); Ks_.autoMap(m); Cs_.autoMap(m); } -void nutRoughWallFunctionFvPatchScalarField::rmap +void nutkRoughWallFunctionFvPatchScalarField::rmap ( const fvPatchScalarField& ptf, const labelList& addr ) { - nutWallFunctionFvPatchScalarField::rmap(ptf, addr); + nutkWallFunctionFvPatchScalarField::rmap(ptf, addr); - const nutRoughWallFunctionFvPatchScalarField& nrwfpsf = - refCast(ptf); + const nutkRoughWallFunctionFvPatchScalarField& nrwfpsf = + refCast(ptf); Ks_.rmap(nrwfpsf.Ks_, addr); Cs_.rmap(nrwfpsf.Cs_, addr); } -void nutRoughWallFunctionFvPatchScalarField::write(Ostream& os) const +void nutkRoughWallFunctionFvPatchScalarField::write(Ostream& os) const { fvPatchField::write(os); writeLocalEntries(os); @@ -231,7 +231,11 @@ void nutRoughWallFunctionFvPatchScalarField::write(Ostream& os) const // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -makePatchTypeField(fvPatchScalarField, nutRoughWallFunctionFvPatchScalarField); +makePatchTypeField +( + fvPatchScalarField, + nutkRoughWallFunctionFvPatchScalarField +); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutRoughWallFunction/nutRoughWallFunctionFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.H similarity index 79% rename from src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutRoughWallFunction/nutRoughWallFunctionFvPatchScalarField.H rename to src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.H index 488bf39145..c45bedc516 100644 --- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutRoughWallFunction/nutRoughWallFunctionFvPatchScalarField.H +++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.H @@ -23,11 +23,11 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Class - Foam::incompressible::RASModels::nutRoughWallFunctionFvPatchScalarField + Foam::incompressible::RASModels::nutkRoughWallFunctionFvPatchScalarField Description Boundary condition for turbulent (kinematic) viscosity when using wall - functions for rough walls. + functions for rough walls, based on turbulence kinetic energy. Manipulates the E parameter to account for roughness effects, based on KsPlus. @@ -36,14 +36,14 @@ Description - roughness constant = 0.5-1.0 (0.5 default) SourceFiles - nutRoughWallFunctionFvPatchScalarField.C + nutkRoughWallFunctionFvPatchScalarField.C \*---------------------------------------------------------------------------*/ -#ifndef nutRoughWallFunctionFvPatchScalarField_H -#define nutRoughWallFunctionFvPatchScalarField_H +#ifndef nutkRoughWallFunctionFvPatchScalarField_H +#define nutkRoughWallFunctionFvPatchScalarField_H -#include "nutWallFunctionFvPatchScalarField.H" +#include "nutkWallFunctionFvPatchScalarField.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -55,12 +55,12 @@ namespace RASModels { /*---------------------------------------------------------------------------*\ - Class nutRoughWallFunctionFvPatchScalarField Declaration + Class nutkRoughWallFunctionFvPatchScalarField Declaration \*---------------------------------------------------------------------------*/ -class nutRoughWallFunctionFvPatchScalarField +class nutkRoughWallFunctionFvPatchScalarField : - public nutWallFunctionFvPatchScalarField + public nutkWallFunctionFvPatchScalarField { protected: @@ -85,20 +85,20 @@ protected: public: //- Runtime type information - TypeName("nutRoughWallFunction"); + TypeName("nutkRoughWallFunction"); // Constructors //- Construct from patch and internal field - nutRoughWallFunctionFvPatchScalarField + nutkRoughWallFunctionFvPatchScalarField ( const fvPatch&, const DimensionedField& ); //- Construct from patch, internal field and dictionary - nutRoughWallFunctionFvPatchScalarField + nutkRoughWallFunctionFvPatchScalarField ( const fvPatch&, const DimensionedField&, @@ -106,20 +106,20 @@ public: ); //- Construct by mapping given - // nutRoughWallFunctionFvPatchScalarField + // nutkRoughWallFunctionFvPatchScalarField // onto a new patch - nutRoughWallFunctionFvPatchScalarField + nutkRoughWallFunctionFvPatchScalarField ( - const nutRoughWallFunctionFvPatchScalarField&, + const nutkRoughWallFunctionFvPatchScalarField&, const fvPatch&, const DimensionedField&, const fvPatchFieldMapper& ); //- Construct as copy - nutRoughWallFunctionFvPatchScalarField + nutkRoughWallFunctionFvPatchScalarField ( - const nutRoughWallFunctionFvPatchScalarField& + const nutkRoughWallFunctionFvPatchScalarField& ); //- Construct and return a clone @@ -127,14 +127,14 @@ public: { return tmp ( - new nutRoughWallFunctionFvPatchScalarField(*this) + new nutkRoughWallFunctionFvPatchScalarField(*this) ); } //- Construct as copy setting internal field reference - nutRoughWallFunctionFvPatchScalarField + nutkRoughWallFunctionFvPatchScalarField ( - const nutRoughWallFunctionFvPatchScalarField&, + const nutkRoughWallFunctionFvPatchScalarField&, const DimensionedField& ); @@ -146,7 +146,7 @@ public: { return tmp ( - new nutRoughWallFunctionFvPatchScalarField(*this, iF) + new nutkRoughWallFunctionFvPatchScalarField(*this, iF) ); } diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.C similarity index 82% rename from src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C rename to src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.C index aef4df68b3..722016a2e7 100644 --- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C +++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.C @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ -#include "nutWallFunctionFvPatchScalarField.H" +#include "nutkWallFunctionFvPatchScalarField.H" #include "RASModel.H" #include "fvPatchFieldMapper.H" #include "volFields.H" @@ -42,11 +42,11 @@ namespace RASModels // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // -void nutWallFunctionFvPatchScalarField::checkType() +void nutkWallFunctionFvPatchScalarField::checkType() { if (!isA(patch())) { - FatalErrorIn("nutWallFunctionFvPatchScalarField::checkType()") + FatalErrorIn("nutkWallFunctionFvPatchScalarField::checkType()") << "Invalid wall function specification" << nl << " Patch type for patch " << patch().name() << " must be wall" << nl @@ -56,7 +56,7 @@ void nutWallFunctionFvPatchScalarField::checkType() } -scalar nutWallFunctionFvPatchScalarField::calcYPlusLam +scalar nutkWallFunctionFvPatchScalarField::calcYPlusLam ( const scalar kappa, const scalar E @@ -73,7 +73,7 @@ scalar nutWallFunctionFvPatchScalarField::calcYPlusLam } -tmp nutWallFunctionFvPatchScalarField::calcNut() const +tmp nutkWallFunctionFvPatchScalarField::calcNut() const { const label patchI = patch().index(); @@ -104,7 +104,7 @@ tmp nutWallFunctionFvPatchScalarField::calcNut() const } -void nutWallFunctionFvPatchScalarField::writeLocalEntries(Ostream& os) const +void nutkWallFunctionFvPatchScalarField::writeLocalEntries(Ostream& os) const { os.writeKeyword("Cmu") << Cmu_ << token::END_STATEMENT << nl; os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl; @@ -114,7 +114,7 @@ void nutWallFunctionFvPatchScalarField::writeLocalEntries(Ostream& os) const // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField +nutkWallFunctionFvPatchScalarField::nutkWallFunctionFvPatchScalarField ( const fvPatch& p, const DimensionedField& iF @@ -130,9 +130,9 @@ nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField } -nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField +nutkWallFunctionFvPatchScalarField::nutkWallFunctionFvPatchScalarField ( - const nutWallFunctionFvPatchScalarField& ptf, + const nutkWallFunctionFvPatchScalarField& ptf, const fvPatch& p, const DimensionedField& iF, const fvPatchFieldMapper& mapper @@ -148,7 +148,7 @@ nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField } -nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField +nutkWallFunctionFvPatchScalarField::nutkWallFunctionFvPatchScalarField ( const fvPatch& p, const DimensionedField& iF, @@ -165,9 +165,9 @@ nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField } -nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField +nutkWallFunctionFvPatchScalarField::nutkWallFunctionFvPatchScalarField ( - const nutWallFunctionFvPatchScalarField& wfpsf + const nutkWallFunctionFvPatchScalarField& wfpsf ) : fixedValueFvPatchScalarField(wfpsf), @@ -180,9 +180,9 @@ nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField } -nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField +nutkWallFunctionFvPatchScalarField::nutkWallFunctionFvPatchScalarField ( - const nutWallFunctionFvPatchScalarField& wfpsf, + const nutkWallFunctionFvPatchScalarField& wfpsf, const DimensionedField& iF ) : @@ -198,7 +198,7 @@ nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -void nutWallFunctionFvPatchScalarField::updateCoeffs() +void nutkWallFunctionFvPatchScalarField::updateCoeffs() { operator==(calcNut()); @@ -206,7 +206,7 @@ void nutWallFunctionFvPatchScalarField::updateCoeffs() } -tmp nutWallFunctionFvPatchScalarField::yPlus() const +tmp nutkWallFunctionFvPatchScalarField::yPlus() const { const label patchI = patch().index(); @@ -222,7 +222,7 @@ tmp nutWallFunctionFvPatchScalarField::yPlus() const } -void nutWallFunctionFvPatchScalarField::write(Ostream& os) const +void nutkWallFunctionFvPatchScalarField::write(Ostream& os) const { fvPatchField::write(os); writeLocalEntries(os); @@ -232,7 +232,7 @@ void nutWallFunctionFvPatchScalarField::write(Ostream& os) const // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -makePatchTypeField(fvPatchScalarField, nutWallFunctionFvPatchScalarField); +makePatchTypeField(fvPatchScalarField, nutkWallFunctionFvPatchScalarField); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.H similarity index 82% rename from src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.H rename to src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.H index 369d718b0a..5b781a934a 100644 --- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.H +++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.H @@ -23,20 +23,20 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Class - Foam::incompressible::RASModels::nutWallFunctionFvPatchScalarField + Foam::incompressible::RASModels::nutkWallFunctionFvPatchScalarField Description Boundary condition for turbulent (kinematic) viscosity when using wall - functions + functions, based on turbulence kinetic energy. - replicates OpenFOAM v1.5 (and earlier) behaviour SourceFiles - nutWallFunctionFvPatchScalarField.C + nutkWallFunctionFvPatchScalarField.C \*---------------------------------------------------------------------------*/ -#ifndef nutWallFunctionFvPatchScalarField_H -#define nutWallFunctionFvPatchScalarField_H +#ifndef nutkWallFunctionFvPatchScalarField_H +#define nutkWallFunctionFvPatchScalarField_H #include "fixedValueFvPatchFields.H" @@ -50,10 +50,10 @@ namespace RASModels { /*---------------------------------------------------------------------------*\ - Class nutWallFunctionFvPatchScalarField Declaration + Class nutkWallFunctionFvPatchScalarField Declaration \*---------------------------------------------------------------------------*/ -class nutWallFunctionFvPatchScalarField +class nutkWallFunctionFvPatchScalarField : public fixedValueFvPatchScalarField { @@ -92,20 +92,20 @@ protected: public: //- Runtime type information - TypeName("nutWallFunction"); + TypeName("nutkWallFunction"); // Constructors //- Construct from patch and internal field - nutWallFunctionFvPatchScalarField + nutkWallFunctionFvPatchScalarField ( const fvPatch&, const DimensionedField& ); //- Construct from patch, internal field and dictionary - nutWallFunctionFvPatchScalarField + nutkWallFunctionFvPatchScalarField ( const fvPatch&, const DimensionedField&, @@ -113,20 +113,20 @@ public: ); //- Construct by mapping given - // nutWallFunctionFvPatchScalarField + // nutkWallFunctionFvPatchScalarField // onto a new patch - nutWallFunctionFvPatchScalarField + nutkWallFunctionFvPatchScalarField ( - const nutWallFunctionFvPatchScalarField&, + const nutkWallFunctionFvPatchScalarField&, const fvPatch&, const DimensionedField&, const fvPatchFieldMapper& ); //- Construct as copy - nutWallFunctionFvPatchScalarField + nutkWallFunctionFvPatchScalarField ( - const nutWallFunctionFvPatchScalarField& + const nutkWallFunctionFvPatchScalarField& ); //- Construct and return a clone @@ -134,14 +134,14 @@ public: { return tmp ( - new nutWallFunctionFvPatchScalarField(*this) + new nutkWallFunctionFvPatchScalarField(*this) ); } //- Construct as copy setting internal field reference - nutWallFunctionFvPatchScalarField + nutkWallFunctionFvPatchScalarField ( - const nutWallFunctionFvPatchScalarField&, + const nutkWallFunctionFvPatchScalarField&, const DimensionedField& ); @@ -153,7 +153,7 @@ public: { return tmp ( - new nutWallFunctionFvPatchScalarField(*this, iF) + new nutkWallFunctionFvPatchScalarField(*this, iF) ); }