From b2610f19db2cb68bb94c3f515d385c706a995146 Mon Sep 17 00:00:00 2001 From: Kutalmis Bercin Date: Fri, 16 Jul 2021 13:39:05 +0100 Subject: [PATCH] ENH: wall functions: remove redundant and inconsistent virtual specifiers --- .../nutUBlendedWallFunctionFvPatchScalarField.H | 2 +- .../nutURoughWallFunctionFvPatchScalarField.H | 6 +++--- .../nutUSpaldingWallFunctionFvPatchScalarField.H | 4 ++-- .../nutUTabulatedWallFunctionFvPatchScalarField.H | 2 +- .../nutUWallFunction/nutUWallFunctionFvPatchScalarField.H | 6 +++--- .../nutkFilmWallFunctionFvPatchScalarField.H | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUBlendedWallFunction/nutUBlendedWallFunctionFvPatchScalarField.H b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUBlendedWallFunction/nutUBlendedWallFunctionFvPatchScalarField.H index ca600eb44e..3f84c8be6f 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUBlendedWallFunction/nutUBlendedWallFunctionFvPatchScalarField.H +++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUBlendedWallFunction/nutUBlendedWallFunctionFvPatchScalarField.H @@ -129,7 +129,7 @@ protected: virtual tmp calcNut() const; //- Calculate the friction velocity - virtual tmp calcUTau(const scalarField& magGradU) const; + tmp calcUTau(const scalarField& magGradU) const; //- Write local wall function variables void writeLocalEntries(Ostream&) const; diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.H b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.H index 4c5593c1c2..9a9e747781 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.H +++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.H @@ -121,12 +121,12 @@ class nutURoughWallFunctionFvPatchScalarField // Protected Member Functions - //- Calculate yPlus - virtual tmp calcYPlus(const scalarField& magUp) const; - //- Calculate the turbulence viscosity virtual tmp calcNut() const; + //- Calculate yPlus + tmp calcYPlus(const scalarField& magUp) const; + //- Write local wall function variables void writeLocalEntries(Ostream&) const; diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.H b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.H index d1527a1a8f..09935152a5 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.H +++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.H @@ -134,11 +134,11 @@ protected: virtual tmp calcNut() const; //- Calculate the friction velocity - virtual tmp calcUTau(const scalarField& magGradU) const; + tmp calcUTau(const scalarField& magGradU) const; //- Calculate the friction velocity and number of iterations for //- convergence - virtual tmp calcUTau + tmp calcUTau ( const scalarField& magGradU, const label maxIter, diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.H b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.H index 1ff5fd539f..18cb127738 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.H +++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.H @@ -110,7 +110,7 @@ protected: virtual tmp calcNut() const; //- Calculate wall u+ from table - virtual tmp calcUPlus(const scalarField& Rey) const; + tmp calcUPlus(const scalarField& Rey) const; //- Write local wall function variables void writeLocalEntries(Ostream&) const; diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.H b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.H index 98769df0c1..9b96cb2b68 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.H +++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.H @@ -93,12 +93,12 @@ protected: // Protected Member Functions - //- Calculate yPlus - virtual tmp calcYPlus(const scalarField& magUp) const; - //- Calculate the turbulent viscosity virtual tmp calcNut() const; + //- Calculate yPlus + tmp calcYPlus(const scalarField& magUp) const; + //- Write local wall function variables void writeLocalEntries(Ostream&) const; diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.H b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.H index 9ac4f28c59..d7ebbf2c45 100644 --- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.H +++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.H @@ -112,7 +112,7 @@ protected: virtual tmp calcNut() const; //- Calculate the friction velocity - virtual tmp calcUTau(const scalarField& magGradU) const; + tmp calcUTau(const scalarField& magGradU) const; //- Write local wall function variables void writeLocalEntries(Ostream&) const;