diff --git a/src/turbulenceModels/compressible/RAS/Make/files b/src/turbulenceModels/compressible/RAS/Make/files index da455db87f..1329745581 100644 --- a/src/turbulenceModels/compressible/RAS/Make/files +++ b/src/turbulenceModels/compressible/RAS/Make/files @@ -17,11 +17,11 @@ alphatWallFunctions = $(wallFunctions)/alphatWallFunctions $(alphatWallFunctions)/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C mutWallFunctions = $(wallFunctions)/mutWallFunctions -$(mutWallFunctions)/mutWallFunction/mutWallFunctionFvPatchScalarField.C -$(mutWallFunctions)/mutRoughWallFunction/mutRoughWallFunctionFvPatchScalarField.C -$(mutWallFunctions)/mutSpalartAllmarasWallFunction/mutSpalartAllmarasWallFunctionFvPatchScalarField.C -$(mutWallFunctions)/mutSpalartAllmarasStandardWallFunction/mutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C -$(mutWallFunctions)/mutSpalartAllmarasStandardRoughWallFunction/mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.C +$(mutWallFunctions)/mutkRoughWallFunction/mutkRoughWallFunctionFvPatchScalarField.C +$(mutWallFunctions)/mutkWallFunction/mutkWallFunctionFvPatchScalarField.C +$(mutWallFunctions)/mutURoughWallFunction/mutURoughWallFunctionFvPatchScalarField.C +$(mutWallFunctions)/mutUSpaldingWallFunction/mutUSpaldingWallFunctionFvPatchScalarField.C +$(mutWallFunctions)/mutUWallFunction/mutUWallFunctionFvPatchScalarField.C epsilonWallFunctions = $(wallFunctions)/epsilonWallFunctions $(epsilonWallFunctions)/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C diff --git a/src/turbulenceModels/compressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C b/src/turbulenceModels/compressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C index 7096314fe3..700cfed818 100644 --- a/src/turbulenceModels/compressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C +++ b/src/turbulenceModels/compressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C @@ -28,7 +28,7 @@ License #include "calculatedFvPatchField.H" #include "alphatWallFunctionFvPatchScalarField.H" -#include "mutWallFunctionFvPatchScalarField.H" +#include "mutkWallFunctionFvPatchScalarField.H" #include "epsilonWallFunctionFvPatchScalarField.H" #include "kqRWallFunctionFvPatchField.H" #include "omegaWallFunctionFvPatchScalarField.H" @@ -146,7 +146,7 @@ tmp autoCreateMut if (isType(bm[patchI])) { mutBoundaryTypes[patchI] = - RASModels::mutWallFunctionFvPatchScalarField::typeName; + RASModels::mutkWallFunctionFvPatchScalarField::typeName; } else { diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardRoughWallFunction/mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutURoughWallFunction/mutURoughWallFunctionFvPatchScalarField.C similarity index 80% rename from src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardRoughWallFunction/mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.C rename to src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutURoughWallFunction/mutURoughWallFunctionFvPatchScalarField.C index 3a1d0b7ab0..7bc772eead 100644 --- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardRoughWallFunction/mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.C +++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutURoughWallFunction/mutURoughWallFunctionFvPatchScalarField.C @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ -#include "mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.H" +#include "mutURoughWallFunctionFvPatchScalarField.H" #include "fvPatchFieldMapper.H" #include "volFields.H" #include "RASModel.H" @@ -41,8 +41,7 @@ namespace RASModels // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // -tmp -mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::calcYPlus +tmp mutURoughWallFunctionFvPatchScalarField::calcYPlus ( const scalarField& magUp ) const @@ -90,7 +89,7 @@ mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::calcYPlus } // Additional tuning parameter (fudge factor) - nominally = 1 - dKsPlusdYPlus *= roughnessFudgeFactor_; + dKsPlusdYPlus *= roughnessFactor_; do { @@ -172,8 +171,7 @@ mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::calcYPlus } -tmp -mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::calcMut() const +tmp mutURoughWallFunctionFvPatchScalarField::calcMut() const { const label patchI = patch().index(); @@ -206,82 +204,76 @@ mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::calcMut() const // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField:: -mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField +mutURoughWallFunctionFvPatchScalarField::mutURoughWallFunctionFvPatchScalarField ( const fvPatch& p, const DimensionedField& iF ) : - mutWallFunctionFvPatchScalarField(p, iF), + mutkWallFunctionFvPatchScalarField(p, iF), roughnessHeight_(pTraits::zero), roughnessConstant_(pTraits::zero), - roughnessFudgeFactor_(pTraits::zero) + roughnessFactor_(pTraits::zero) {} -mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField:: -mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField +mutURoughWallFunctionFvPatchScalarField::mutURoughWallFunctionFvPatchScalarField ( - const mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField& ptf, + const mutURoughWallFunctionFvPatchScalarField& ptf, const fvPatch& p, const DimensionedField& iF, const fvPatchFieldMapper& mapper ) : - mutWallFunctionFvPatchScalarField(ptf, p, iF, mapper), + mutkWallFunctionFvPatchScalarField(ptf, p, iF, mapper), roughnessHeight_(ptf.roughnessHeight_), roughnessConstant_(ptf.roughnessConstant_), - roughnessFudgeFactor_(ptf.roughnessFudgeFactor_) + roughnessFactor_(ptf.roughnessFactor_) {} -mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField:: -mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField +mutURoughWallFunctionFvPatchScalarField::mutURoughWallFunctionFvPatchScalarField ( const fvPatch& p, const DimensionedField& iF, const dictionary& dict ) : - mutWallFunctionFvPatchScalarField(p, iF, dict), + mutkWallFunctionFvPatchScalarField(p, iF, dict), roughnessHeight_(readScalar(dict.lookup("roughnessHeight"))), roughnessConstant_(readScalar(dict.lookup("roughnessConstant"))), - roughnessFudgeFactor_(readScalar(dict.lookup("roughnessFudgeFactor"))) + roughnessFactor_(readScalar(dict.lookup("roughnessFactor"))) {} -mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField:: -mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField +mutURoughWallFunctionFvPatchScalarField::mutURoughWallFunctionFvPatchScalarField ( - const mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField& rwfpsf + const mutURoughWallFunctionFvPatchScalarField& rwfpsf ) : - mutWallFunctionFvPatchScalarField(rwfpsf), + mutkWallFunctionFvPatchScalarField(rwfpsf), roughnessHeight_(rwfpsf.roughnessHeight_), roughnessConstant_(rwfpsf.roughnessConstant_), - roughnessFudgeFactor_(rwfpsf.roughnessFudgeFactor_) + roughnessFactor_(rwfpsf.roughnessFactor_) {} -mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField:: -mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField +mutURoughWallFunctionFvPatchScalarField::mutURoughWallFunctionFvPatchScalarField ( - const mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField& rwfpsf, + const mutURoughWallFunctionFvPatchScalarField& rwfpsf, const DimensionedField& iF ) : - mutWallFunctionFvPatchScalarField(rwfpsf, iF), + mutkWallFunctionFvPatchScalarField(rwfpsf, iF), roughnessHeight_(rwfpsf.roughnessHeight_), roughnessConstant_(rwfpsf.roughnessConstant_), - roughnessFudgeFactor_(rwfpsf.roughnessFudgeFactor_) + roughnessFactor_(rwfpsf.roughnessFactor_) {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -tmp -mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::yPlus() const +tmp mutURoughWallFunctionFvPatchScalarField::yPlus() const { const label patchI = patch().index(); @@ -293,10 +285,7 @@ mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::yPlus() const } -void mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::write -( - Ostream& os -) const +void mutURoughWallFunctionFvPatchScalarField::write(Ostream& os) const { fixedValueFvPatchScalarField::write(os); writeLocalEntries(os); @@ -304,8 +293,8 @@ void mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::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; } @@ -314,7 +303,7 @@ void mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::write makePatchTypeField ( fvPatchScalarField, - mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField + mutURoughWallFunctionFvPatchScalarField ); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardRoughWallFunction/mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutURoughWallFunction/mutURoughWallFunctionFvPatchScalarField.H similarity index 72% rename from src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardRoughWallFunction/mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.H rename to src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutURoughWallFunction/mutURoughWallFunctionFvPatchScalarField.H index ff321bf622..67279322ee 100644 --- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardRoughWallFunction/mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.H +++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutURoughWallFunction/mutURoughWallFunctionFvPatchScalarField.H @@ -23,21 +23,20 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Class - Foam::compressible::RASModels:: - mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField + Foam::compressible::RASModels::mutURoughWallFunctionFvPatchScalarField Description - Wall function boundary condition for rough walls + Wall function boundary condition for rough walls, based on velocity. SourceFiles mutSpalartAllamarasStandardWallFunctionFvPatchScalarField.C \*---------------------------------------------------------------------------*/ -#ifndef compressibleMutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField_H -#define compressibleMutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField_H +#ifndef compressibleMutURoughWallFunctionFvPatchScalarField_H +#define compressibleMutURoughWallFunctionFvPatchScalarField_H -#include "mutWallFunctionFvPatchScalarField.H" +#include "mutkWallFunctionFvPatchScalarField.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -49,12 +48,12 @@ namespace RASModels { /*---------------------------------------------------------------------------*\ -Class mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField Declaration + Class mutURoughWallFunctionFvPatchScalarField Declaration \*---------------------------------------------------------------------------*/ -class mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField +class mutURoughWallFunctionFvPatchScalarField : - public mutWallFunctionFvPatchScalarField + public mutkWallFunctionFvPatchScalarField { protected: @@ -69,7 +68,7 @@ protected: scalar roughnessConstant_; //- Scale factor - scalar roughnessFudgeFactor_; + scalar roughnessFactor_; // Protected member functions @@ -84,20 +83,20 @@ protected: public: //- Runtime type information - TypeName("mutSpalartAllmarasStandardRoughWallFunction"); + TypeName("mutURoughWallFunction"); // Constructors //- Construct from patch and internal field - mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField + mutURoughWallFunctionFvPatchScalarField ( const fvPatch&, const DimensionedField& ); //- Construct from patch, internal field and dictionary - mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField + mutURoughWallFunctionFvPatchScalarField ( const fvPatch&, const DimensionedField&, @@ -105,20 +104,20 @@ public: ); //- Construct by mapping given - // mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField + // mutURoughWallFunctionFvPatchScalarField // onto a new patch - mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField + mutURoughWallFunctionFvPatchScalarField ( - const mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField&, + const mutURoughWallFunctionFvPatchScalarField&, const fvPatch&, const DimensionedField&, const fvPatchFieldMapper& ); //- Construct as copy - mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField + mutURoughWallFunctionFvPatchScalarField ( - const mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField& + const mutURoughWallFunctionFvPatchScalarField& ); //- Construct and return a clone @@ -126,17 +125,14 @@ public: { return tmp ( - new mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField - ( - *this - ) + new mutURoughWallFunctionFvPatchScalarField(*this) ); } //- Construct as copy setting internal field reference - mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField + mutURoughWallFunctionFvPatchScalarField ( - const mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField&, + const mutURoughWallFunctionFvPatchScalarField&, const DimensionedField& ); @@ -148,11 +144,7 @@ public: { return tmp ( - new mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField - ( - *this, - iF - ) + new mutURoughWallFunctionFvPatchScalarField(*this, iF) ); } @@ -186,16 +178,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/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasWallFunction/mutSpalartAllmarasWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutUSpaldingWallFunction/mutUSpaldingWallFunctionFvPatchScalarField.C similarity index 78% rename from src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasWallFunction/mutSpalartAllmarasWallFunctionFvPatchScalarField.C rename to src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutUSpaldingWallFunction/mutUSpaldingWallFunctionFvPatchScalarField.C index dfe1e88cab..0fcfe72c4c 100644 --- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasWallFunction/mutSpalartAllmarasWallFunctionFvPatchScalarField.C +++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutUSpaldingWallFunction/mutUSpaldingWallFunctionFvPatchScalarField.C @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ -#include "mutSpalartAllmarasWallFunctionFvPatchScalarField.H" +#include "mutUSpaldingWallFunctionFvPatchScalarField.H" #include "fvPatchFieldMapper.H" #include "volFields.H" #include "RASModel.H" @@ -41,7 +41,7 @@ namespace RASModels // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // -tmp mutSpalartAllmarasWallFunctionFvPatchScalarField::calcUTau +tmp mutUSpaldingWallFunctionFvPatchScalarField::calcUTau ( const scalarField& magGradU ) const @@ -105,8 +105,7 @@ tmp mutSpalartAllmarasWallFunctionFvPatchScalarField::calcUTau } -tmp -mutSpalartAllmarasWallFunctionFvPatchScalarField::calcMut() const +tmp mutUSpaldingWallFunctionFvPatchScalarField::calcMut() const { const label patchI = patch().index(); @@ -122,67 +121,66 @@ mutSpalartAllmarasWallFunctionFvPatchScalarField::calcMut() const // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -mutSpalartAllmarasWallFunctionFvPatchScalarField:: -mutSpalartAllmarasWallFunctionFvPatchScalarField +mutUSpaldingWallFunctionFvPatchScalarField:: +mutUSpaldingWallFunctionFvPatchScalarField ( const fvPatch& p, const DimensionedField& iF ) : - mutWallFunctionFvPatchScalarField(p, iF) + mutkWallFunctionFvPatchScalarField(p, iF) {} -mutSpalartAllmarasWallFunctionFvPatchScalarField:: -mutSpalartAllmarasWallFunctionFvPatchScalarField +mutUSpaldingWallFunctionFvPatchScalarField:: +mutUSpaldingWallFunctionFvPatchScalarField ( - const mutSpalartAllmarasWallFunctionFvPatchScalarField& ptf, + const mutUSpaldingWallFunctionFvPatchScalarField& ptf, const fvPatch& p, const DimensionedField& iF, const fvPatchFieldMapper& mapper ) : - mutWallFunctionFvPatchScalarField(ptf, p, iF, mapper) + mutkWallFunctionFvPatchScalarField(ptf, p, iF, mapper) {} -mutSpalartAllmarasWallFunctionFvPatchScalarField:: -mutSpalartAllmarasWallFunctionFvPatchScalarField +mutUSpaldingWallFunctionFvPatchScalarField:: +mutUSpaldingWallFunctionFvPatchScalarField ( const fvPatch& p, const DimensionedField& iF, const dictionary& dict ) : - mutWallFunctionFvPatchScalarField(p, iF, dict) + mutkWallFunctionFvPatchScalarField(p, iF, dict) {} -mutSpalartAllmarasWallFunctionFvPatchScalarField:: -mutSpalartAllmarasWallFunctionFvPatchScalarField +mutUSpaldingWallFunctionFvPatchScalarField:: +mutUSpaldingWallFunctionFvPatchScalarField ( - const mutSpalartAllmarasWallFunctionFvPatchScalarField& wfpsf + const mutUSpaldingWallFunctionFvPatchScalarField& wfpsf ) : - mutWallFunctionFvPatchScalarField(wfpsf) + mutkWallFunctionFvPatchScalarField(wfpsf) {} -mutSpalartAllmarasWallFunctionFvPatchScalarField:: -mutSpalartAllmarasWallFunctionFvPatchScalarField +mutUSpaldingWallFunctionFvPatchScalarField:: +mutUSpaldingWallFunctionFvPatchScalarField ( - const mutSpalartAllmarasWallFunctionFvPatchScalarField& wfpsf, + const mutUSpaldingWallFunctionFvPatchScalarField& wfpsf, const DimensionedField& iF ) : - mutWallFunctionFvPatchScalarField(wfpsf, iF) + mutkWallFunctionFvPatchScalarField(wfpsf, iF) {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -tmp -mutSpalartAllmarasWallFunctionFvPatchScalarField::yPlus() const +tmp mutUSpaldingWallFunctionFvPatchScalarField::yPlus() const { const label patchI = patch().index(); @@ -196,10 +194,7 @@ mutSpalartAllmarasWallFunctionFvPatchScalarField::yPlus() const } -void mutSpalartAllmarasWallFunctionFvPatchScalarField::write -( - Ostream& os -) const +void mutUSpaldingWallFunctionFvPatchScalarField::write(Ostream& os) const { fvPatchField::write(os); writeLocalEntries(os); @@ -209,7 +204,11 @@ void mutSpalartAllmarasWallFunctionFvPatchScalarField::write // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -makePatchTypeField(fvPatchScalarField, mutSpalartAllmarasWallFunctionFvPatchScalarField); +makePatchTypeField +( + fvPatchScalarField, + mutUSpaldingWallFunctionFvPatchScalarField +); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasWallFunction/mutSpalartAllmarasWallFunctionFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutUSpaldingWallFunction/mutUSpaldingWallFunctionFvPatchScalarField.H similarity index 75% rename from src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasWallFunction/mutSpalartAllmarasWallFunctionFvPatchScalarField.H rename to src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutUSpaldingWallFunction/mutUSpaldingWallFunctionFvPatchScalarField.H index fc37af6d82..c1ac830de6 100644 --- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasWallFunction/mutSpalartAllmarasWallFunctionFvPatchScalarField.H +++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutUSpaldingWallFunction/mutUSpaldingWallFunctionFvPatchScalarField.H @@ -23,21 +23,20 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Class - Foam::compressible::RASModels:: - mutSpalartAllmarasWallFunctionFvPatchScalarField + Foam::compressible::RASModels::mutUSpaldingWallFunctionFvPatchScalarField Description Wall function boundary condition for walls SourceFiles - mutSpalartAllmarasWallFunctionFvPatchScalarField.C + mutUSpaldingWallFunctionFvPatchScalarField.C \*---------------------------------------------------------------------------*/ -#ifndef compressibleMutSpalartAllmarasWallFunctionFvPatchScalarField_H -#define compressibleMutSpalartAllmarasWallFunctionFvPatchScalarField_H +#ifndef compressibleMutUSpaldingWallFunctionFvPatchScalarField_H +#define compressibleMutUSpaldingWallFunctionFvPatchScalarField_H -#include "mutWallFunctionFvPatchScalarField.H" +#include "mutkWallFunctionFvPatchScalarField.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -49,12 +48,12 @@ namespace RASModels { /*---------------------------------------------------------------------------*\ - Class mutSpalartAllmarasWallFunctionFvPatchScalarField Declaration + Class mutUSpaldingWallFunctionFvPatchScalarField Declaration \*---------------------------------------------------------------------------*/ -class mutSpalartAllmarasWallFunctionFvPatchScalarField +class mutUSpaldingWallFunctionFvPatchScalarField : - public mutWallFunctionFvPatchScalarField + public mutkWallFunctionFvPatchScalarField { protected: @@ -70,20 +69,20 @@ protected: public: //- Runtime type information - TypeName("mutSpalartAllmarasWallFunction"); + TypeName("mutUSpaldingWallFunction"); // Constructors //- Construct from patch and internal field - mutSpalartAllmarasWallFunctionFvPatchScalarField + mutUSpaldingWallFunctionFvPatchScalarField ( const fvPatch&, const DimensionedField& ); //- Construct from patch, internal field and dictionary - mutSpalartAllmarasWallFunctionFvPatchScalarField + mutUSpaldingWallFunctionFvPatchScalarField ( const fvPatch&, const DimensionedField&, @@ -91,20 +90,20 @@ public: ); //- Construct by mapping given - // mutSpalartAllmarasWallFunctionFvPatchScalarField + // mutUSpaldingWallFunctionFvPatchScalarField // onto a new patch - mutSpalartAllmarasWallFunctionFvPatchScalarField + mutUSpaldingWallFunctionFvPatchScalarField ( - const mutSpalartAllmarasWallFunctionFvPatchScalarField&, + const mutUSpaldingWallFunctionFvPatchScalarField&, const fvPatch&, const DimensionedField&, const fvPatchFieldMapper& ); //- Construct as copy - mutSpalartAllmarasWallFunctionFvPatchScalarField + mutUSpaldingWallFunctionFvPatchScalarField ( - const mutSpalartAllmarasWallFunctionFvPatchScalarField& + const mutUSpaldingWallFunctionFvPatchScalarField& ); //- Construct and return a clone @@ -112,14 +111,14 @@ public: { return tmp ( - new mutSpalartAllmarasWallFunctionFvPatchScalarField(*this) + new mutUSpaldingWallFunctionFvPatchScalarField(*this) ); } //- Construct as copy setting internal field reference - mutSpalartAllmarasWallFunctionFvPatchScalarField + mutUSpaldingWallFunctionFvPatchScalarField ( - const mutSpalartAllmarasWallFunctionFvPatchScalarField&, + const mutUSpaldingWallFunctionFvPatchScalarField&, const DimensionedField& ); @@ -131,7 +130,7 @@ public: { return tmp ( - new mutSpalartAllmarasWallFunctionFvPatchScalarField(*this, iF) + new mutUSpaldingWallFunctionFvPatchScalarField(*this, iF) ); } diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardWallFunction/mutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutUWallFunction/mutUWallFunctionFvPatchScalarField.C similarity index 74% rename from src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardWallFunction/mutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C rename to src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutUWallFunction/mutUWallFunctionFvPatchScalarField.C index c2a49ac751..62c8386bbb 100644 --- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardWallFunction/mutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C +++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutUWallFunction/mutUWallFunctionFvPatchScalarField.C @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ -#include "mutSpalartAllmarasStandardWallFunctionFvPatchScalarField.H" +#include "mutUWallFunctionFvPatchScalarField.H" #include "RASModel.H" #include "fvPatchFieldMapper.H" #include "volFields.H" @@ -41,8 +41,7 @@ namespace RASModels // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // -tmp -mutSpalartAllmarasStandardWallFunctionFvPatchScalarField::calcYPlus +tmp mutUWallFunctionFvPatchScalarField::calcYPlus ( const scalarField& magUp ) const @@ -81,8 +80,7 @@ mutSpalartAllmarasStandardWallFunctionFvPatchScalarField::calcYPlus } -tmp -mutSpalartAllmarasStandardWallFunctionFvPatchScalarField::calcMut() const +tmp mutUWallFunctionFvPatchScalarField::calcMut() const { const label patchI = patch().index(); @@ -112,67 +110,61 @@ mutSpalartAllmarasStandardWallFunctionFvPatchScalarField::calcMut() const // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -mutSpalartAllmarasStandardWallFunctionFvPatchScalarField:: -mutSpalartAllmarasStandardWallFunctionFvPatchScalarField +mutUWallFunctionFvPatchScalarField::mutUWallFunctionFvPatchScalarField ( const fvPatch& p, const DimensionedField& iF ) : - mutWallFunctionFvPatchScalarField(p, iF) + mutkWallFunctionFvPatchScalarField(p, iF) {} -mutSpalartAllmarasStandardWallFunctionFvPatchScalarField:: -mutSpalartAllmarasStandardWallFunctionFvPatchScalarField +mutUWallFunctionFvPatchScalarField::mutUWallFunctionFvPatchScalarField ( - const mutSpalartAllmarasStandardWallFunctionFvPatchScalarField& ptf, + const mutUWallFunctionFvPatchScalarField& ptf, const fvPatch& p, const DimensionedField& iF, const fvPatchFieldMapper& mapper ) : - mutWallFunctionFvPatchScalarField(ptf, p, iF, mapper) + mutkWallFunctionFvPatchScalarField(ptf, p, iF, mapper) {} -mutSpalartAllmarasStandardWallFunctionFvPatchScalarField:: -mutSpalartAllmarasStandardWallFunctionFvPatchScalarField +mutUWallFunctionFvPatchScalarField::mutUWallFunctionFvPatchScalarField ( const fvPatch& p, const DimensionedField& iF, const dictionary& dict ) : - mutWallFunctionFvPatchScalarField(p, iF, dict) + mutkWallFunctionFvPatchScalarField(p, iF, dict) {} -mutSpalartAllmarasStandardWallFunctionFvPatchScalarField:: -mutSpalartAllmarasStandardWallFunctionFvPatchScalarField +mutUWallFunctionFvPatchScalarField::mutUWallFunctionFvPatchScalarField ( - const mutSpalartAllmarasStandardWallFunctionFvPatchScalarField& sawfpsf + const mutUWallFunctionFvPatchScalarField& sawfpsf ) : - mutWallFunctionFvPatchScalarField(sawfpsf) + mutkWallFunctionFvPatchScalarField(sawfpsf) {} -mutSpalartAllmarasStandardWallFunctionFvPatchScalarField:: -mutSpalartAllmarasStandardWallFunctionFvPatchScalarField +mutUWallFunctionFvPatchScalarField::mutUWallFunctionFvPatchScalarField ( - const mutSpalartAllmarasStandardWallFunctionFvPatchScalarField& sawfpsf, + const mutUWallFunctionFvPatchScalarField& sawfpsf, const DimensionedField& iF ) : - mutWallFunctionFvPatchScalarField(sawfpsf, iF) + mutkWallFunctionFvPatchScalarField(sawfpsf, iF) {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -tmp -mutSpalartAllmarasStandardWallFunctionFvPatchScalarField::yPlus() const +tmp mutUWallFunctionFvPatchScalarField::yPlus() const { const label patchI = patch().index(); const RASModel& rasModel = db().lookupObject("RASProperties"); @@ -183,10 +175,7 @@ mutSpalartAllmarasStandardWallFunctionFvPatchScalarField::yPlus() const } -void mutSpalartAllmarasStandardWallFunctionFvPatchScalarField::write -( - Ostream& os -) const +void mutUWallFunctionFvPatchScalarField::write(Ostream& os) const { fvPatchField::write(os); writeLocalEntries(os); @@ -199,7 +188,7 @@ void mutSpalartAllmarasStandardWallFunctionFvPatchScalarField::write makePatchTypeField ( fvPatchScalarField, - mutSpalartAllmarasStandardWallFunctionFvPatchScalarField + mutUWallFunctionFvPatchScalarField ); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardWallFunction/mutSpalartAllmarasStandardWallFunctionFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutUWallFunction/mutUWallFunctionFvPatchScalarField.H similarity index 70% rename from src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardWallFunction/mutSpalartAllmarasStandardWallFunctionFvPatchScalarField.H rename to src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutUWallFunction/mutUWallFunctionFvPatchScalarField.H index 409bc0b9eb..5c70b81c44 100644 --- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardWallFunction/mutSpalartAllmarasStandardWallFunctionFvPatchScalarField.H +++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutUWallFunction/mutUWallFunctionFvPatchScalarField.H @@ -23,21 +23,20 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Class - Foam::compressible::RASModels:: - mutSpalartAllmarasStandardWallFunctionFvPatchScalarField + Foam::compressible::RASModels::mutUWallFunctionFvPatchScalarField Description - Wall function boundary condition for walls + Wall function boundary condition for walls, based on velocity. SourceFiles - mutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C + mutUWallFunctionFvPatchScalarField.C \*---------------------------------------------------------------------------*/ -#ifndef compressibleMutSpalartAllmarasStandardWallFunctionFvPatchScalarField_H -#define compressibleMutSpalartAllmarasStandardWallFunctionFvPatchScalarField_H +#ifndef compressibleMutUWallFunctionFvPatchScalarField_H +#define compressibleMutUWallFunctionFvPatchScalarField_H -#include "mutWallFunctionFvPatchScalarField.H" +#include "mutkWallFunctionFvPatchScalarField.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -49,12 +48,12 @@ namespace RASModels { /*---------------------------------------------------------------------------*\ - Class mutSpalartAllmarasStandardWallFunctionFvPatchScalarField Declaration + Class mutUWallFunctionFvPatchScalarField Declaration \*---------------------------------------------------------------------------*/ -class mutSpalartAllmarasStandardWallFunctionFvPatchScalarField +class mutUWallFunctionFvPatchScalarField : - public mutWallFunctionFvPatchScalarField + public mutkWallFunctionFvPatchScalarField { protected: @@ -70,20 +69,20 @@ protected: public: //- Runtime type information - TypeName("mutSpalartAllmarasStandardWallFunction"); + TypeName("mutUWallFunction"); // Constructors //- Construct from patch and internal field - mutSpalartAllmarasStandardWallFunctionFvPatchScalarField + mutUWallFunctionFvPatchScalarField ( const fvPatch&, const DimensionedField& ); //- Construct from patch, internal field and dictionary - mutSpalartAllmarasStandardWallFunctionFvPatchScalarField + mutUWallFunctionFvPatchScalarField ( const fvPatch&, const DimensionedField&, @@ -91,20 +90,20 @@ public: ); //- Construct by mapping given - // mutSpalartAllmarasStandardWallFunctionFvPatchScalarField + // mutUWallFunctionFvPatchScalarField // onto a new patch - mutSpalartAllmarasStandardWallFunctionFvPatchScalarField + mutUWallFunctionFvPatchScalarField ( - const mutSpalartAllmarasStandardWallFunctionFvPatchScalarField&, + const mutUWallFunctionFvPatchScalarField&, const fvPatch&, const DimensionedField&, const fvPatchFieldMapper& ); //- Construct as copy - mutSpalartAllmarasStandardWallFunctionFvPatchScalarField + mutUWallFunctionFvPatchScalarField ( - const mutSpalartAllmarasStandardWallFunctionFvPatchScalarField& + const mutUWallFunctionFvPatchScalarField& ); //- Construct and return a clone @@ -112,17 +111,14 @@ public: { return tmp ( - new mutSpalartAllmarasStandardWallFunctionFvPatchScalarField - ( - *this - ) + new mutUWallFunctionFvPatchScalarField(*this) ); } //- Construct as copy setting internal field reference - mutSpalartAllmarasStandardWallFunctionFvPatchScalarField + mutUWallFunctionFvPatchScalarField ( - const mutSpalartAllmarasStandardWallFunctionFvPatchScalarField&, + const mutUWallFunctionFvPatchScalarField&, const DimensionedField& ); @@ -134,11 +130,7 @@ public: { return tmp ( - new mutSpalartAllmarasStandardWallFunctionFvPatchScalarField - ( - *this, - iF - ) + new mutUWallFunctionFvPatchScalarField(*this, iF) ); } diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutRoughWallFunction/mutRoughWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkRoughWallFunction/mutkRoughWallFunctionFvPatchScalarField.C similarity index 76% rename from src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutRoughWallFunction/mutRoughWallFunctionFvPatchScalarField.C rename to src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkRoughWallFunction/mutkRoughWallFunctionFvPatchScalarField.C index 0eaf6d0e00..6af9687f7b 100644 --- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutRoughWallFunction/mutRoughWallFunctionFvPatchScalarField.C +++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkRoughWallFunction/mutkRoughWallFunctionFvPatchScalarField.C @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ -#include "mutRoughWallFunctionFvPatchScalarField.H" +#include "mutkRoughWallFunctionFvPatchScalarField.H" #include "RASModel.H" #include "fvPatchFieldMapper.H" #include "volFields.H" @@ -39,10 +39,9 @@ namespace compressible namespace RASModels { - // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // -scalar mutRoughWallFunctionFvPatchScalarField::fnRough +scalar mutkRoughWallFunctionFvPatchScalarField::fnRough ( const scalar KsPlus, const scalar Cs @@ -65,7 +64,7 @@ scalar mutRoughWallFunctionFvPatchScalarField::fnRough } -tmp mutRoughWallFunctionFvPatchScalarField::calcMut() const +tmp mutkRoughWallFunctionFvPatchScalarField::calcMut() const { const label patchI = patch().index(); @@ -121,63 +120,63 @@ tmp mutRoughWallFunctionFvPatchScalarField::calcMut() const // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -mutRoughWallFunctionFvPatchScalarField::mutRoughWallFunctionFvPatchScalarField +mutkRoughWallFunctionFvPatchScalarField::mutkRoughWallFunctionFvPatchScalarField ( const fvPatch& p, const DimensionedField& iF ) : - mutWallFunctionFvPatchScalarField(p, iF), + mutkWallFunctionFvPatchScalarField(p, iF), Ks_(p.size(), 0.0), Cs_(p.size(), 0.0) {} -mutRoughWallFunctionFvPatchScalarField::mutRoughWallFunctionFvPatchScalarField +mutkRoughWallFunctionFvPatchScalarField::mutkRoughWallFunctionFvPatchScalarField ( - const mutRoughWallFunctionFvPatchScalarField& ptf, + const mutkRoughWallFunctionFvPatchScalarField& ptf, const fvPatch& p, const DimensionedField& iF, const fvPatchFieldMapper& mapper ) : - mutWallFunctionFvPatchScalarField(ptf, p, iF, mapper), + mutkWallFunctionFvPatchScalarField(ptf, p, iF, mapper), Ks_(ptf.Ks_, mapper), Cs_(ptf.Cs_, mapper) {} -mutRoughWallFunctionFvPatchScalarField::mutRoughWallFunctionFvPatchScalarField +mutkRoughWallFunctionFvPatchScalarField::mutkRoughWallFunctionFvPatchScalarField ( const fvPatch& p, const DimensionedField& iF, const dictionary& dict ) : - mutWallFunctionFvPatchScalarField(p, iF, dict), + mutkWallFunctionFvPatchScalarField(p, iF, dict), Ks_("Ks", dict, p.size()), Cs_("Cs", dict, p.size()) {} -mutRoughWallFunctionFvPatchScalarField::mutRoughWallFunctionFvPatchScalarField +mutkRoughWallFunctionFvPatchScalarField::mutkRoughWallFunctionFvPatchScalarField ( - const mutRoughWallFunctionFvPatchScalarField& rwfpsf + const mutkRoughWallFunctionFvPatchScalarField& rwfpsf ) : - mutWallFunctionFvPatchScalarField(rwfpsf), + mutkWallFunctionFvPatchScalarField(rwfpsf), Ks_(rwfpsf.Ks_), Cs_(rwfpsf.Cs_) {} -mutRoughWallFunctionFvPatchScalarField::mutRoughWallFunctionFvPatchScalarField +mutkRoughWallFunctionFvPatchScalarField::mutkRoughWallFunctionFvPatchScalarField ( - const mutRoughWallFunctionFvPatchScalarField& rwfpsf, + const mutkRoughWallFunctionFvPatchScalarField& rwfpsf, const DimensionedField& iF ) : - mutWallFunctionFvPatchScalarField(rwfpsf, iF), + mutkWallFunctionFvPatchScalarField(rwfpsf, iF), Ks_(rwfpsf.Ks_), Cs_(rwfpsf.Cs_) {} @@ -185,34 +184,34 @@ mutRoughWallFunctionFvPatchScalarField::mutRoughWallFunctionFvPatchScalarField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -void mutRoughWallFunctionFvPatchScalarField::autoMap +void mutkRoughWallFunctionFvPatchScalarField::autoMap ( const fvPatchFieldMapper& m ) { - mutWallFunctionFvPatchScalarField::autoMap(m); + mutkWallFunctionFvPatchScalarField::autoMap(m); Ks_.autoMap(m); Cs_.autoMap(m); } -void mutRoughWallFunctionFvPatchScalarField::rmap +void mutkRoughWallFunctionFvPatchScalarField::rmap ( const fvPatchScalarField& ptf, const labelList& addr ) { - mutWallFunctionFvPatchScalarField::rmap(ptf, addr); + mutkWallFunctionFvPatchScalarField::rmap(ptf, addr); - const mutRoughWallFunctionFvPatchScalarField& nrwfpsf = - refCast(ptf); + const mutkRoughWallFunctionFvPatchScalarField& nrwfpsf = + refCast(ptf); Cs_.rmap(nrwfpsf.Cs_, addr); Ks_.rmap(nrwfpsf.Ks_, addr); } -void mutRoughWallFunctionFvPatchScalarField::write(Ostream& os) const +void mutkRoughWallFunctionFvPatchScalarField::write(Ostream& os) const { fvPatchField::write(os); writeLocalEntries(os); @@ -224,7 +223,11 @@ void mutRoughWallFunctionFvPatchScalarField::write(Ostream& os) const // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -makePatchTypeField(fvPatchScalarField, mutRoughWallFunctionFvPatchScalarField); +makePatchTypeField +( + fvPatchScalarField, + mutkRoughWallFunctionFvPatchScalarField +); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutRoughWallFunction/mutRoughWallFunctionFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkRoughWallFunction/mutkRoughWallFunctionFvPatchScalarField.H similarity index 79% rename from src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutRoughWallFunction/mutRoughWallFunctionFvPatchScalarField.H rename to src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkRoughWallFunction/mutkRoughWallFunctionFvPatchScalarField.H index 935ab29582..479fd7b9ab 100644 --- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutRoughWallFunction/mutRoughWallFunctionFvPatchScalarField.H +++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkRoughWallFunction/mutkRoughWallFunctionFvPatchScalarField.H @@ -27,7 +27,7 @@ Class 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 - mutRoughWallFunctionFvPatchScalarField.C + mutkRoughWallFunctionFvPatchScalarField.C \*---------------------------------------------------------------------------*/ -#ifndef compressibleMutRoughWallFunctionFvPatchScalarField_H -#define compressibleMutRoughWallFunctionFvPatchScalarField_H +#ifndef compressibleMutkRoughWallFunctionFvPatchScalarField_H +#define compressibleMutkRoughWallFunctionFvPatchScalarField_H -#include "mutWallFunctionFvPatchScalarField.H" +#include "mutkWallFunctionFvPatchScalarField.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -55,12 +55,12 @@ namespace RASModels { /*---------------------------------------------------------------------------*\ - Class mutRoughWallFunctionFvPatchScalarField Declaration + Class mutkRoughWallFunctionFvPatchScalarField Declaration \*---------------------------------------------------------------------------*/ -class mutRoughWallFunctionFvPatchScalarField +class mutkRoughWallFunctionFvPatchScalarField : - public mutWallFunctionFvPatchScalarField + public mutkWallFunctionFvPatchScalarField { protected: @@ -85,20 +85,20 @@ protected: public: //- Runtime type information - TypeName("mutRoughWallFunction"); + TypeName("mutkRoughWallFunction"); // Constructors //- Construct from patch and internal field - mutRoughWallFunctionFvPatchScalarField + mutkRoughWallFunctionFvPatchScalarField ( const fvPatch&, const DimensionedField& ); //- Construct from patch, internal field and dictionary - mutRoughWallFunctionFvPatchScalarField + mutkRoughWallFunctionFvPatchScalarField ( const fvPatch&, const DimensionedField&, @@ -106,20 +106,20 @@ public: ); //- Construct by mapping given - // mutRoughWallFunctionFvPatchScalarField + // mutkRoughWallFunctionFvPatchScalarField // onto a new patch - mutRoughWallFunctionFvPatchScalarField + mutkRoughWallFunctionFvPatchScalarField ( - const mutRoughWallFunctionFvPatchScalarField&, + const mutkRoughWallFunctionFvPatchScalarField&, const fvPatch&, const DimensionedField&, const fvPatchFieldMapper& ); //- Construct as copy - mutRoughWallFunctionFvPatchScalarField + mutkRoughWallFunctionFvPatchScalarField ( - const mutRoughWallFunctionFvPatchScalarField& + const mutkRoughWallFunctionFvPatchScalarField& ); //- Construct and return a clone @@ -127,14 +127,14 @@ public: { return tmp ( - new mutRoughWallFunctionFvPatchScalarField(*this) + new mutkRoughWallFunctionFvPatchScalarField(*this) ); } //- Construct as copy setting internal field reference - mutRoughWallFunctionFvPatchScalarField + mutkRoughWallFunctionFvPatchScalarField ( - const mutRoughWallFunctionFvPatchScalarField&, + const mutkRoughWallFunctionFvPatchScalarField&, const DimensionedField& ); @@ -146,7 +146,7 @@ public: { return tmp ( - new mutRoughWallFunctionFvPatchScalarField(*this, iF) + new mutkRoughWallFunctionFvPatchScalarField(*this, iF) ); } @@ -156,10 +156,7 @@ public: // Mapping functions //- Map (and resize as needed) from self given a mapping object - virtual void autoMap - ( - const fvPatchFieldMapper& - ); + virtual void autoMap(const fvPatchFieldMapper&); //- Reverse map the given fvPatchField onto this fvPatchField virtual void rmap diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutWallFunction/mutWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkWallFunction/mutkWallFunctionFvPatchScalarField.C similarity index 82% rename from src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutWallFunction/mutWallFunctionFvPatchScalarField.C rename to src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkWallFunction/mutkWallFunctionFvPatchScalarField.C index 18ea20963c..b7580a5d7a 100644 --- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutWallFunction/mutWallFunctionFvPatchScalarField.C +++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkWallFunction/mutkWallFunctionFvPatchScalarField.C @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ -#include "mutWallFunctionFvPatchScalarField.H" +#include "mutkWallFunctionFvPatchScalarField.H" #include "RASModel.H" #include "fvPatchFieldMapper.H" #include "volFields.H" @@ -42,11 +42,11 @@ namespace RASModels // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // -void mutWallFunctionFvPatchScalarField::checkType() +void mutkWallFunctionFvPatchScalarField::checkType() { if (!isA(patch())) { - FatalErrorIn("mutWallFunctionFvPatchScalarField::checkType()") + FatalErrorIn("mutkWallFunctionFvPatchScalarField::checkType()") << "Invalid wall function specification" << nl << " Patch type for patch " << patch().name() << " must be wall" << nl @@ -56,7 +56,7 @@ void mutWallFunctionFvPatchScalarField::checkType() } -scalar mutWallFunctionFvPatchScalarField::calcYPlusLam +scalar mutkWallFunctionFvPatchScalarField::calcYPlusLam ( const scalar kappa, const scalar E @@ -73,7 +73,7 @@ scalar mutWallFunctionFvPatchScalarField::calcYPlusLam } -tmp mutWallFunctionFvPatchScalarField::calcMut() const +tmp mutkWallFunctionFvPatchScalarField::calcMut() const { const label patchI = patch().index(); const RASModel& rasModel = db().lookupObject("RASProperties"); @@ -105,7 +105,7 @@ tmp mutWallFunctionFvPatchScalarField::calcMut() const } -void mutWallFunctionFvPatchScalarField::writeLocalEntries(Ostream& os) const +void mutkWallFunctionFvPatchScalarField::writeLocalEntries(Ostream& os) const { os.writeKeyword("Cmu") << Cmu_ << token::END_STATEMENT << nl; os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl; @@ -115,7 +115,7 @@ void mutWallFunctionFvPatchScalarField::writeLocalEntries(Ostream& os) const // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -mutWallFunctionFvPatchScalarField::mutWallFunctionFvPatchScalarField +mutkWallFunctionFvPatchScalarField::mutkWallFunctionFvPatchScalarField ( const fvPatch& p, const DimensionedField& iF @@ -129,9 +129,9 @@ mutWallFunctionFvPatchScalarField::mutWallFunctionFvPatchScalarField {} -mutWallFunctionFvPatchScalarField::mutWallFunctionFvPatchScalarField +mutkWallFunctionFvPatchScalarField::mutkWallFunctionFvPatchScalarField ( - const mutWallFunctionFvPatchScalarField& ptf, + const mutkWallFunctionFvPatchScalarField& ptf, const fvPatch& p, const DimensionedField& iF, const fvPatchFieldMapper& mapper @@ -145,7 +145,7 @@ mutWallFunctionFvPatchScalarField::mutWallFunctionFvPatchScalarField {} -mutWallFunctionFvPatchScalarField::mutWallFunctionFvPatchScalarField +mutkWallFunctionFvPatchScalarField::mutkWallFunctionFvPatchScalarField ( const fvPatch& p, const DimensionedField& iF, @@ -160,9 +160,9 @@ mutWallFunctionFvPatchScalarField::mutWallFunctionFvPatchScalarField {} -mutWallFunctionFvPatchScalarField::mutWallFunctionFvPatchScalarField +mutkWallFunctionFvPatchScalarField::mutkWallFunctionFvPatchScalarField ( - const mutWallFunctionFvPatchScalarField& wfpsf + const mutkWallFunctionFvPatchScalarField& wfpsf ) : fixedValueFvPatchScalarField(wfpsf), @@ -173,9 +173,9 @@ mutWallFunctionFvPatchScalarField::mutWallFunctionFvPatchScalarField {} -mutWallFunctionFvPatchScalarField::mutWallFunctionFvPatchScalarField +mutkWallFunctionFvPatchScalarField::mutkWallFunctionFvPatchScalarField ( - const mutWallFunctionFvPatchScalarField& wfpsf, + const mutkWallFunctionFvPatchScalarField& wfpsf, const DimensionedField& iF ) : @@ -189,7 +189,7 @@ mutWallFunctionFvPatchScalarField::mutWallFunctionFvPatchScalarField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -void mutWallFunctionFvPatchScalarField::updateCoeffs() +void mutkWallFunctionFvPatchScalarField::updateCoeffs() { operator==(calcMut()); @@ -197,7 +197,7 @@ void mutWallFunctionFvPatchScalarField::updateCoeffs() } -tmp mutWallFunctionFvPatchScalarField::yPlus() const +tmp mutkWallFunctionFvPatchScalarField::yPlus() const { const label patchI = patch().index(); @@ -214,7 +214,7 @@ tmp mutWallFunctionFvPatchScalarField::yPlus() const } -void mutWallFunctionFvPatchScalarField::write(Ostream& os) const +void mutkWallFunctionFvPatchScalarField::write(Ostream& os) const { fvPatchField::write(os); writeLocalEntries(os); @@ -224,7 +224,7 @@ void mutWallFunctionFvPatchScalarField::write(Ostream& os) const // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -makePatchTypeField(fvPatchScalarField, mutWallFunctionFvPatchScalarField); +makePatchTypeField(fvPatchScalarField, mutkWallFunctionFvPatchScalarField); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutWallFunction/mutWallFunctionFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkWallFunction/mutkWallFunctionFvPatchScalarField.H similarity index 84% rename from src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutWallFunction/mutWallFunctionFvPatchScalarField.H rename to src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkWallFunction/mutkWallFunctionFvPatchScalarField.H index d90bf01e6e..91b930a344 100644 --- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutWallFunction/mutWallFunctionFvPatchScalarField.H +++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkWallFunction/mutkWallFunctionFvPatchScalarField.H @@ -23,15 +23,15 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Class - Foam::compressible::RASModels::mutWallFunctionFvPatchScalarField + Foam::compressible::RASModels::mutkWallFunctionFvPatchScalarField 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 - mutWallFunctionFvPatchScalarField.C + mutkWallFunctionFvPatchScalarField.C \*---------------------------------------------------------------------------*/ @@ -50,10 +50,10 @@ namespace RASModels { /*---------------------------------------------------------------------------*\ - Class mutWallFunctionFvPatchScalarField Declaration + Class mutkWallFunctionFvPatchScalarField Declaration \*---------------------------------------------------------------------------*/ -class mutWallFunctionFvPatchScalarField +class mutkWallFunctionFvPatchScalarField : public fixedValueFvPatchScalarField { @@ -92,20 +92,20 @@ protected: public: //- Runtime type information - TypeName("mutWallFunction"); + TypeName("mutkWallFunction"); // Constructors //- Construct from patch and internal field - mutWallFunctionFvPatchScalarField + mutkWallFunctionFvPatchScalarField ( const fvPatch&, const DimensionedField& ); //- Construct from patch, internal field and dictionary - mutWallFunctionFvPatchScalarField + mutkWallFunctionFvPatchScalarField ( const fvPatch&, const DimensionedField&, @@ -113,20 +113,20 @@ public: ); //- Construct by mapping given - // mutWallFunctionFvPatchScalarField + // mutkWallFunctionFvPatchScalarField // onto a new patch - mutWallFunctionFvPatchScalarField + mutkWallFunctionFvPatchScalarField ( - const mutWallFunctionFvPatchScalarField&, + const mutkWallFunctionFvPatchScalarField&, const fvPatch&, const DimensionedField&, const fvPatchFieldMapper& ); //- Construct as copy - mutWallFunctionFvPatchScalarField + mutkWallFunctionFvPatchScalarField ( - const mutWallFunctionFvPatchScalarField& + const mutkWallFunctionFvPatchScalarField& ); //- Construct and return a clone @@ -134,14 +134,14 @@ public: { return tmp ( - new mutWallFunctionFvPatchScalarField(*this) + new mutkWallFunctionFvPatchScalarField(*this) ); } //- Construct as copy setting internal field reference - mutWallFunctionFvPatchScalarField + mutkWallFunctionFvPatchScalarField ( - const mutWallFunctionFvPatchScalarField&, + const mutkWallFunctionFvPatchScalarField&, const DimensionedField& ); @@ -153,7 +153,7 @@ public: { return tmp ( - new mutWallFunctionFvPatchScalarField(*this, iF) + new mutkWallFunctionFvPatchScalarField(*this, iF) ); }