From d98c83e62bc367546888881e20b4571b14cfc81c Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Tue, 7 Apr 2020 11:07:31 +0100 Subject: [PATCH] TurbulenceModels: Removed the redundant propertiesName constructor and selector argument The ability to specify the file name of the turbulenceProperties dictionary during construction was added to support multi-phases but now that the handling of the phase name extension has been completely rationalised and standardised this complexity and code clutter is no longer used, needed or appropriate. --- .../kineticTheoryModel/kineticTheoryModel.C | 4 +- .../kineticTheoryModel/kineticTheoryModel.H | 1 - .../phasePressureModel/phasePressureModel.C | 4 +- .../phasePressureModel/phasePressureModel.H | 1 - .../kineticTheoryModel/kineticTheoryModel.C | 6 +-- .../kineticTheoryModel/kineticTheoryModel.H | 3 +- .../phasePressureModel/phasePressureModel.C | 6 +-- .../phasePressureModel/phasePressureModel.H | 3 +- .../CompressibleTurbulenceModel.C | 14 ++---- .../CompressibleTurbulenceModel.H | 8 ++-- .../EddyDiffusivity/EddyDiffusivity.C | 8 ++-- .../EddyDiffusivity/EddyDiffusivity.H | 5 +- .../RAS/buoyantKEpsilon/buoyantKEpsilon.C | 4 +- .../RAS/buoyantKEpsilon/buoyantKEpsilon.H | 3 +- .../ThermalDiffusivity/ThermalDiffusivity.C | 20 +++----- .../ThermalDiffusivity/ThermalDiffusivity.H | 11 ++--- .../compressibleTurbulenceModel.C | 8 ++-- .../compressibleTurbulenceModel.H | 5 +- .../turbulentFluidThermoModel.C | 8 ++-- .../turbulentFluidThermoModel.H | 5 +- .../IncompressibleTurbulenceModel.C | 14 ++---- .../IncompressibleTurbulenceModel.H | 8 ++-- .../incompressibleTurbulenceModel.C | 8 ++-- .../incompressibleTurbulenceModel.H | 5 +- .../RAS/LamBremhorstKE/LamBremhorstKE.C | 6 +-- .../RAS/LamBremhorstKE/LamBremhorstKE.H | 3 +- .../RAS/LienCubicKE/LienCubicKE.C | 6 +-- .../RAS/LienCubicKE/LienCubicKE.H | 3 +- .../RAS/LienLeschziner/LienLeschziner.C | 6 +-- .../RAS/LienLeschziner/LienLeschziner.H | 3 +- .../RAS/ShihQuadraticKE/ShihQuadraticKE.C | 6 +-- .../RAS/ShihQuadraticKE/ShihQuadraticKE.H | 3 +- .../RAS/kkLOmega/kkLOmega.C | 6 +-- .../RAS/kkLOmega/kkLOmega.H | 3 +- .../RAS/qZeta/qZeta.C | 6 +-- .../RAS/qZeta/qZeta.H | 3 +- .../turbulentTransportModel.C | 8 ++-- .../turbulentTransportModel.H | 5 +- .../phaseCompressible/LES/Niceno/NicenoKEqn.C | 4 +- .../phaseCompressible/LES/Niceno/NicenoKEqn.H | 3 +- .../LES/SmagorinskyZhang/SmagorinskyZhang.C | 4 +- .../LES/SmagorinskyZhang/SmagorinskyZhang.H | 1 - .../LES/continuousGasKEqn/continuousGasKEqn.C | 4 +- .../LES/continuousGasKEqn/continuousGasKEqn.H | 3 +- .../PhaseCompressibleTurbulenceModel.C | 14 ++---- .../PhaseCompressibleTurbulenceModel.H | 8 ++-- .../RAS/LaheyKEpsilon/LaheyKEpsilon.C | 4 +- .../RAS/LaheyKEpsilon/LaheyKEpsilon.H | 3 +- .../continuousGasKEpsilon.C | 4 +- .../continuousGasKEpsilon.H | 3 +- .../RAS/kOmegaSSTSato/kOmegaSSTSato.C | 4 +- .../RAS/kOmegaSSTSato/kOmegaSSTSato.H | 3 +- .../RAS/mixtureKEpsilon/mixtureKEpsilon.C | 6 +-- .../RAS/mixtureKEpsilon/mixtureKEpsilon.H | 3 +- .../PhaseIncompressibleTurbulenceModel.C | 14 ++---- .../PhaseIncompressibleTurbulenceModel.H | 8 ++-- .../Base/kOmegaSST/kOmegaSSTBase.C | 8 ++-- .../Base/kOmegaSST/kOmegaSSTBase.H | 5 +- .../DeardorffDiffStress/DeardorffDiffStress.C | 6 +-- .../DeardorffDiffStress/DeardorffDiffStress.H | 3 +- .../turbulenceModels/LES/LESModel/LESModel.C | 47 ++++++++++--------- .../turbulenceModels/LES/LESModel/LESModel.H | 13 ++--- .../LES/LESeddyViscosity/LESeddyViscosity.C | 8 ++-- .../LES/LESeddyViscosity/LESeddyViscosity.H | 5 +- .../LES/Smagorinsky/Smagorinsky.C | 6 +-- .../LES/Smagorinsky/Smagorinsky.H | 3 +- .../SpalartAllmarasDDES/SpalartAllmarasDDES.C | 6 +-- .../SpalartAllmarasDDES/SpalartAllmarasDDES.H | 3 +- .../SpalartAllmarasDES/SpalartAllmarasDES.C | 6 +-- .../SpalartAllmarasDES/SpalartAllmarasDES.H | 3 +- .../SpalartAllmarasIDDES.C | 6 +-- .../SpalartAllmarasIDDES.H | 3 +- .../turbulenceModels/LES/WALE/WALE.C | 6 +-- .../turbulenceModels/LES/WALE/WALE.H | 3 +- .../LES/dynamicKEqn/dynamicKEqn.C | 6 +-- .../LES/dynamicKEqn/dynamicKEqn.H | 3 +- .../LES/dynamicLagrangian/dynamicLagrangian.C | 6 +-- .../LES/dynamicLagrangian/dynamicLagrangian.H | 3 +- .../turbulenceModels/LES/kEqn/kEqn.C | 6 +-- .../turbulenceModels/LES/kEqn/kEqn.H | 3 +- .../LES/kOmegaSSTDES/kOmegaSSTDES.C | 6 +-- .../LES/kOmegaSSTDES/kOmegaSSTDES.H | 3 +- .../turbulenceModels/RAS/LRR/LRR.C | 6 +-- .../turbulenceModels/RAS/LRR/LRR.H | 3 +- .../RAS/LaunderSharmaKE/LaunderSharmaKE.C | 6 +-- .../RAS/LaunderSharmaKE/LaunderSharmaKE.H | 3 +- .../turbulenceModels/RAS/RASModel/RASModel.C | 47 ++++++++++--------- .../turbulenceModels/RAS/RASModel/RASModel.H | 13 ++--- .../RAS/RNGkEpsilon/RNGkEpsilon.C | 6 +-- .../RAS/RNGkEpsilon/RNGkEpsilon.H | 3 +- .../turbulenceModels/RAS/SSG/SSG.C | 6 +-- .../turbulenceModels/RAS/SSG/SSG.H | 3 +- .../RAS/SpalartAllmaras/SpalartAllmaras.C | 6 +-- .../RAS/SpalartAllmaras/SpalartAllmaras.H | 3 +- .../turbulenceModels/RAS/kEpsilon/kEpsilon.C | 6 +-- .../turbulenceModels/RAS/kEpsilon/kEpsilon.H | 3 +- .../turbulenceModels/RAS/kOmega/kOmega.C | 6 +-- .../turbulenceModels/RAS/kOmega/kOmega.H | 3 +- .../RAS/kOmegaSST/kOmegaSST.C | 6 +-- .../RAS/kOmegaSST/kOmegaSST.H | 3 +- .../RAS/kOmegaSSTLM/kOmegaSSTLM.C | 6 +-- .../RAS/kOmegaSSTLM/kOmegaSSTLM.H | 3 +- .../RAS/kOmegaSSTSAS/kOmegaSSTSAS.C | 6 +-- .../RAS/kOmegaSSTSAS/kOmegaSSTSAS.H | 3 +- .../RAS/realizableKE/realizableKE.C | 6 +-- .../RAS/realizableKE/realizableKE.H | 3 +- .../turbulenceModels/RAS/v2f/v2f.C | 6 +-- .../turbulenceModels/RAS/v2f/v2f.H | 3 +- .../ReynoldsStress/ReynoldsStress.C | 8 ++-- .../ReynoldsStress/ReynoldsStress.H | 5 +- .../TurbulenceModel/TurbulenceModel.C | 19 ++++---- .../TurbulenceModel/TurbulenceModel.H | 13 ++--- .../eddyViscosity/eddyViscosity.C | 8 ++-- .../eddyViscosity/eddyViscosity.H | 5 +- .../laminar/Giesekus/Giesekus.C | 2 - .../laminar/Giesekus/Giesekus.H | 1 - .../laminar/Maxwell/Maxwell.C | 4 +- .../laminar/Maxwell/Maxwell.H | 1 - .../turbulenceModels/laminar/PTT/PTT.C | 2 - .../turbulenceModels/laminar/PTT/PTT.H | 1 - .../turbulenceModels/laminar/Stokes/Stokes.C | 8 ++-- .../turbulenceModels/laminar/Stokes/Stokes.H | 8 ++-- .../generalizedNewtonian.C | 8 ++-- .../generalizedNewtonian.H | 8 ++-- .../laminar/laminarModel/laminarModel.C | 29 ++++++------ .../laminar/laminarModel/laminarModel.H | 13 ++--- .../linearViscousStress/linearViscousStress.C | 8 ++-- .../linearViscousStress/linearViscousStress.H | 5 +- .../nonlinearEddyViscosity.C | 8 ++-- .../nonlinearEddyViscosity.H | 5 +- .../turbulenceModels/turbulenceModel.C | 5 +- .../turbulenceModels/turbulenceModel.H | 5 +- .../kEpsilonLopesdaCosta.C | 6 +-- .../kEpsilonLopesdaCosta.H | 3 +- 134 files changed, 321 insertions(+), 533 deletions(-) diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C index 5e17ad7960..44891b0fc7 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C @@ -70,7 +70,6 @@ Foam::RASModels::kineticTheoryModel::kineticTheoryModel const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& phase, - const word& propertiesName, const word& type ) : @@ -85,8 +84,7 @@ Foam::RASModels::kineticTheoryModel::kineticTheoryModel U, alphaRhoPhi, phi, - phase, - propertiesName + phase ), phase_(phase), diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H index 994ef55e74..e40586df36 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H @@ -173,7 +173,6 @@ public: const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const phaseModel& transport, - const word& propertiesName = turbulenceModel::propertiesName, const word& type = typeName ); diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C index 2a03118f33..c978c0ae22 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C @@ -35,7 +35,6 @@ Foam::RASModels::phasePressureModel::phasePressureModel const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& phase, - const word& propertiesName, const word& type ) : @@ -50,8 +49,7 @@ Foam::RASModels::phasePressureModel::phasePressureModel U, alphaRhoPhi, phi, - phase, - propertiesName + phase ), alphaMax_(coeffDict_.lookup("alphaMax")), diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H index cf9010869d..6b2bbcf367 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H @@ -115,7 +115,6 @@ public: const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const phaseModel& transport, - const word& propertiesName = turbulenceModel::propertiesName, const word& type = typeName ); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C index 280b28e9dc..edd2eb32e6 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -38,7 +38,6 @@ Foam::RASModels::kineticTheoryModel::kineticTheoryModel const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& phase, - const word& propertiesName, const word& type ) : @@ -53,8 +52,7 @@ Foam::RASModels::kineticTheoryModel::kineticTheoryModel U, alphaRhoPhi, phi, - phase, - propertiesName + phase ), phase_(phase), diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H index 1b815c5bfa..e334d8e559 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -165,7 +165,6 @@ public: const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const phaseModel& transport, - const word& propertiesName = turbulenceModel::propertiesName, const word& type = typeName ); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C index 10dfbf1f90..b22eb73235 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -36,7 +36,6 @@ Foam::RASModels::phasePressureModel::phasePressureModel const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& phase, - const word& propertiesName, const word& type ) : @@ -54,8 +53,7 @@ Foam::RASModels::phasePressureModel::phasePressureModel U, alphaRhoPhi, phi, - phase, - propertiesName + phase ), alphaMax_(coeffDict_.lookup("alphaMax")), diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H index 98c220f9e3..049695e226 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -119,7 +119,6 @@ public: const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const phaseModel& transport, - const word& propertiesName = turbulenceModel::propertiesName, const word& type = typeName ); diff --git a/src/TurbulenceModels/compressible/CompressibleTurbulenceModel/CompressibleTurbulenceModel.C b/src/TurbulenceModels/compressible/CompressibleTurbulenceModel/CompressibleTurbulenceModel.C index 9466b1242a..169ff4f243 100644 --- a/src/TurbulenceModels/compressible/CompressibleTurbulenceModel/CompressibleTurbulenceModel.C +++ b/src/TurbulenceModels/compressible/CompressibleTurbulenceModel/CompressibleTurbulenceModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -37,8 +37,7 @@ CompressibleTurbulenceModel const volVectorField& U, const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, - const transportModel& transport, - const word& propertiesName + const transportModel& transport ) : TurbulenceModel @@ -54,8 +53,7 @@ CompressibleTurbulenceModel U, alphaRhoPhi, phi, - transport, - propertiesName + transport ) {} @@ -69,8 +67,7 @@ Foam::CompressibleTurbulenceModel::New const volScalarField& rho, const volVectorField& U, const surfaceScalarField& phi, - const transportModel& transport, - const word& propertiesName + const transportModel& transport ) { return autoPtr @@ -89,8 +86,7 @@ Foam::CompressibleTurbulenceModel::New U, phi, phi, - transport, - propertiesName + transport ).ptr()) ); } diff --git a/src/TurbulenceModels/compressible/CompressibleTurbulenceModel/CompressibleTurbulenceModel.H b/src/TurbulenceModels/compressible/CompressibleTurbulenceModel/CompressibleTurbulenceModel.H index ecb85c9a1e..bd85ebb682 100644 --- a/src/TurbulenceModels/compressible/CompressibleTurbulenceModel/CompressibleTurbulenceModel.H +++ b/src/TurbulenceModels/compressible/CompressibleTurbulenceModel/CompressibleTurbulenceModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -78,8 +78,7 @@ public: const volVectorField& U, const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, - const transportModel& transport, - const word& propertiesName + const transportModel& transport ); @@ -91,8 +90,7 @@ public: const volScalarField& rho, const volVectorField& U, const surfaceScalarField& phi, - const transportModel& transportModel, - const word& propertiesName = turbulenceModel::propertiesName + const transportModel& transportModel ); diff --git a/src/TurbulenceModels/compressible/EddyDiffusivity/EddyDiffusivity.C b/src/TurbulenceModels/compressible/EddyDiffusivity/EddyDiffusivity.C index 0353d8f7c7..3cb80284d1 100644 --- a/src/TurbulenceModels/compressible/EddyDiffusivity/EddyDiffusivity.C +++ b/src/TurbulenceModels/compressible/EddyDiffusivity/EddyDiffusivity.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2015-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -54,8 +54,7 @@ Foam::EddyDiffusivity::EddyDiffusivity const volVectorField& U, const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, - const transportModel& transport, - const word& propertiesName + const transportModel& transport ) : BasicTurbulenceModel @@ -66,8 +65,7 @@ Foam::EddyDiffusivity::EddyDiffusivity U, alphaRhoPhi, phi, - transport, - propertiesName + transport ), // Cannot read Prt yet diff --git a/src/TurbulenceModels/compressible/EddyDiffusivity/EddyDiffusivity.H b/src/TurbulenceModels/compressible/EddyDiffusivity/EddyDiffusivity.H index 5bdd757786..cfb006e63a 100644 --- a/src/TurbulenceModels/compressible/EddyDiffusivity/EddyDiffusivity.H +++ b/src/TurbulenceModels/compressible/EddyDiffusivity/EddyDiffusivity.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2015-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -87,8 +87,7 @@ public: const volVectorField& U, const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, - const transportModel& transport, - const word& propertiesName + const transportModel& transport ); diff --git a/src/TurbulenceModels/compressible/RAS/buoyantKEpsilon/buoyantKEpsilon.C b/src/TurbulenceModels/compressible/RAS/buoyantKEpsilon/buoyantKEpsilon.C index b0c315cd2b..fb58c27321 100644 --- a/src/TurbulenceModels/compressible/RAS/buoyantKEpsilon/buoyantKEpsilon.C +++ b/src/TurbulenceModels/compressible/RAS/buoyantKEpsilon/buoyantKEpsilon.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2014-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -46,7 +46,6 @@ buoyantKEpsilon::buoyantKEpsilon const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName, const word& type ) : @@ -58,7 +57,6 @@ buoyantKEpsilon::buoyantKEpsilon alphaRhoPhi, phi, transport, - propertiesName, type ), diff --git a/src/TurbulenceModels/compressible/RAS/buoyantKEpsilon/buoyantKEpsilon.H b/src/TurbulenceModels/compressible/RAS/buoyantKEpsilon/buoyantKEpsilon.H index 12864a762a..533ef34f2d 100644 --- a/src/TurbulenceModels/compressible/RAS/buoyantKEpsilon/buoyantKEpsilon.H +++ b/src/TurbulenceModels/compressible/RAS/buoyantKEpsilon/buoyantKEpsilon.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2014-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -118,7 +118,6 @@ public: const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName = turbulenceModel::propertiesName, const word& type = typeName ); diff --git a/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.C b/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.C index 4534ff3fe2..132da439ca 100644 --- a/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.C +++ b/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2015-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -36,8 +36,7 @@ Foam::ThermalDiffusivity::ThermalDiffusivity const volVectorField& U, const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, - const transportModel& transport, - const word& propertiesName + const transportModel& transport ) : BasicTurbulenceModel @@ -48,8 +47,7 @@ Foam::ThermalDiffusivity::ThermalDiffusivity U, alphaRhoPhi, phi, - transport, - propertiesName + transport ) {} @@ -65,8 +63,7 @@ Foam::ThermalDiffusivity::New const volVectorField& U, const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, - const transportModel& transport, - const word& propertiesName + const transportModel& transport ) { return autoPtr @@ -79,8 +76,7 @@ Foam::ThermalDiffusivity::New U, alphaRhoPhi, phi, - transport, - propertiesName + transport ).ptr()) ); } @@ -93,8 +89,7 @@ Foam::ThermalDiffusivity::New const volScalarField& rho, const volVectorField& U, const surfaceScalarField& phi, - const transportModel& transport, - const word& propertiesName + const transportModel& transport ) { return autoPtr @@ -105,8 +100,7 @@ Foam::ThermalDiffusivity::New rho, U, phi, - transport, - propertiesName + transport ).ptr()) ); } diff --git a/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.H b/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.H index 511c8be311..23d4a6e1f8 100644 --- a/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.H +++ b/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2015-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -69,8 +69,7 @@ public: const volVectorField& U, const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, - const transportModel& transport, - const word& propertiesName + const transportModel& transport ); @@ -84,8 +83,7 @@ public: const volVectorField& U, const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, - const transportModel& transportModel, - const word& propertiesName = turbulenceModel::propertiesName + const transportModel& transportModel ); @@ -95,8 +93,7 @@ public: const volScalarField& rho, const volVectorField& U, const surfaceScalarField& phi, - const transportModel& transportModel, - const word& propertiesName = turbulenceModel::propertiesName + const transportModel& transportModel ); diff --git a/src/TurbulenceModels/compressible/compressibleTurbulenceModel.C b/src/TurbulenceModels/compressible/compressibleTurbulenceModel.C index 66a361278e..0c1f78f215 100644 --- a/src/TurbulenceModels/compressible/compressibleTurbulenceModel.C +++ b/src/TurbulenceModels/compressible/compressibleTurbulenceModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -42,16 +42,14 @@ Foam::compressibleTurbulenceModel::compressibleTurbulenceModel const volScalarField& rho, const volVectorField& U, const surfaceScalarField& alphaRhoPhi, - const surfaceScalarField& phi, - const word& propertiesName + const surfaceScalarField& phi ) : turbulenceModel ( U, alphaRhoPhi, - phi, - propertiesName + phi ), rho_(rho) {} diff --git a/src/TurbulenceModels/compressible/compressibleTurbulenceModel.H b/src/TurbulenceModels/compressible/compressibleTurbulenceModel.H index 09f7e1a58e..2a739ab58c 100644 --- a/src/TurbulenceModels/compressible/compressibleTurbulenceModel.H +++ b/src/TurbulenceModels/compressible/compressibleTurbulenceModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -83,8 +83,7 @@ public: const volScalarField& rho, const volVectorField& U, const surfaceScalarField& alphaRhoPhi, - const surfaceScalarField& phi, - const word& propertiesName + const surfaceScalarField& phi ); //- Disallow default bitwise copy construction diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.C index b553714d54..4e78e05f16 100644 --- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.C +++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2015-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -38,8 +38,7 @@ namespace Foam const volVectorField& U, const surfaceScalarField& phi, const typename BasicCompressibleTurbulenceModel::transportModel& - transport, - const word& propertiesName + transport ) { return BasicCompressibleTurbulenceModel::New @@ -49,8 +48,7 @@ namespace Foam U, phi, phi, - transport, - propertiesName + transport ); } } diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.H index 323ca53c7c..1fc2274514 100644 --- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.H +++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2015-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -71,8 +71,7 @@ namespace Foam const volVectorField& U, const surfaceScalarField& phi, const typename BasicCompressibleTurbulenceModel::transportModel& - transport, - const word& propertiesName = turbulenceModel::propertiesName + transport ); } } diff --git a/src/TurbulenceModels/incompressible/IncompressibleTurbulenceModel/IncompressibleTurbulenceModel.C b/src/TurbulenceModels/incompressible/IncompressibleTurbulenceModel/IncompressibleTurbulenceModel.C index 832cca1daa..0ea276a629 100644 --- a/src/TurbulenceModels/incompressible/IncompressibleTurbulenceModel/IncompressibleTurbulenceModel.C +++ b/src/TurbulenceModels/incompressible/IncompressibleTurbulenceModel/IncompressibleTurbulenceModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -37,8 +37,7 @@ IncompressibleTurbulenceModel const volVectorField& U, const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, - const TransportModel& transport, - const word& propertiesName + const TransportModel& transport ) : TurbulenceModel @@ -54,8 +53,7 @@ IncompressibleTurbulenceModel U, alphaRhoPhi, phi, - transport, - propertiesName + transport ) {} @@ -68,8 +66,7 @@ Foam::IncompressibleTurbulenceModel::New ( const volVectorField& U, const surfaceScalarField& phi, - const TransportModel& transport, - const word& propertiesName + const TransportModel& transport ) { return autoPtr @@ -88,8 +85,7 @@ Foam::IncompressibleTurbulenceModel::New U, phi, phi, - transport, - propertiesName + transport ).ptr()) ); } diff --git a/src/TurbulenceModels/incompressible/IncompressibleTurbulenceModel/IncompressibleTurbulenceModel.H b/src/TurbulenceModels/incompressible/IncompressibleTurbulenceModel/IncompressibleTurbulenceModel.H index 746e474f8a..d12d2b5751 100644 --- a/src/TurbulenceModels/incompressible/IncompressibleTurbulenceModel/IncompressibleTurbulenceModel.H +++ b/src/TurbulenceModels/incompressible/IncompressibleTurbulenceModel/IncompressibleTurbulenceModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -79,8 +79,7 @@ public: const volVectorField& U, const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, - const TransportModel& transport, - const word& propertiesName + const TransportModel& transport ); @@ -91,8 +90,7 @@ public: ( const volVectorField& U, const surfaceScalarField& phi, - const TransportModel& transportModel, - const word& propertiesName = turbulenceModel::propertiesName + const TransportModel& transportModel ); diff --git a/src/TurbulenceModels/incompressible/incompressibleTurbulenceModel.C b/src/TurbulenceModels/incompressible/incompressibleTurbulenceModel.C index 9eab0a0baa..b3384ee634 100644 --- a/src/TurbulenceModels/incompressible/incompressibleTurbulenceModel.C +++ b/src/TurbulenceModels/incompressible/incompressibleTurbulenceModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -40,16 +40,14 @@ Foam::incompressibleTurbulenceModel::incompressibleTurbulenceModel const geometricOneField&, const volVectorField& U, const surfaceScalarField& alphaRhoPhi, - const surfaceScalarField& phi, - const word& propertiesName + const surfaceScalarField& phi ) : turbulenceModel ( U, alphaRhoPhi, - phi, - propertiesName + phi ) {} diff --git a/src/TurbulenceModels/incompressible/incompressibleTurbulenceModel.H b/src/TurbulenceModels/incompressible/incompressibleTurbulenceModel.H index 25ca38f2f3..119a356829 100644 --- a/src/TurbulenceModels/incompressible/incompressibleTurbulenceModel.H +++ b/src/TurbulenceModels/incompressible/incompressibleTurbulenceModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -83,8 +83,7 @@ public: const geometricOneField& rho, const volVectorField& U, const surfaceScalarField& alphaRhoPhi, - const surfaceScalarField& phi, - const word& propertiesName + const surfaceScalarField& phi ); //- Disallow default bitwise copy construction diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.C index d4c61ba863..d0889d40f6 100644 --- a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.C +++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -94,7 +94,6 @@ LamBremhorstKE::LamBremhorstKE const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName, const word& type ) : @@ -106,8 +105,7 @@ LamBremhorstKE::LamBremhorstKE U, alphaRhoPhi, phi, - transport, - propertiesName + transport ), Cmu_ diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.H b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.H index 691aec8d04..9f21d060c1 100644 --- a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.H +++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -112,7 +112,6 @@ public: const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName = turbulenceModel::propertiesName, const word& type = typeName ); diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKE/LienCubicKE.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKE/LienCubicKE.C index c5d2670ddb..575d8db0a2 100644 --- a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKE/LienCubicKE.C +++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKE/LienCubicKE.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -127,7 +127,6 @@ LienCubicKE::LienCubicKE const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName, const word& type ) : @@ -139,8 +138,7 @@ LienCubicKE::LienCubicKE U, alphaRhoPhi, phi, - transport, - propertiesName + transport ), Ceps1_ diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKE/LienCubicKE.H b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKE/LienCubicKE.H index 63f9fc7b52..3eb33564ea 100644 --- a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKE/LienCubicKE.H +++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKE/LienCubicKE.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -141,7 +141,6 @@ public: const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName = turbulenceModel::propertiesName, const word& type = typeName ); diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienLeschziner/LienLeschziner.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienLeschziner/LienLeschziner.C index 9232b65953..8dc4696f38 100644 --- a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienLeschziner/LienLeschziner.C +++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienLeschziner/LienLeschziner.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -93,7 +93,6 @@ LienLeschziner::LienLeschziner const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName, const word& type ) : @@ -105,8 +104,7 @@ LienLeschziner::LienLeschziner U, alphaRhoPhi, phi, - transport, - propertiesName + transport ), Ceps1_ diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienLeschziner/LienLeschziner.H b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienLeschziner/LienLeschziner.H index 96d2b41bfc..6923e74c22 100644 --- a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienLeschziner/LienLeschziner.H +++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienLeschziner/LienLeschziner.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -129,7 +129,6 @@ public: const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName = turbulenceModel::propertiesName, const word& type = typeName ); diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/ShihQuadraticKE/ShihQuadraticKE.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/ShihQuadraticKE/ShihQuadraticKE.C index 7e43aed16b..cad7943724 100644 --- a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/ShihQuadraticKE/ShihQuadraticKE.C +++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/ShihQuadraticKE/ShihQuadraticKE.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -84,7 +84,6 @@ ShihQuadraticKE::ShihQuadraticKE const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName, const word& type ) : @@ -96,8 +95,7 @@ ShihQuadraticKE::ShihQuadraticKE U, alphaRhoPhi, phi, - transport, - propertiesName + transport ), Ceps1_ diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/ShihQuadraticKE/ShihQuadraticKE.H b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/ShihQuadraticKE/ShihQuadraticKE.H index 5b2f1f8e3f..873c5f472b 100644 --- a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/ShihQuadraticKE/ShihQuadraticKE.H +++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/ShihQuadraticKE/ShihQuadraticKE.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -116,7 +116,6 @@ public: const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName = turbulenceModel::propertiesName, const word& type = typeName ); diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kkLOmega/kkLOmega.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kkLOmega/kkLOmega.C index 284efb30af..9311d2e2aa 100644 --- a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kkLOmega/kkLOmega.C +++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kkLOmega/kkLOmega.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -223,7 +223,6 @@ kkLOmega::kkLOmega const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName, const word& type ) : @@ -235,8 +234,7 @@ kkLOmega::kkLOmega U, alphaRhoPhi, phi, - transport, - propertiesName + transport ), A0_ diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kkLOmega/kkLOmega.H b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kkLOmega/kkLOmega.H index 51777129f2..4656d9c669 100644 --- a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kkLOmega/kkLOmega.H +++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kkLOmega/kkLOmega.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -222,7 +222,6 @@ public: const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName = turbulenceModel::propertiesName, const word& type = typeName ); diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/qZeta/qZeta.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/qZeta/qZeta.C index 19d535a208..020a92c1fc 100644 --- a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/qZeta/qZeta.C +++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/qZeta/qZeta.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -84,7 +84,6 @@ qZeta::qZeta const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName, const word& type ) : @@ -96,8 +95,7 @@ qZeta::qZeta U, alphaRhoPhi, phi, - transport, - propertiesName + transport ), Cmu_ diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/qZeta/qZeta.H b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/qZeta/qZeta.H index 75b994b648..a9ed628401 100644 --- a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/qZeta/qZeta.H +++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/qZeta/qZeta.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -123,7 +123,6 @@ public: const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName = turbulenceModel::propertiesName, const word& type = typeName ); diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModel.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModel.C index b1147f3767..9375c11685 100644 --- a/src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModel.C +++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2015-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -37,8 +37,7 @@ namespace Foam const volVectorField& U, const surfaceScalarField& phi, const typename BasicIncompressibleTurbulenceModel::transportModel& - transport, - const word& propertiesName + transport ) { return BasicIncompressibleTurbulenceModel::New @@ -48,8 +47,7 @@ namespace Foam U, phi, phi, - transport, - propertiesName + transport ); } } diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModel.H b/src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModel.H index 4603038d1b..538cae8f6c 100644 --- a/src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModel.H +++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2015-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -67,8 +67,7 @@ namespace Foam const volVectorField& U, const surfaceScalarField& phi, const typename BasicIncompressibleTurbulenceModel::transportModel& - transport, - const word& propertiesName = turbulenceModel::propertiesName + transport ); } } diff --git a/src/TurbulenceModels/phaseCompressible/LES/Niceno/NicenoKEqn.C b/src/TurbulenceModels/phaseCompressible/LES/Niceno/NicenoKEqn.C index 6597912fc3..7dea4b4bd2 100644 --- a/src/TurbulenceModels/phaseCompressible/LES/Niceno/NicenoKEqn.C +++ b/src/TurbulenceModels/phaseCompressible/LES/Niceno/NicenoKEqn.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -46,7 +46,6 @@ NicenoKEqn::NicenoKEqn const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName, const word& type ) : @@ -58,7 +57,6 @@ NicenoKEqn::NicenoKEqn alphaRhoPhi, phi, transport, - propertiesName, type ), diff --git a/src/TurbulenceModels/phaseCompressible/LES/Niceno/NicenoKEqn.H b/src/TurbulenceModels/phaseCompressible/LES/Niceno/NicenoKEqn.H index 9af33b0c33..79aa6774ac 100644 --- a/src/TurbulenceModels/phaseCompressible/LES/Niceno/NicenoKEqn.H +++ b/src/TurbulenceModels/phaseCompressible/LES/Niceno/NicenoKEqn.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -133,7 +133,6 @@ public: const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName = turbulenceModel::propertiesName, const word& type = typeName ); diff --git a/src/TurbulenceModels/phaseCompressible/LES/SmagorinskyZhang/SmagorinskyZhang.C b/src/TurbulenceModels/phaseCompressible/LES/SmagorinskyZhang/SmagorinskyZhang.C index 22a0e4d373..eead3f97e3 100644 --- a/src/TurbulenceModels/phaseCompressible/LES/SmagorinskyZhang/SmagorinskyZhang.C +++ b/src/TurbulenceModels/phaseCompressible/LES/SmagorinskyZhang/SmagorinskyZhang.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -44,7 +44,6 @@ SmagorinskyZhang::SmagorinskyZhang const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName, const word& type ) : @@ -56,7 +55,6 @@ SmagorinskyZhang::SmagorinskyZhang alphaRhoPhi, phi, transport, - propertiesName, type ), diff --git a/src/TurbulenceModels/phaseCompressible/LES/SmagorinskyZhang/SmagorinskyZhang.H b/src/TurbulenceModels/phaseCompressible/LES/SmagorinskyZhang/SmagorinskyZhang.H index 010a3763a7..d5d03f09b6 100644 --- a/src/TurbulenceModels/phaseCompressible/LES/SmagorinskyZhang/SmagorinskyZhang.H +++ b/src/TurbulenceModels/phaseCompressible/LES/SmagorinskyZhang/SmagorinskyZhang.H @@ -126,7 +126,6 @@ public: const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName = turbulenceModel::propertiesName, const word& type = typeName ); diff --git a/src/TurbulenceModels/phaseCompressible/LES/continuousGasKEqn/continuousGasKEqn.C b/src/TurbulenceModels/phaseCompressible/LES/continuousGasKEqn/continuousGasKEqn.C index fe55d19df7..5b9839b5ef 100644 --- a/src/TurbulenceModels/phaseCompressible/LES/continuousGasKEqn/continuousGasKEqn.C +++ b/src/TurbulenceModels/phaseCompressible/LES/continuousGasKEqn/continuousGasKEqn.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -44,7 +44,6 @@ continuousGasKEqn::continuousGasKEqn const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName, const word& type ) : @@ -56,7 +55,6 @@ continuousGasKEqn::continuousGasKEqn alphaRhoPhi, phi, transport, - propertiesName, type ), diff --git a/src/TurbulenceModels/phaseCompressible/LES/continuousGasKEqn/continuousGasKEqn.H b/src/TurbulenceModels/phaseCompressible/LES/continuousGasKEqn/continuousGasKEqn.H index 85e48ba4a7..f5028b34cf 100644 --- a/src/TurbulenceModels/phaseCompressible/LES/continuousGasKEqn/continuousGasKEqn.H +++ b/src/TurbulenceModels/phaseCompressible/LES/continuousGasKEqn/continuousGasKEqn.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -117,7 +117,6 @@ public: const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName = turbulenceModel::propertiesName, const word& type = typeName ); diff --git a/src/TurbulenceModels/phaseCompressible/PhaseCompressibleTurbulenceModel/PhaseCompressibleTurbulenceModel.C b/src/TurbulenceModels/phaseCompressible/PhaseCompressibleTurbulenceModel/PhaseCompressibleTurbulenceModel.C index a826b1d8a2..8fa200099e 100644 --- a/src/TurbulenceModels/phaseCompressible/PhaseCompressibleTurbulenceModel/PhaseCompressibleTurbulenceModel.C +++ b/src/TurbulenceModels/phaseCompressible/PhaseCompressibleTurbulenceModel/PhaseCompressibleTurbulenceModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -37,8 +37,7 @@ PhaseCompressibleTurbulenceModel const volVectorField& U, const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, - const transportModel& transport, - const word& propertiesName + const transportModel& transport ) : TurbulenceModel @@ -54,8 +53,7 @@ PhaseCompressibleTurbulenceModel U, alphaRhoPhi, phi, - transport, - propertiesName + transport ) {} @@ -71,8 +69,7 @@ Foam::PhaseCompressibleTurbulenceModel::New const volVectorField& U, const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, - const transportModel& transport, - const word& propertiesName + const transportModel& transport ) { return autoPtr @@ -91,8 +88,7 @@ Foam::PhaseCompressibleTurbulenceModel::New U, alphaRhoPhi, phi, - transport, - propertiesName + transport ).ptr()) ); } diff --git a/src/TurbulenceModels/phaseCompressible/PhaseCompressibleTurbulenceModel/PhaseCompressibleTurbulenceModel.H b/src/TurbulenceModels/phaseCompressible/PhaseCompressibleTurbulenceModel/PhaseCompressibleTurbulenceModel.H index 5e10b5b6e1..dd62ae7163 100644 --- a/src/TurbulenceModels/phaseCompressible/PhaseCompressibleTurbulenceModel/PhaseCompressibleTurbulenceModel.H +++ b/src/TurbulenceModels/phaseCompressible/PhaseCompressibleTurbulenceModel/PhaseCompressibleTurbulenceModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -78,8 +78,7 @@ public: const volVectorField& U, const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, - const transportModel& transport, - const word& propertiesName + const transportModel& transport ); @@ -93,8 +92,7 @@ public: const volVectorField& U, const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, - const transportModel& transportModel, - const word& propertiesName = turbulenceModel::propertiesName + const transportModel& transportModel ); diff --git a/src/TurbulenceModels/phaseCompressible/RAS/LaheyKEpsilon/LaheyKEpsilon.C b/src/TurbulenceModels/phaseCompressible/RAS/LaheyKEpsilon/LaheyKEpsilon.C index 1c80a35b2f..594cade363 100644 --- a/src/TurbulenceModels/phaseCompressible/RAS/LaheyKEpsilon/LaheyKEpsilon.C +++ b/src/TurbulenceModels/phaseCompressible/RAS/LaheyKEpsilon/LaheyKEpsilon.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -46,7 +46,6 @@ LaheyKEpsilon::LaheyKEpsilon const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName, const word& type ) : @@ -58,7 +57,6 @@ LaheyKEpsilon::LaheyKEpsilon alphaRhoPhi, phi, transport, - propertiesName, type ), diff --git a/src/TurbulenceModels/phaseCompressible/RAS/LaheyKEpsilon/LaheyKEpsilon.H b/src/TurbulenceModels/phaseCompressible/RAS/LaheyKEpsilon/LaheyKEpsilon.H index 4d8877813e..f7f1d18d5e 100644 --- a/src/TurbulenceModels/phaseCompressible/RAS/LaheyKEpsilon/LaheyKEpsilon.H +++ b/src/TurbulenceModels/phaseCompressible/RAS/LaheyKEpsilon/LaheyKEpsilon.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -137,7 +137,6 @@ public: const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName = turbulenceModel::propertiesName, const word& type = typeName ); diff --git a/src/TurbulenceModels/phaseCompressible/RAS/continuousGasKEpsilon/continuousGasKEpsilon.C b/src/TurbulenceModels/phaseCompressible/RAS/continuousGasKEpsilon/continuousGasKEpsilon.C index 58f21838ca..c8f39246bd 100644 --- a/src/TurbulenceModels/phaseCompressible/RAS/continuousGasKEpsilon/continuousGasKEpsilon.C +++ b/src/TurbulenceModels/phaseCompressible/RAS/continuousGasKEpsilon/continuousGasKEpsilon.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -47,7 +47,6 @@ continuousGasKEpsilon::continuousGasKEpsilon const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName, const word& type ) : @@ -59,7 +58,6 @@ continuousGasKEpsilon::continuousGasKEpsilon alphaRhoPhi, phi, transport, - propertiesName, type ), diff --git a/src/TurbulenceModels/phaseCompressible/RAS/continuousGasKEpsilon/continuousGasKEpsilon.H b/src/TurbulenceModels/phaseCompressible/RAS/continuousGasKEpsilon/continuousGasKEpsilon.H index 1f67882635..45e8754442 100644 --- a/src/TurbulenceModels/phaseCompressible/RAS/continuousGasKEpsilon/continuousGasKEpsilon.H +++ b/src/TurbulenceModels/phaseCompressible/RAS/continuousGasKEpsilon/continuousGasKEpsilon.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -123,7 +123,6 @@ public: const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName = turbulenceModel::propertiesName, const word& type = typeName ); diff --git a/src/TurbulenceModels/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.C b/src/TurbulenceModels/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.C index 62ee62fb22..2b4080b31a 100644 --- a/src/TurbulenceModels/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.C +++ b/src/TurbulenceModels/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2014-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -46,7 +46,6 @@ kOmegaSSTSato::kOmegaSSTSato const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName, const word& type ) : @@ -58,7 +57,6 @@ kOmegaSSTSato::kOmegaSSTSato alphaRhoPhi, phi, transport, - propertiesName, type ), diff --git a/src/TurbulenceModels/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.H b/src/TurbulenceModels/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.H index c2d6b60e4b..9ed2e2f3d1 100644 --- a/src/TurbulenceModels/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.H +++ b/src/TurbulenceModels/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2014-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -175,7 +175,6 @@ public: const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName = turbulenceModel::propertiesName, const word& type = typeName ); diff --git a/src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.C b/src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.C index 34016546f1..f480b0595b 100644 --- a/src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.C +++ b/src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -51,7 +51,6 @@ mixtureKEpsilon::mixtureKEpsilon const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName, const word& type ) : @@ -63,8 +62,7 @@ mixtureKEpsilon::mixtureKEpsilon U, alphaRhoPhi, phi, - transport, - propertiesName + transport ), liquidTurbulencePtr_(nullptr), diff --git a/src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.H b/src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.H index 309067c2d3..871e779ac1 100644 --- a/src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.H +++ b/src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -208,7 +208,6 @@ public: const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName = turbulenceModel::propertiesName, const word& type = typeName ); diff --git a/src/TurbulenceModels/phaseIncompressible/PhaseIncompressibleTurbulenceModel/PhaseIncompressibleTurbulenceModel.C b/src/TurbulenceModels/phaseIncompressible/PhaseIncompressibleTurbulenceModel/PhaseIncompressibleTurbulenceModel.C index 0723a41cb5..d45e93e696 100644 --- a/src/TurbulenceModels/phaseIncompressible/PhaseIncompressibleTurbulenceModel/PhaseIncompressibleTurbulenceModel.C +++ b/src/TurbulenceModels/phaseIncompressible/PhaseIncompressibleTurbulenceModel/PhaseIncompressibleTurbulenceModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -37,8 +37,7 @@ PhaseIncompressibleTurbulenceModel const volVectorField& U, const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, - const TransportModel& transportModel, - const word& propertiesName + const TransportModel& transportModel ) : TurbulenceModel @@ -54,8 +53,7 @@ PhaseIncompressibleTurbulenceModel U, alphaRhoPhi, phi, - transportModel, - propertiesName + transportModel ) {} @@ -70,8 +68,7 @@ Foam::PhaseIncompressibleTurbulenceModel::New const volVectorField& U, const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, - const TransportModel& transportModel, - const word& propertiesName + const TransportModel& transportModel ) { return autoPtr @@ -90,8 +87,7 @@ Foam::PhaseIncompressibleTurbulenceModel::New U, alphaRhoPhi, phi, - transportModel, - propertiesName + transportModel ).ptr()) ); } diff --git a/src/TurbulenceModels/phaseIncompressible/PhaseIncompressibleTurbulenceModel/PhaseIncompressibleTurbulenceModel.H b/src/TurbulenceModels/phaseIncompressible/PhaseIncompressibleTurbulenceModel/PhaseIncompressibleTurbulenceModel.H index 4bcab5bc01..070e7dce70 100644 --- a/src/TurbulenceModels/phaseIncompressible/PhaseIncompressibleTurbulenceModel/PhaseIncompressibleTurbulenceModel.H +++ b/src/TurbulenceModels/phaseIncompressible/PhaseIncompressibleTurbulenceModel/PhaseIncompressibleTurbulenceModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -78,8 +78,7 @@ public: const volVectorField& U, const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, - const TransportModel& transportModel, - const word& propertiesName + const TransportModel& transportModel ); @@ -92,8 +91,7 @@ public: const volVectorField& U, const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, - const TransportModel& transportModel, - const word& propertiesName = turbulenceModel::propertiesName + const TransportModel& transportModel ); diff --git a/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.C b/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.C index c94cc2b8c8..eebbe1b3f6 100644 --- a/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.C +++ b/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -217,8 +217,7 @@ kOmegaSST::kOmegaSST const volVectorField& U, const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, - const transportModel& transport, - const word& propertiesName + const transportModel& transport ) : TurbulenceModel @@ -229,8 +228,7 @@ kOmegaSST::kOmegaSST U, alphaRhoPhi, phi, - transport, - propertiesName + transport ), alphaK1_ diff --git a/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.H b/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.H index d730a1bb7b..f47ff5147d 100644 --- a/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.H +++ b/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -256,8 +256,7 @@ public: const volVectorField& U, const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, - const transportModel& transport, - const word& propertiesName = turbulenceModel::propertiesName + const transportModel& transport ); //- Disallow default bitwise copy construction diff --git a/src/TurbulenceModels/turbulenceModels/LES/DeardorffDiffStress/DeardorffDiffStress.C b/src/TurbulenceModels/turbulenceModels/LES/DeardorffDiffStress/DeardorffDiffStress.C index d5084869f6..a70bcd5359 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/DeardorffDiffStress/DeardorffDiffStress.C +++ b/src/TurbulenceModels/turbulenceModels/LES/DeardorffDiffStress/DeardorffDiffStress.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -57,7 +57,6 @@ DeardorffDiffStress::DeardorffDiffStress const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName, const word& type ) : @@ -69,8 +68,7 @@ DeardorffDiffStress::DeardorffDiffStress U, alphaRhoPhi, phi, - transport, - propertiesName + transport ), Ck_ diff --git a/src/TurbulenceModels/turbulenceModels/LES/DeardorffDiffStress/DeardorffDiffStress.H b/src/TurbulenceModels/turbulenceModels/LES/DeardorffDiffStress/DeardorffDiffStress.H index 3f41d80914..16abc982f7 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/DeardorffDiffStress/DeardorffDiffStress.H +++ b/src/TurbulenceModels/turbulenceModels/LES/DeardorffDiffStress/DeardorffDiffStress.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -121,7 +121,6 @@ public: const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName = turbulenceModel::propertiesName, const word& type = typeName ); diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C b/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C index 55e53b0a07..fa8d0cf2c9 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C +++ b/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -48,8 +48,7 @@ Foam::LESModel::LESModel const volVectorField& U, const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, - const transportModel& transport, - const word& propertiesName + const transportModel& transport ) : BasicTurbulenceModel @@ -60,8 +59,7 @@ Foam::LESModel::LESModel U, alphaRhoPhi, phi, - transport, - propertiesName + transport ), LESDict_(this->subOrEmptyDict("LES")), @@ -129,26 +127,31 @@ Foam::LESModel::New const volVectorField& U, const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, - const transportModel& transport, - const word& propertiesName + const transportModel& transport ) { - // get model name, but do not register the dictionary - // otherwise it is registered in the database twice + IOdictionary modelDict + ( + IOobject + ( + IOobject::groupName + ( + turbulenceModel::propertiesName, + alphaRhoPhi.group() + ), + U.time().constant(), + U.db(), + IOobject::MUST_READ_IF_MODIFIED, + IOobject::NO_WRITE, + false + ) + ); + const word modelType ( - IOdictionary - ( - IOobject - ( - IOobject::groupName(propertiesName, alphaRhoPhi.group()), - U.time().constant(), - U.db(), - IOobject::MUST_READ_IF_MODIFIED, - IOobject::NO_WRITE, - false - ) - ).subDict("LES").lookup("LESModel") + modelDict.subDict("LES").found("model") + ? modelDict.subDict("LES").lookup("model") + : modelDict.subDict("LES").lookup("LESModel") ); Info<< "Selecting LES turbulence model " << modelType << endl; @@ -168,7 +171,7 @@ Foam::LESModel::New return autoPtr ( - cstrIter()(alpha, rho, U, alphaRhoPhi, phi, transport, propertiesName) + cstrIter()(alpha, rho, U, alphaRhoPhi, phi, transport) ); } diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.H b/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.H index 1d3578e9bc..efefac5a4f 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.H +++ b/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -118,10 +118,9 @@ public: const volVectorField& U, const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, - const transportModel& transport, - const word& propertiesName + const transportModel& transport ), - (alpha, rho, U, alphaRhoPhi, phi, transport, propertiesName) + (alpha, rho, U, alphaRhoPhi, phi, transport) ); @@ -136,8 +135,7 @@ public: const volVectorField& U, const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, - const transportModel& transport, - const word& propertiesName + const transportModel& transport ); //- Disallow default bitwise copy construction @@ -154,8 +152,7 @@ public: const volVectorField& U, const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, - const transportModel& transport, - const word& propertiesName = turbulenceModel::propertiesName + const transportModel& transport ); diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESeddyViscosity/LESeddyViscosity.C b/src/TurbulenceModels/turbulenceModels/LES/LESeddyViscosity/LESeddyViscosity.C index 95f118235b..54fdbd976e 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/LESeddyViscosity/LESeddyViscosity.C +++ b/src/TurbulenceModels/turbulenceModels/LES/LESeddyViscosity/LESeddyViscosity.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -43,8 +43,7 @@ LESeddyViscosity::LESeddyViscosity const volVectorField& U, const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, - const transportModel& transport, - const word& propertiesName + const transportModel& transport ) : eddyViscosity> @@ -55,8 +54,7 @@ LESeddyViscosity::LESeddyViscosity U, alphaRhoPhi, phi, - transport, - propertiesName + transport ), Ce_ diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESeddyViscosity/LESeddyViscosity.H b/src/TurbulenceModels/turbulenceModels/LES/LESeddyViscosity/LESeddyViscosity.H index 3886a47014..63b7c0166f 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/LESeddyViscosity/LESeddyViscosity.H +++ b/src/TurbulenceModels/turbulenceModels/LES/LESeddyViscosity/LESeddyViscosity.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -79,8 +79,7 @@ public: const volVectorField& U, const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, - const transportModel& transport, - const word& propertiesName = turbulenceModel::propertiesName + const transportModel& transport ); //- Disallow default bitwise copy construction diff --git a/src/TurbulenceModels/turbulenceModels/LES/Smagorinsky/Smagorinsky.C b/src/TurbulenceModels/turbulenceModels/LES/Smagorinsky/Smagorinsky.C index 412ee47eb0..3ba684ad65 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/Smagorinsky/Smagorinsky.C +++ b/src/TurbulenceModels/turbulenceModels/LES/Smagorinsky/Smagorinsky.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -79,7 +79,6 @@ Smagorinsky::Smagorinsky const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName, const word& type ) : @@ -91,8 +90,7 @@ Smagorinsky::Smagorinsky U, alphaRhoPhi, phi, - transport, - propertiesName + transport ), Ck_ diff --git a/src/TurbulenceModels/turbulenceModels/LES/Smagorinsky/Smagorinsky.H b/src/TurbulenceModels/turbulenceModels/LES/Smagorinsky/Smagorinsky.H index f0d6020313..3ecdb4a244 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/Smagorinsky/Smagorinsky.H +++ b/src/TurbulenceModels/turbulenceModels/LES/Smagorinsky/Smagorinsky.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -127,7 +127,6 @@ public: const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName = turbulenceModel::propertiesName, const word& type = typeName ); diff --git a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.C b/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.C index b32de5347d..adf96d33cd 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.C +++ b/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -113,7 +113,6 @@ SpalartAllmarasDDES::SpalartAllmarasDDES const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName, const word& type ) : @@ -124,8 +123,7 @@ SpalartAllmarasDDES::SpalartAllmarasDDES U, alphaRhoPhi, phi, - transport, - propertiesName + transport ) {} diff --git a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.H b/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.H index 18b98d44a9..bf302124a9 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.H +++ b/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -113,7 +113,6 @@ public: const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName = turbulenceModel::propertiesName, const word& type = typeName ); diff --git a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.C b/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.C index 5b901d1575..ab2c1c3fe9 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.C +++ b/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -223,7 +223,6 @@ SpalartAllmarasDES::SpalartAllmarasDES const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName, const word& type ) : @@ -235,8 +234,7 @@ SpalartAllmarasDES::SpalartAllmarasDES U, alphaRhoPhi, phi, - transport, - propertiesName + transport ), sigmaNut_ diff --git a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.H b/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.H index 746b66bbf7..bae36f96eb 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.H +++ b/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -171,7 +171,6 @@ public: const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName = turbulenceModel::propertiesName, const word& type = typeName ); diff --git a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C b/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C index fc495c6fe5..603093e008 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C +++ b/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -219,7 +219,6 @@ SpalartAllmarasIDDES::SpalartAllmarasIDDES const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName, const word& type ) : @@ -230,8 +229,7 @@ SpalartAllmarasIDDES::SpalartAllmarasIDDES U, alphaRhoPhi, phi, - transport, - propertiesName + transport ), fwStar_ ( diff --git a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H b/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H index 67e4ff650a..f52ca209f7 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H +++ b/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -140,7 +140,6 @@ public: const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName = turbulenceModel::propertiesName, const word& type = typeName ); diff --git a/src/TurbulenceModels/turbulenceModels/LES/WALE/WALE.C b/src/TurbulenceModels/turbulenceModels/LES/WALE/WALE.C index 2dff217d7a..69c0cb005e 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/WALE/WALE.C +++ b/src/TurbulenceModels/turbulenceModels/LES/WALE/WALE.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2015-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -99,7 +99,6 @@ WALE::WALE const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName, const word& type ) : @@ -111,8 +110,7 @@ WALE::WALE U, alphaRhoPhi, phi, - transport, - propertiesName + transport ), Ck_ diff --git a/src/TurbulenceModels/turbulenceModels/LES/WALE/WALE.H b/src/TurbulenceModels/turbulenceModels/LES/WALE/WALE.H index 5bbb3f690b..b5b3e5b4c8 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/WALE/WALE.H +++ b/src/TurbulenceModels/turbulenceModels/LES/WALE/WALE.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2015-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -119,7 +119,6 @@ public: const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName = turbulenceModel::propertiesName, const word& type = typeName ); diff --git a/src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.C b/src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.C index 43689c2cbf..802b4cd335 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.C +++ b/src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -151,7 +151,6 @@ dynamicKEqn::dynamicKEqn const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName, const word& type ) : @@ -163,8 +162,7 @@ dynamicKEqn::dynamicKEqn U, alphaRhoPhi, phi, - transport, - propertiesName + transport ), k_ diff --git a/src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.H b/src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.H index 93dc92d1fe..ca467676f8 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.H +++ b/src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -146,7 +146,6 @@ public: const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName = turbulenceModel::propertiesName, const word& type = typeName ); diff --git a/src/TurbulenceModels/turbulenceModels/LES/dynamicLagrangian/dynamicLagrangian.C b/src/TurbulenceModels/turbulenceModels/LES/dynamicLagrangian/dynamicLagrangian.C index 63ff72174a..f617b2bca2 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/dynamicLagrangian/dynamicLagrangian.C +++ b/src/TurbulenceModels/turbulenceModels/LES/dynamicLagrangian/dynamicLagrangian.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -67,7 +67,6 @@ dynamicLagrangian::dynamicLagrangian const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName, const word& type ) : @@ -79,8 +78,7 @@ dynamicLagrangian::dynamicLagrangian U, alphaRhoPhi, phi, - transport, - propertiesName + transport ), flm_ diff --git a/src/TurbulenceModels/turbulenceModels/LES/dynamicLagrangian/dynamicLagrangian.H b/src/TurbulenceModels/turbulenceModels/LES/dynamicLagrangian/dynamicLagrangian.H index d42d689607..dc9fb6a072 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/dynamicLagrangian/dynamicLagrangian.H +++ b/src/TurbulenceModels/turbulenceModels/LES/dynamicLagrangian/dynamicLagrangian.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -107,7 +107,6 @@ public: const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName = turbulenceModel::propertiesName, const word& type = typeName ); diff --git a/src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.C b/src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.C index 9250508fc1..2d2c2a6031 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.C +++ b/src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -72,7 +72,6 @@ kEqn::kEqn const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName, const word& type ) : @@ -84,8 +83,7 @@ kEqn::kEqn U, alphaRhoPhi, phi, - transport, - propertiesName + transport ), k_ diff --git a/src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.H b/src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.H index 380b9ae312..16dc9e6db2 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.H +++ b/src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -115,7 +115,6 @@ public: const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName = turbulenceModel::propertiesName, const word& type = typeName ); diff --git a/src/TurbulenceModels/turbulenceModels/LES/kOmegaSSTDES/kOmegaSSTDES.C b/src/TurbulenceModels/turbulenceModels/LES/kOmegaSSTDES/kOmegaSSTDES.C index 9bc772c5c4..d220314287 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/kOmegaSSTDES/kOmegaSSTDES.C +++ b/src/TurbulenceModels/turbulenceModels/LES/kOmegaSSTDES/kOmegaSSTDES.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2016-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -87,7 +87,6 @@ kOmegaSSTDES::kOmegaSSTDES const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName, const word& type ) : @@ -103,8 +102,7 @@ kOmegaSSTDES::kOmegaSSTDES U, alphaRhoPhi, phi, - transport, - propertiesName + transport ), CDES_ diff --git a/src/TurbulenceModels/turbulenceModels/LES/kOmegaSSTDES/kOmegaSSTDES.H b/src/TurbulenceModels/turbulenceModels/LES/kOmegaSSTDES/kOmegaSSTDES.H index 80fecf91c6..728d477966 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/kOmegaSSTDES/kOmegaSSTDES.H +++ b/src/TurbulenceModels/turbulenceModels/LES/kOmegaSSTDES/kOmegaSSTDES.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2016-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -138,7 +138,6 @@ public: const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName = turbulenceModel::propertiesName, const word& type = typeName ); diff --git a/src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.C b/src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.C index b652abd369..23e14d6493 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.C +++ b/src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -58,7 +58,6 @@ LRR::LRR const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName, const word& type ) : @@ -70,8 +69,7 @@ LRR::LRR U, alphaRhoPhi, phi, - transport, - propertiesName + transport ), Cmu_ diff --git a/src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.H b/src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.H index d7a50c996e..70f7e138e2 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.H +++ b/src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -158,7 +158,6 @@ public: const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName = turbulenceModel::propertiesName, const word& type = typeName ); diff --git a/src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.C b/src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.C index 96f3b0a8cc..fa15f83cd1 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.C +++ b/src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -104,7 +104,6 @@ LaunderSharmaKE::LaunderSharmaKE const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName, const word& type ) : @@ -116,8 +115,7 @@ LaunderSharmaKE::LaunderSharmaKE U, alphaRhoPhi, phi, - transport, - propertiesName + transport ), Cmu_ diff --git a/src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.H b/src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.H index 02726c1679..1fa26fcd89 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.H +++ b/src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -135,7 +135,6 @@ public: const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName = turbulenceModel::propertiesName, const word& type = typeName ); diff --git a/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.C b/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.C index 87030b337b..ce30a99535 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.C +++ b/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -48,8 +48,7 @@ Foam::RASModel::RASModel const volVectorField& U, const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, - const transportModel& transport, - const word& propertiesName + const transportModel& transport ) : BasicTurbulenceModel @@ -60,8 +59,7 @@ Foam::RASModel::RASModel U, alphaRhoPhi, phi, - transport, - propertiesName + transport ), RASDict_(this->subOrEmptyDict("RAS")), @@ -119,26 +117,31 @@ Foam::RASModel::New const volVectorField& U, const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, - const transportModel& transport, - const word& propertiesName + const transportModel& transport ) { - // get model name, but do not register the dictionary - // otherwise it is registered in the database twice + IOdictionary modelDict + ( + IOobject + ( + IOobject::groupName + ( + turbulenceModel::propertiesName, + alphaRhoPhi.group() + ), + U.time().constant(), + U.db(), + IOobject::MUST_READ_IF_MODIFIED, + IOobject::NO_WRITE, + false + ) + ); + const word modelType ( - IOdictionary - ( - IOobject - ( - IOobject::groupName(propertiesName, alphaRhoPhi.group()), - U.time().constant(), - U.db(), - IOobject::MUST_READ_IF_MODIFIED, - IOobject::NO_WRITE, - false - ) - ).subDict("RAS").lookup("RASModel") + modelDict.subDict("RAS").found("model") + ? modelDict.subDict("RAS").lookup("model") + : modelDict.subDict("RAS").lookup("RASModel") ); Info<< "Selecting RAS turbulence model " << modelType << endl; @@ -158,7 +161,7 @@ Foam::RASModel::New return autoPtr ( - cstrIter()(alpha, rho, U, alphaRhoPhi, phi, transport, propertiesName) + cstrIter()(alpha, rho, U, alphaRhoPhi, phi, transport) ); } diff --git a/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.H b/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.H index e45a170b1e..62e5ccff8f 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.H +++ b/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -108,10 +108,9 @@ public: const volVectorField& U, const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, - const transportModel& transport, - const word& propertiesName + const transportModel& transport ), - (alpha, rho, U, alphaRhoPhi, phi, transport, propertiesName) + (alpha, rho, U, alphaRhoPhi, phi, transport) ); @@ -126,8 +125,7 @@ public: const volVectorField& U, const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, - const transportModel& transport, - const word& propertiesName + const transportModel& transport ); //- Disallow default bitwise copy construction @@ -144,8 +142,7 @@ public: const volVectorField& U, const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, - const transportModel& transport, - const word& propertiesName = turbulenceModel::propertiesName + const transportModel& transport ); diff --git a/src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.C b/src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.C index ea01183240..a074ae08d6 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.C +++ b/src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -88,7 +88,6 @@ RNGkEpsilon::RNGkEpsilon const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName, const word& type ) : @@ -100,8 +99,7 @@ RNGkEpsilon::RNGkEpsilon U, alphaRhoPhi, phi, - transport, - propertiesName + transport ), Cmu_ diff --git a/src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.H b/src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.H index d1161c98e2..cc209a588c 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.H +++ b/src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -140,7 +140,6 @@ public: const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName = turbulenceModel::propertiesName, const word& type = typeName ); diff --git a/src/TurbulenceModels/turbulenceModels/RAS/SSG/SSG.C b/src/TurbulenceModels/turbulenceModels/RAS/SSG/SSG.C index d163dde1bb..48267cb556 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/SSG/SSG.C +++ b/src/TurbulenceModels/turbulenceModels/RAS/SSG/SSG.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2015-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -58,7 +58,6 @@ SSG::SSG const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName, const word& type ) : @@ -70,8 +69,7 @@ SSG::SSG U, alphaRhoPhi, phi, - transport, - propertiesName + transport ), Cmu_ diff --git a/src/TurbulenceModels/turbulenceModels/RAS/SSG/SSG.H b/src/TurbulenceModels/turbulenceModels/RAS/SSG/SSG.H index b8fbdd6dc7..c068ea9bb8 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/SSG/SSG.H +++ b/src/TurbulenceModels/turbulenceModels/RAS/SSG/SSG.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2015-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -149,7 +149,6 @@ public: const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName = turbulenceModel::propertiesName, const word& type = typeName ); diff --git a/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.C b/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.C index e8242b64ef..8902da3177 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.C +++ b/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -164,7 +164,6 @@ SpalartAllmaras::SpalartAllmaras const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName, const word& type ) : @@ -176,8 +175,7 @@ SpalartAllmaras::SpalartAllmaras U, alphaRhoPhi, phi, - transport, - propertiesName + transport ), sigmaNut_ diff --git a/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.H b/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.H index 92b7afee6d..da68e8477a 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.H +++ b/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -169,7 +169,6 @@ public: const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName = turbulenceModel::propertiesName, const word& type = typeName ); diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.C b/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.C index b816fa8478..fe6524c766 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.C +++ b/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -88,7 +88,6 @@ kEpsilon::kEpsilon const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName, const word& type ) : @@ -100,8 +99,7 @@ kEpsilon::kEpsilon U, alphaRhoPhi, phi, - transport, - propertiesName + transport ), Cmu_ diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.H b/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.H index cf3063d1f4..04f1aef84c 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.H +++ b/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -133,7 +133,6 @@ public: const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName = turbulenceModel::propertiesName, const word& type = typeName ); diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kOmega/kOmega.C b/src/TurbulenceModels/turbulenceModels/RAS/kOmega/kOmega.C index e3f70a4a93..685d14b020 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/kOmega/kOmega.C +++ b/src/TurbulenceModels/turbulenceModels/RAS/kOmega/kOmega.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -87,7 +87,6 @@ kOmega::kOmega const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName, const word& type ) : @@ -99,8 +98,7 @@ kOmega::kOmega U, alphaRhoPhi, phi, - transport, - propertiesName + transport ), Cmu_ diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kOmega/kOmega.H b/src/TurbulenceModels/turbulenceModels/RAS/kOmega/kOmega.H index db33737456..fe8baf0298 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/kOmega/kOmega.H +++ b/src/TurbulenceModels/turbulenceModels/RAS/kOmega/kOmega.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -123,7 +123,6 @@ public: const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName = turbulenceModel::propertiesName, const word& type = typeName ); diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.C b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.C index 01523b8889..85d8d2b0cf 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.C +++ b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2016-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -43,7 +43,6 @@ kOmegaSST::kOmegaSST const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName, const word& type ) : @@ -59,8 +58,7 @@ kOmegaSST::kOmegaSST U, alphaRhoPhi, phi, - transport, - propertiesName + transport ) { if (type == typeName) diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.H b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.H index 61e0c93717..d2b1c829c2 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.H +++ b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2016-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -86,7 +86,6 @@ public: const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName = turbulenceModel::propertiesName, const word& type = typeName ); diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTLM/kOmegaSSTLM.C b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTLM/kOmegaSSTLM.C index d18490982b..a31a899c6b 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTLM/kOmegaSSTLM.C +++ b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTLM/kOmegaSSTLM.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2016-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -340,7 +340,6 @@ kOmegaSSTLM::kOmegaSSTLM const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName, const word& type ) : @@ -351,8 +350,7 @@ kOmegaSSTLM::kOmegaSSTLM U, alphaRhoPhi, phi, - transport, - propertiesName + transport ), ca1_ diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTLM/kOmegaSSTLM.H b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTLM/kOmegaSSTLM.H index a45c950226..201af2a5b8 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTLM/kOmegaSSTLM.H +++ b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTLM/kOmegaSSTLM.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2016-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -220,7 +220,6 @@ public: const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName = turbulenceModel::propertiesName, const word& type = typeName ); diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTSAS/kOmegaSSTSAS.C b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTSAS/kOmegaSSTSAS.C index f7dfd7b9db..6b161e1402 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTSAS/kOmegaSSTSAS.C +++ b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTSAS/kOmegaSSTSAS.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2015-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -101,7 +101,6 @@ kOmegaSSTSAS::kOmegaSSTSAS const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName, const word& type ) : @@ -112,8 +111,7 @@ kOmegaSSTSAS::kOmegaSSTSAS U, alphaRhoPhi, phi, - transport, - propertiesName + transport ), Cs_ diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTSAS/kOmegaSSTSAS.H b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTSAS/kOmegaSSTSAS.H index 791b0f11b0..0bf284b92c 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTSAS/kOmegaSSTSAS.H +++ b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTSAS/kOmegaSSTSAS.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2015-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -149,7 +149,6 @@ public: const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName = turbulenceModel::propertiesName, const word& type = typeName ); diff --git a/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.C b/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.C index b58f8e7e7c..b9b7d0e5b3 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.C +++ b/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -137,7 +137,6 @@ realizableKE::realizableKE const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName, const word& type ) : @@ -149,8 +148,7 @@ realizableKE::realizableKE U, alphaRhoPhi, phi, - transport, - propertiesName + transport ), A0_ ( diff --git a/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.H b/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.H index d55eef6e48..2a091da855 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.H +++ b/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -144,7 +144,6 @@ public: const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName = turbulenceModel::propertiesName, const word& type = typeName ); diff --git a/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2f.C b/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2f.C index 8038eea4ab..c3e20b06ab 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2f.C +++ b/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2f.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2012-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -74,7 +74,6 @@ v2f::v2f const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName, const word& type ) : @@ -86,8 +85,7 @@ v2f::v2f U, alphaRhoPhi, phi, - transport, - propertiesName + transport ), v2fBase(), diff --git a/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2f.H b/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2f.H index 98ab5f8d0f..1a2537fa57 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2f.H +++ b/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2f.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2012-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -193,7 +193,6 @@ public: const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName = turbulenceModel::propertiesName, const word& type = typeName ); diff --git a/src/TurbulenceModels/turbulenceModels/ReynoldsStress/ReynoldsStress.C b/src/TurbulenceModels/turbulenceModels/ReynoldsStress/ReynoldsStress.C index 2c88623ad1..fdf90ed677 100644 --- a/src/TurbulenceModels/turbulenceModels/ReynoldsStress/ReynoldsStress.C +++ b/src/TurbulenceModels/turbulenceModels/ReynoldsStress/ReynoldsStress.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2015-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -113,8 +113,7 @@ Foam::ReynoldsStress::ReynoldsStress const volVectorField& U, const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, - const transportModel& transport, - const word& propertiesName + const transportModel& transport ) : BasicTurbulenceModel @@ -125,8 +124,7 @@ Foam::ReynoldsStress::ReynoldsStress U, alphaRhoPhi, phi, - transport, - propertiesName + transport ), couplingFactor_ diff --git a/src/TurbulenceModels/turbulenceModels/ReynoldsStress/ReynoldsStress.H b/src/TurbulenceModels/turbulenceModels/ReynoldsStress/ReynoldsStress.H index 6ec5e3829f..a542f9c4d7 100644 --- a/src/TurbulenceModels/turbulenceModels/ReynoldsStress/ReynoldsStress.H +++ b/src/TurbulenceModels/turbulenceModels/ReynoldsStress/ReynoldsStress.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2015-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -99,8 +99,7 @@ public: const volVectorField& U, const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, - const transportModel& transport, - const word& propertiesName + const transportModel& transport ); diff --git a/src/TurbulenceModels/turbulenceModels/TurbulenceModel/TurbulenceModel.C b/src/TurbulenceModels/turbulenceModels/TurbulenceModel/TurbulenceModel.C index a40d0d1e4c..28803250c3 100644 --- a/src/TurbulenceModels/turbulenceModels/TurbulenceModel/TurbulenceModel.C +++ b/src/TurbulenceModels/turbulenceModels/TurbulenceModel/TurbulenceModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -44,8 +44,7 @@ TurbulenceModel const volVectorField& U, const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, - const transportModel& transport, - const word& propertiesName + const transportModel& transport ) : BasicTurbulenceModel @@ -53,8 +52,7 @@ TurbulenceModel rho, U, alphaRhoPhi, - phi, - propertiesName + phi ), alpha_(alpha), transport_(transport) @@ -81,8 +79,7 @@ Foam::TurbulenceModel::New const volVectorField& U, const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, - const transportModel& transport, - const word& propertiesName + const transportModel& transport ) { // get model name, but do not register the dictionary @@ -93,7 +90,11 @@ Foam::TurbulenceModel::New ( IOobject ( - IOobject::groupName(propertiesName, alphaRhoPhi.group()), + IOobject::groupName + ( + turbulenceModel::propertiesName, + alphaRhoPhi.group() + ), U.time().constant(), U.db(), IOobject::MUST_READ_IF_MODIFIED, @@ -120,7 +121,7 @@ Foam::TurbulenceModel::New return autoPtr ( - cstrIter()(alpha, rho, U, alphaRhoPhi, phi, transport, propertiesName) + cstrIter()(alpha, rho, U, alphaRhoPhi, phi, transport) ); } diff --git a/src/TurbulenceModels/turbulenceModels/TurbulenceModel/TurbulenceModel.H b/src/TurbulenceModels/turbulenceModels/TurbulenceModel/TurbulenceModel.H index 41e6a47c7e..01a7f8e2f1 100644 --- a/src/TurbulenceModels/turbulenceModels/TurbulenceModel/TurbulenceModel.H +++ b/src/TurbulenceModels/turbulenceModels/TurbulenceModel/TurbulenceModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -90,10 +90,9 @@ public: const volVectorField& U, const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, - const transportModel& transport, - const word& propertiesName + const transportModel& transport ), - (alpha, rho, U, alphaRhoPhi, phi, transport, propertiesName) + (alpha, rho, U, alphaRhoPhi, phi, transport) ); @@ -107,8 +106,7 @@ public: const volVectorField& U, const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, - const transportModel& transport, - const word& propertiesName + const transportModel& transport ); //- Disallow default bitwise copy construction @@ -125,8 +123,7 @@ public: const volVectorField& U, const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, - const transportModel& transport, - const word& propertiesName = turbulenceModel::propertiesName + const transportModel& transport ); diff --git a/src/TurbulenceModels/turbulenceModels/eddyViscosity/eddyViscosity.C b/src/TurbulenceModels/turbulenceModels/eddyViscosity/eddyViscosity.C index 62e82abe13..c329560e33 100644 --- a/src/TurbulenceModels/turbulenceModels/eddyViscosity/eddyViscosity.C +++ b/src/TurbulenceModels/turbulenceModels/eddyViscosity/eddyViscosity.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -38,8 +38,7 @@ Foam::eddyViscosity::eddyViscosity const volVectorField& U, const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, - const transportModel& transport, - const word& propertiesName + const transportModel& transport ) : linearViscousStress @@ -50,8 +49,7 @@ Foam::eddyViscosity::eddyViscosity U, alphaRhoPhi, phi, - transport, - propertiesName + transport ), nut_ diff --git a/src/TurbulenceModels/turbulenceModels/eddyViscosity/eddyViscosity.H b/src/TurbulenceModels/turbulenceModels/eddyViscosity/eddyViscosity.H index 641ab691c0..e72b32ec67 100644 --- a/src/TurbulenceModels/turbulenceModels/eddyViscosity/eddyViscosity.H +++ b/src/TurbulenceModels/turbulenceModels/eddyViscosity/eddyViscosity.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -84,8 +84,7 @@ public: const volVectorField& U, const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, - const transportModel& transport, - const word& propertiesName + const transportModel& transport ); diff --git a/src/TurbulenceModels/turbulenceModels/laminar/Giesekus/Giesekus.C b/src/TurbulenceModels/turbulenceModels/laminar/Giesekus/Giesekus.C index ac937aa093..f52f7d7718 100644 --- a/src/TurbulenceModels/turbulenceModels/laminar/Giesekus/Giesekus.C +++ b/src/TurbulenceModels/turbulenceModels/laminar/Giesekus/Giesekus.C @@ -63,7 +63,6 @@ Giesekus::Giesekus const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName, const word& type ) : @@ -75,7 +74,6 @@ Giesekus::Giesekus alphaRhoPhi, phi, transport, - propertiesName, type ), diff --git a/src/TurbulenceModels/turbulenceModels/laminar/Giesekus/Giesekus.H b/src/TurbulenceModels/turbulenceModels/laminar/Giesekus/Giesekus.H index 5fd1d2807f..b6a9efc3e8 100644 --- a/src/TurbulenceModels/turbulenceModels/laminar/Giesekus/Giesekus.H +++ b/src/TurbulenceModels/turbulenceModels/laminar/Giesekus/Giesekus.H @@ -105,7 +105,6 @@ public: const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName = turbulenceModel::propertiesName, const word& type = typeName ); diff --git a/src/TurbulenceModels/turbulenceModels/laminar/Maxwell/Maxwell.C b/src/TurbulenceModels/turbulenceModels/laminar/Maxwell/Maxwell.C index 57ebd3e397..d093805ede 100644 --- a/src/TurbulenceModels/turbulenceModels/laminar/Maxwell/Maxwell.C +++ b/src/TurbulenceModels/turbulenceModels/laminar/Maxwell/Maxwell.C @@ -109,7 +109,6 @@ Maxwell::Maxwell const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName, const word& type ) : @@ -121,8 +120,7 @@ Maxwell::Maxwell U, alphaRhoPhi, phi, - transport, - propertiesName + transport ), modeCoefficients_ diff --git a/src/TurbulenceModels/turbulenceModels/laminar/Maxwell/Maxwell.H b/src/TurbulenceModels/turbulenceModels/laminar/Maxwell/Maxwell.H index 73973aa3a1..737d033e92 100644 --- a/src/TurbulenceModels/turbulenceModels/laminar/Maxwell/Maxwell.H +++ b/src/TurbulenceModels/turbulenceModels/laminar/Maxwell/Maxwell.H @@ -146,7 +146,6 @@ public: const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName = turbulenceModel::propertiesName, const word& type = typeName ); diff --git a/src/TurbulenceModels/turbulenceModels/laminar/PTT/PTT.C b/src/TurbulenceModels/turbulenceModels/laminar/PTT/PTT.C index 515a2ecb91..6e8791e7db 100644 --- a/src/TurbulenceModels/turbulenceModels/laminar/PTT/PTT.C +++ b/src/TurbulenceModels/turbulenceModels/laminar/PTT/PTT.C @@ -64,7 +64,6 @@ PTT::PTT const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName, const word& type ) : @@ -76,7 +75,6 @@ PTT::PTT alphaRhoPhi, phi, transport, - propertiesName, type ), diff --git a/src/TurbulenceModels/turbulenceModels/laminar/PTT/PTT.H b/src/TurbulenceModels/turbulenceModels/laminar/PTT/PTT.H index 6454cedcce..b96b49005c 100644 --- a/src/TurbulenceModels/turbulenceModels/laminar/PTT/PTT.H +++ b/src/TurbulenceModels/turbulenceModels/laminar/PTT/PTT.H @@ -105,7 +105,6 @@ public: const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName = turbulenceModel::propertiesName, const word& type = typeName ); diff --git a/src/TurbulenceModels/turbulenceModels/laminar/Stokes/Stokes.C b/src/TurbulenceModels/turbulenceModels/laminar/Stokes/Stokes.C index 80421c39b3..5ad026ce08 100644 --- a/src/TurbulenceModels/turbulenceModels/laminar/Stokes/Stokes.C +++ b/src/TurbulenceModels/turbulenceModels/laminar/Stokes/Stokes.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -47,8 +47,7 @@ Stokes::Stokes const volVectorField& U, const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, - const transportModel& transport, - const word& propertiesName + const transportModel& transport ) : linearViscousStress> @@ -59,8 +58,7 @@ Stokes::Stokes U, alphaRhoPhi, phi, - transport, - propertiesName + transport ) {} diff --git a/src/TurbulenceModels/turbulenceModels/laminar/Stokes/Stokes.H b/src/TurbulenceModels/turbulenceModels/laminar/Stokes/Stokes.H index 1905099d8d..e65cef08a1 100644 --- a/src/TurbulenceModels/turbulenceModels/laminar/Stokes/Stokes.H +++ b/src/TurbulenceModels/turbulenceModels/laminar/Stokes/Stokes.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -76,8 +76,7 @@ public: const volVectorField& U, const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, - const transportModel& transport, - const word& propertiesName = turbulenceModel::propertiesName + const transportModel& transport ); @@ -91,8 +90,7 @@ public: const volVectorField& U, const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, - const transportModel& transport, - const word& propertiesName = turbulenceModel::propertiesName + const transportModel& transport ); diff --git a/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonian.C b/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonian.C index b03c01649a..88640aebb6 100644 --- a/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonian.C +++ b/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonian.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2018-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -47,8 +47,7 @@ generalizedNewtonian::generalizedNewtonian const volVectorField& U, const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, - const transportModel& transport, - const word& propertiesName + const transportModel& transport ) : linearViscousStress> @@ -59,8 +58,7 @@ generalizedNewtonian::generalizedNewtonian U, alphaRhoPhi, phi, - transport, - propertiesName + transport ), viscosityModel_ diff --git a/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonian.H b/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonian.H index c4d9a51ad4..0281164a0e 100644 --- a/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonian.H +++ b/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonian.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2018-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -93,8 +93,7 @@ public: const volVectorField& U, const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, - const transportModel& transport, - const word& propertiesName = turbulenceModel::propertiesName + const transportModel& transport ); @@ -108,8 +107,7 @@ public: const volVectorField& U, const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, - const transportModel& transport, - const word& propertiesName = turbulenceModel::propertiesName + const transportModel& transport ); diff --git a/src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.C b/src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.C index 475e1f9845..f50c68c48d 100644 --- a/src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.C +++ b/src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2016-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -49,8 +49,7 @@ Foam::laminarModel::laminarModel const volVectorField& U, const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, - const transportModel& transport, - const word& propertiesName + const transportModel& transport ) : BasicTurbulenceModel @@ -61,8 +60,7 @@ Foam::laminarModel::laminarModel U, alphaRhoPhi, phi, - transport, - propertiesName + transport ), laminarDict_(this->subOrEmptyDict("laminar")), @@ -86,15 +84,18 @@ Foam::laminarModel::New const volVectorField& U, const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, - const transportModel& transport, - const word& propertiesName + const transportModel& transport ) { IOdictionary modelDict ( IOobject ( - IOobject::groupName(propertiesName, alphaRhoPhi.group()), + IOobject::groupName + ( + turbulenceModel::propertiesName, + alphaRhoPhi.group() + ), U.time().constant(), U.db(), IOobject::MUST_READ_IF_MODIFIED, @@ -105,11 +106,11 @@ Foam::laminarModel::New if (modelDict.found("laminar")) { - // get model name, but do not register the dictionary - // otherwise it is registered in the database twice const word modelType ( - modelDict.subDict("laminar").lookup("laminarModel") + modelDict.subDict("laminar").found("model") + ? modelDict.subDict("laminar").lookup("model") + : modelDict.subDict("laminar").lookup("laminarModel") ); Info<< "Selecting laminar stress model " << modelType << endl; @@ -136,7 +137,8 @@ Foam::laminarModel::New U, alphaRhoPhi, phi, - transport, propertiesName) + transport + ) ); } else @@ -153,8 +155,7 @@ Foam::laminarModel::New U, alphaRhoPhi, phi, - transport, - propertiesName + transport ) ); } diff --git a/src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.H b/src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.H index 42057367ec..24dd3f86cd 100644 --- a/src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.H +++ b/src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2016-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -96,10 +96,9 @@ public: const volVectorField& U, const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, - const transportModel& transport, - const word& propertiesName + const transportModel& transport ), - (alpha, rho, U, alphaRhoPhi, phi, transport, propertiesName) + (alpha, rho, U, alphaRhoPhi, phi, transport) ); @@ -114,8 +113,7 @@ public: const volVectorField& U, const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, - const transportModel& transport, - const word& propertiesName + const transportModel& transport ); //- Disallow default bitwise copy construction @@ -132,8 +130,7 @@ public: const volVectorField& U, const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, - const transportModel& transport, - const word& propertiesName = turbulenceModel::propertiesName + const transportModel& transport ); diff --git a/src/TurbulenceModels/turbulenceModels/linearViscousStress/linearViscousStress.C b/src/TurbulenceModels/turbulenceModels/linearViscousStress/linearViscousStress.C index 0e7a86ca4d..9358ba8533 100644 --- a/src/TurbulenceModels/turbulenceModels/linearViscousStress/linearViscousStress.C +++ b/src/TurbulenceModels/turbulenceModels/linearViscousStress/linearViscousStress.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -38,8 +38,7 @@ Foam::linearViscousStress::linearViscousStress const volVectorField& U, const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, - const transportModel& transport, - const word& propertiesName + const transportModel& transport ) : BasicTurbulenceModel @@ -50,8 +49,7 @@ Foam::linearViscousStress::linearViscousStress U, alphaRhoPhi, phi, - transport, - propertiesName + transport ) {} diff --git a/src/TurbulenceModels/turbulenceModels/linearViscousStress/linearViscousStress.H b/src/TurbulenceModels/turbulenceModels/linearViscousStress/linearViscousStress.H index 5cc32d35f8..232b9d6cdf 100644 --- a/src/TurbulenceModels/turbulenceModels/linearViscousStress/linearViscousStress.H +++ b/src/TurbulenceModels/turbulenceModels/linearViscousStress/linearViscousStress.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -68,8 +68,7 @@ public: const volVectorField& U, const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, - const transportModel& transport, - const word& propertiesName + const transportModel& transport ); diff --git a/src/TurbulenceModels/turbulenceModels/nonlinearEddyViscosity/nonlinearEddyViscosity.C b/src/TurbulenceModels/turbulenceModels/nonlinearEddyViscosity/nonlinearEddyViscosity.C index e6fcc8a9ee..777375a2eb 100644 --- a/src/TurbulenceModels/turbulenceModels/nonlinearEddyViscosity/nonlinearEddyViscosity.C +++ b/src/TurbulenceModels/turbulenceModels/nonlinearEddyViscosity/nonlinearEddyViscosity.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2015-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -38,8 +38,7 @@ Foam::nonlinearEddyViscosity::nonlinearEddyViscosity const volVectorField& U, const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, - const transportModel& transport, - const word& propertiesName + const transportModel& transport ) : eddyViscosity @@ -50,8 +49,7 @@ Foam::nonlinearEddyViscosity::nonlinearEddyViscosity U, alphaRhoPhi, phi, - transport, - propertiesName + transport ), nonlinearStress_ diff --git a/src/TurbulenceModels/turbulenceModels/nonlinearEddyViscosity/nonlinearEddyViscosity.H b/src/TurbulenceModels/turbulenceModels/nonlinearEddyViscosity/nonlinearEddyViscosity.H index 036edc27b2..44cdd13e79 100644 --- a/src/TurbulenceModels/turbulenceModels/nonlinearEddyViscosity/nonlinearEddyViscosity.H +++ b/src/TurbulenceModels/turbulenceModels/nonlinearEddyViscosity/nonlinearEddyViscosity.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2015-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -84,8 +84,7 @@ public: const volVectorField& U, const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, - const transportModel& transport, - const word& propertiesName + const transportModel& transport ); diff --git a/src/TurbulenceModels/turbulenceModels/turbulenceModel.C b/src/TurbulenceModels/turbulenceModels/turbulenceModel.C index 815af55bfd..271103c52f 100644 --- a/src/TurbulenceModels/turbulenceModels/turbulenceModel.C +++ b/src/TurbulenceModels/turbulenceModels/turbulenceModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -44,8 +44,7 @@ Foam::turbulenceModel::turbulenceModel ( const volVectorField& U, const surfaceScalarField& alphaRhoPhi, - const surfaceScalarField& phi, - const word& propertiesName + const surfaceScalarField& phi ) : IOdictionary diff --git a/src/TurbulenceModels/turbulenceModels/turbulenceModel.H b/src/TurbulenceModels/turbulenceModels/turbulenceModel.H index 5e23228e12..7841f7330e 100644 --- a/src/TurbulenceModels/turbulenceModels/turbulenceModel.H +++ b/src/TurbulenceModels/turbulenceModels/turbulenceModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -90,8 +90,7 @@ public: ( const volVectorField& U, const surfaceScalarField& alphaRhoPhi, - const surfaceScalarField& phi, - const word& propertiesName + const surfaceScalarField& phi ); //- Disallow default bitwise copy construction diff --git a/src/atmosphericModels/kEpsilonLopesdaCosta/kEpsilonLopesdaCosta.C b/src/atmosphericModels/kEpsilonLopesdaCosta/kEpsilonLopesdaCosta.C index 4d7cbecbb1..5b14b33c8d 100644 --- a/src/atmosphericModels/kEpsilonLopesdaCosta/kEpsilonLopesdaCosta.C +++ b/src/atmosphericModels/kEpsilonLopesdaCosta/kEpsilonLopesdaCosta.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2018-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2018-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -181,7 +181,6 @@ kEpsilonLopesdaCosta::kEpsilonLopesdaCosta const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName, const word& type ) : @@ -193,8 +192,7 @@ kEpsilonLopesdaCosta::kEpsilonLopesdaCosta U, alphaRhoPhi, phi, - transport, - propertiesName + transport ), Cmu_ diff --git a/src/atmosphericModels/kEpsilonLopesdaCosta/kEpsilonLopesdaCosta.H b/src/atmosphericModels/kEpsilonLopesdaCosta/kEpsilonLopesdaCosta.H index 9a1fbf0b6e..ffaa77b5be 100644 --- a/src/atmosphericModels/kEpsilonLopesdaCosta/kEpsilonLopesdaCosta.H +++ b/src/atmosphericModels/kEpsilonLopesdaCosta/kEpsilonLopesdaCosta.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2018-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2018-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -159,7 +159,6 @@ public: const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, const transportModel& transport, - const word& propertiesName = turbulenceModel::propertiesName, const word& type = typeName );