From e2ad9f08a8a60d68444099c06350bb73962f24b2 Mon Sep 17 00:00:00 2001 From: Andrew Heather <> Date: Wed, 10 Jun 2020 14:26:43 +0100 Subject: [PATCH] COMP: Resolved compiler warning messages --- .../omegaWallFunctionFvPatchScalarField.H | 3 +++ .../atmEpsilonWallFunctionFvPatchScalarField.H | 5 ++++- .../atmOmegaWallFunctionFvPatchScalarField.H | 8 ++++++-- .../atmBuoyancyTurbSource/atmBuoyancyTurbSource.C | 4 ++-- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.H b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.H index 1f022ff119a..00d259f25ee 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.H +++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.H @@ -386,6 +386,9 @@ public: ); } + //- Destructor + virtual ~omegaWallFunctionFvPatchScalarField() = default; + // Member Functions diff --git a/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmEpsilonWallFunction/atmEpsilonWallFunctionFvPatchScalarField.H b/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmEpsilonWallFunction/atmEpsilonWallFunctionFvPatchScalarField.H index 16db3aae49f..26e14fd1f3b 100644 --- a/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmEpsilonWallFunction/atmEpsilonWallFunctionFvPatchScalarField.H +++ b/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmEpsilonWallFunction/atmEpsilonWallFunctionFvPatchScalarField.H @@ -129,7 +129,7 @@ protected: const fvPatch& patch, scalarField& G, scalarField& epsilon - ) override final; + ); public: @@ -200,6 +200,9 @@ public: ); } + //- Destructor + virtual ~atmEpsilonWallFunctionFvPatchScalarField() = default; + // Member Functions diff --git a/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmOmegaWallFunction/atmOmegaWallFunctionFvPatchScalarField.H b/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmOmegaWallFunction/atmOmegaWallFunctionFvPatchScalarField.H index 67b95f60e8c..2746392a0f0 100644 --- a/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmOmegaWallFunction/atmOmegaWallFunctionFvPatchScalarField.H +++ b/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmOmegaWallFunction/atmOmegaWallFunctionFvPatchScalarField.H @@ -127,7 +127,7 @@ protected: const fvPatch& patch, scalarField& G, scalarField& omega - ) override final; + ); public: @@ -199,6 +199,10 @@ public: } + //- Destructor + virtual ~atmOmegaWallFunctionFvPatchScalarField() = default; + + // Member Functions // Mapping functions @@ -217,7 +221,7 @@ public: // I-O //- Write - virtual void write(Ostream&) const override; + virtual void write(Ostream&) const; }; diff --git a/src/atmosphericModels/fvOptions/atmBuoyancyTurbSource/atmBuoyancyTurbSource.C b/src/atmosphericModels/fvOptions/atmBuoyancyTurbSource/atmBuoyancyTurbSource.C index afa1a1da720..b1ed0588c1d 100644 --- a/src/atmosphericModels/fvOptions/atmBuoyancyTurbSource/atmBuoyancyTurbSource.C +++ b/src/atmosphericModels/fvOptions/atmBuoyancyTurbSource/atmBuoyancyTurbSource.C @@ -80,7 +80,7 @@ Foam::fv::atmBuoyancyTurbSource::calcC3 // (ARAL:Eq. 10), with a typo of (C2_) instead of using (C2_ - 1.0) volScalarField::Internal alphaB(1.0 - LbyLmax); - alphaB == + alphaB = neg0(Rig)*(1.0 - (1.0 + (C2_ - 1.0)/(C2_ - C1_))*LbyLmax) + pos(Rig)*(1.0 - LbyLmax); @@ -114,7 +114,7 @@ Foam::fv::atmBuoyancyTurbSource::calcC3 // (ARAL:Eq. 10) volScalarField::Internal alphaB(1.0 - LbyLmax); - alphaB == + alphaB = neg0(Rig)*(1.0 - (1.0 + beta/(beta - gamma))*LbyLmax) + pos(Rig)*(1.0 - LbyLmax); -- GitLab