From fedf58824529d54f4c4b01c7a7e1c91cc7ed1020 Mon Sep 17 00:00:00 2001 From: Andrew Heather <a.heather@opencfd.co.uk> Date: Fri, 15 Sep 2017 10:38:10 +0100 Subject: [PATCH] STYLE: Minor code style updates --- src/ODE/ODESolvers/RKDP45/RKDP45.H | 2 +- .../IncompressibleTurbulenceModel.C | 9 +++------ .../nutUWallFunctionFvPatchScalarField.C | 2 +- .../nutkWallFunctionFvPatchScalarField.C | 3 +-- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/ODE/ODESolvers/RKDP45/RKDP45.H b/src/ODE/ODESolvers/RKDP45/RKDP45.H index f09c894e044..62ec247c677 100644 --- a/src/ODE/ODESolvers/RKDP45/RKDP45.H +++ b/src/ODE/ODESolvers/RKDP45/RKDP45.H @@ -28,7 +28,7 @@ Group grpODESolvers Description - 4/5th Order Dormand–Prince Runge-Kutta ODE solver. + 4/5th Order Dormand-Prince Runge-Kutta ODE solver. References: \verbatim diff --git a/src/TurbulenceModels/incompressible/IncompressibleTurbulenceModel/IncompressibleTurbulenceModel.C b/src/TurbulenceModels/incompressible/IncompressibleTurbulenceModel/IncompressibleTurbulenceModel.C index 253b1a0cb07..69e347ecdc8 100644 --- a/src/TurbulenceModels/incompressible/IncompressibleTurbulenceModel/IncompressibleTurbulenceModel.C +++ b/src/TurbulenceModels/incompressible/IncompressibleTurbulenceModel/IncompressibleTurbulenceModel.C @@ -118,8 +118,7 @@ Foam::IncompressibleTurbulenceModel<TransportModel>::divDevReff template<class TransportModel> Foam::tmp<Foam::volSymmTensorField> -Foam::IncompressibleTurbulenceModel<TransportModel>:: -devRhoReff() const +Foam::IncompressibleTurbulenceModel<TransportModel>::devRhoReff() const { NotImplemented; @@ -129,8 +128,7 @@ devRhoReff() const template<class TransportModel> Foam::tmp<Foam::fvVectorMatrix> -Foam::IncompressibleTurbulenceModel<TransportModel>:: -divDevRhoReff +Foam::IncompressibleTurbulenceModel<TransportModel>::divDevRhoReff ( volVectorField& U ) const @@ -143,8 +141,7 @@ divDevRhoReff template<class TransportModel> Foam::tmp<Foam::fvVectorMatrix> -Foam::IncompressibleTurbulenceModel<TransportModel>:: -divDevRhoReff +Foam::IncompressibleTurbulenceModel<TransportModel>::divDevRhoReff ( const volScalarField& rho, volVectorField& U diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.C index e281b04d69b..fb67a8560ad 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.C +++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.C @@ -54,7 +54,7 @@ tmp<scalarField> nutUWallFunctionFvPatchScalarField::calcNut() const const scalarField& nuw = tnuw(); tmp<scalarField> tyPlus = calcYPlus(magUp); - scalarField& yPlus = tyPlus.ref(); + const scalarField& yPlus = tyPlus(); tmp<scalarField> tnutw(new scalarField(patch().size(), 0.0)); scalarField& nutw = tnutw.ref(); diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.C index c88e12919e6..7716c669086 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.C +++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.C @@ -151,8 +151,7 @@ tmp<scalarField> nutkWallFunctionFvPatchScalarField::yPlus() const const tmp<volScalarField> tk = turbModel.k(); const volScalarField& k = tk(); tmp<scalarField> kwc = k.boundaryField()[patchi].patchInternalField(); - const tmp<scalarField> tnuw = turbModel.nu(patchi); - const scalarField& nuw = tnuw(); + tmp<scalarField> nuw = turbModel.nu(patchi); return pow025(Cmu_)*y*sqrt(kwc)/nuw; } -- GitLab