From 5fadbeb5f1df18f404585424dbff4f117aa4995a Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Tue, 24 Jan 2023 22:02:00 +0000 Subject: [PATCH] MomentumTransportModels: Simplified code using the momentumTransportModel::groupName function --- .../RAS/LamBremhorstKE/LamBremhorstKE.C | 6 +++--- .../RAS/LienCubicKE/LienCubicKE.C | 6 +++--- .../RAS/LienCubicKE/LienCubicKE.H | 4 ++-- .../RAS/LienLeschziner/LienLeschziner.C | 6 +++--- .../RAS/ShihQuadraticKE/ShihQuadraticKE.C | 6 +++--- .../incompressible/RAS/kkLOmega/kkLOmega.C | 8 ++++---- .../incompressible/RAS/qZeta/qZeta.C | 10 +++++----- .../Base/kOmegaSST/kOmegaSSTBase.C | 6 +++--- .../DeardorffDiffStress/DeardorffDiffStress.C | 6 +++--- .../LES/LESModel/LESModel.C | 4 ++-- .../LES/LESModel/LESModel.H | 4 ++-- .../LES/LESeddyViscosity/LESeddyViscosity.C | 6 +++--- .../LES/Smagorinsky/Smagorinsky.C | 4 ++-- .../momentumTransportModels/LES/WALE/WALE.C | 6 +++--- .../LES/dynamicKEqn/dynamicKEqn.C | 6 +++--- .../LES/dynamicLagrangian/dynamicLagrangian.C | 6 +++--- .../momentumTransportModels/LES/kEqn/kEqn.C | 6 +++--- .../momentumTransportModels/RAS/LRR/LRR.C | 6 +++--- .../RAS/LaunderSharmaKE/LaunderSharmaKE.C | 6 +++--- .../RAS/RASModel/RASModel.H | 4 ++-- .../RAS/RNGkEpsilon/RNGkEpsilon.C | 6 +++--- .../momentumTransportModels/RAS/SSG/SSG.C | 6 +++--- .../RAS/kEpsilon/kEpsilon.C | 6 +++--- .../RAS/kOmega/kOmega.C | 6 +++--- .../RAS/kOmega2006/kOmega2006.C | 6 +++--- .../RAS/kOmegaSSTLM/kOmegaSSTLM.C | 18 +++++++++--------- .../RAS/kOmegaSSTSAS/kOmegaSSTSAS.C | 4 ++-- .../RAS/realizableKE/realizableKE.C | 6 +++--- .../momentumTransportModels/RAS/v2f/v2f.C | 10 +++++----- .../ReynoldsStress/ReynoldsStress.C | 8 ++++---- .../eddyViscosity/eddyViscosity.C | 6 +++--- .../laminar/Maxwell/Maxwell.C | 15 +++++++-------- .../laminar/Stokes/Stokes.C | 4 ++-- .../generalisedNewtonian.C | 4 ++-- .../lambdaThixotropic/lambdaThixotropic.C | 16 ++++------------ .../laminar/laminarModel/laminarModel.C | 12 ++++++------ .../nonlinearEddyViscosity.C | 4 ++-- .../continuousGasKEpsilon.C | 10 +++++----- .../RAS/mixtureKEpsilon/mixtureKEpsilon.C | 6 +++--- .../phaseCompressibleMomentumTransportModel.C | 6 +++--- ...phaseIncompressibleMomentumTransportModel.C | 6 +++--- 41 files changed, 136 insertions(+), 145 deletions(-) diff --git a/src/MomentumTransportModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C b/src/MomentumTransportModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C index dd8a57e4fb..357e8a812a 100644 --- a/src/MomentumTransportModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C +++ b/src/MomentumTransportModels/incompressible/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-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -149,7 +149,7 @@ LamBremhorstKE::LamBremhorstKE ( IOobject ( - IOobject::groupName("k", alphaRhoPhi.group()), + this->groupName("k"), runTime_.name(), mesh_, IOobject::MUST_READ, @@ -162,7 +162,7 @@ LamBremhorstKE::LamBremhorstKE ( IOobject ( - IOobject::groupName("epsilon", alphaRhoPhi.group()), + this->groupName("epsilon"), runTime_.name(), mesh_, IOobject::MUST_READ, diff --git a/src/MomentumTransportModels/incompressible/RAS/LienCubicKE/LienCubicKE.C b/src/MomentumTransportModels/incompressible/RAS/LienCubicKE/LienCubicKE.C index 88c54c444f..68e29706f2 100644 --- a/src/MomentumTransportModels/incompressible/RAS/LienCubicKE/LienCubicKE.C +++ b/src/MomentumTransportModels/incompressible/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-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -299,7 +299,7 @@ LienCubicKE::LienCubicKE ( IOobject ( - IOobject::groupName("k", alphaRhoPhi.group()), + this->groupName("k"), runTime_.name(), mesh_, IOobject::MUST_READ, @@ -312,7 +312,7 @@ LienCubicKE::LienCubicKE ( IOobject ( - IOobject::groupName("epsilon", alphaRhoPhi.group()), + this->groupName("epsilon"), runTime_.name(), mesh_, IOobject::MUST_READ, diff --git a/src/MomentumTransportModels/incompressible/RAS/LienCubicKE/LienCubicKE.H b/src/MomentumTransportModels/incompressible/RAS/LienCubicKE/LienCubicKE.H index 8c69ceaace..fe17ca053a 100644 --- a/src/MomentumTransportModels/incompressible/RAS/LienCubicKE/LienCubicKE.H +++ b/src/MomentumTransportModels/incompressible/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-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -206,7 +206,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace RASModels -} // Edn namespace incompressible +} // End namespace incompressible } // End namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/MomentumTransportModels/incompressible/RAS/LienLeschziner/LienLeschziner.C b/src/MomentumTransportModels/incompressible/RAS/LienLeschziner/LienLeschziner.C index 0e54c1fd2c..906953089a 100644 --- a/src/MomentumTransportModels/incompressible/RAS/LienLeschziner/LienLeschziner.C +++ b/src/MomentumTransportModels/incompressible/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-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -193,7 +193,7 @@ LienLeschziner::LienLeschziner ( IOobject ( - IOobject::groupName("k", alphaRhoPhi.group()), + this->groupName("k"), runTime_.name(), mesh_, IOobject::MUST_READ, @@ -206,7 +206,7 @@ LienLeschziner::LienLeschziner ( IOobject ( - IOobject::groupName("epsilon", alphaRhoPhi.group()), + this->groupName("epsilon"), runTime_.name(), mesh_, IOobject::MUST_READ, diff --git a/src/MomentumTransportModels/incompressible/RAS/ShihQuadraticKE/ShihQuadraticKE.C b/src/MomentumTransportModels/incompressible/RAS/ShihQuadraticKE/ShihQuadraticKE.C index efca9c2a5f..f2088ab9c7 100644 --- a/src/MomentumTransportModels/incompressible/RAS/ShihQuadraticKE/ShihQuadraticKE.C +++ b/src/MomentumTransportModels/incompressible/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-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -193,7 +193,7 @@ ShihQuadraticKE::ShihQuadraticKE ( IOobject ( - IOobject::groupName("k", alphaRhoPhi.group()), + this->groupName("k"), runTime_.name(), mesh_, IOobject::MUST_READ, @@ -206,7 +206,7 @@ ShihQuadraticKE::ShihQuadraticKE ( IOobject ( - IOobject::groupName("epsilon", alphaRhoPhi.group()), + this->groupName("epsilon"), runTime_.name(), mesh_, IOobject::MUST_READ, diff --git a/src/MomentumTransportModels/incompressible/RAS/kkLOmega/kkLOmega.C b/src/MomentumTransportModels/incompressible/RAS/kkLOmega/kkLOmega.C index 30cac278f8..beb4e3162d 100644 --- a/src/MomentumTransportModels/incompressible/RAS/kkLOmega/kkLOmega.C +++ b/src/MomentumTransportModels/incompressible/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-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -484,7 +484,7 @@ kkLOmega::kkLOmega ( IOobject ( - IOobject::groupName("kt", alphaRhoPhi.group()), + this->groupName("kt"), runTime_.name(), mesh_, IOobject::MUST_READ, @@ -496,7 +496,7 @@ kkLOmega::kkLOmega ( IOobject ( - IOobject::groupName("kl", alphaRhoPhi.group()), + this->groupName("kl"), runTime_.name(), mesh_, IOobject::MUST_READ, @@ -508,7 +508,7 @@ kkLOmega::kkLOmega ( IOobject ( - IOobject::groupName("omega", alphaRhoPhi.group()), + this->groupName("omega"), runTime_.name(), mesh_, IOobject::MUST_READ, diff --git a/src/MomentumTransportModels/incompressible/RAS/qZeta/qZeta.C b/src/MomentumTransportModels/incompressible/RAS/qZeta/qZeta.C index 5192e55094..3cf3734d33 100644 --- a/src/MomentumTransportModels/incompressible/RAS/qZeta/qZeta.C +++ b/src/MomentumTransportModels/incompressible/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-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -152,7 +152,7 @@ qZeta::qZeta ( IOobject ( - IOobject::groupName("k", alphaRhoPhi.group()), + this->groupName("k"), runTime_.name(), mesh_, IOobject::MUST_READ, @@ -165,7 +165,7 @@ qZeta::qZeta ( IOobject ( - IOobject::groupName("epsilon", alphaRhoPhi.group()), + this->groupName("epsilon"), runTime_.name(), mesh_, IOobject::MUST_READ, @@ -178,7 +178,7 @@ qZeta::qZeta ( IOobject ( - IOobject::groupName("q", alphaRhoPhi.group()), + this->groupName("q"), runTime_.name(), mesh_, IOobject::NO_READ, @@ -192,7 +192,7 @@ qZeta::qZeta ( IOobject ( - IOobject::groupName("zeta", alphaRhoPhi.group()), + this->groupName("zeta"), runTime_.name(), mesh_, IOobject::NO_READ, diff --git a/src/MomentumTransportModels/momentumTransportModels/Base/kOmegaSST/kOmegaSSTBase.C b/src/MomentumTransportModels/momentumTransportModels/Base/kOmegaSST/kOmegaSSTBase.C index f301b42f5a..8505a386b2 100644 --- a/src/MomentumTransportModels/momentumTransportModels/Base/kOmegaSST/kOmegaSSTBase.C +++ b/src/MomentumTransportModels/momentumTransportModels/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-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -360,7 +360,7 @@ kOmegaSST::kOmegaSST ( IOobject ( - IOobject::groupName("k", alphaRhoPhi.group()), + this->groupName("k"), this->runTime_.name(), this->mesh_, IOobject::MUST_READ, @@ -372,7 +372,7 @@ kOmegaSST::kOmegaSST ( IOobject ( - IOobject::groupName("omega", alphaRhoPhi.group()), + this->groupName("omega"), this->runTime_.name(), this->mesh_, IOobject::MUST_READ, diff --git a/src/MomentumTransportModels/momentumTransportModels/LES/DeardorffDiffStress/DeardorffDiffStress.C b/src/MomentumTransportModels/momentumTransportModels/LES/DeardorffDiffStress/DeardorffDiffStress.C index e38c8646c1..cb84b8c8dc 100644 --- a/src/MomentumTransportModels/momentumTransportModels/LES/DeardorffDiffStress/DeardorffDiffStress.C +++ b/src/MomentumTransportModels/momentumTransportModels/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-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -144,7 +144,7 @@ DeardorffDiffStress::epsilon() const return volScalarField::New ( - IOobject::groupName("epsilon", this->alphaRhoPhi_.group()), + this->groupName("epsilon"), this->Ce_*k*sqrt(k)/this->delta() ); } @@ -158,7 +158,7 @@ DeardorffDiffStress::omega() const return volScalarField::New ( - IOobject::groupName("omega", this->alphaRhoPhi_.group()), + this->groupName("omega"), (this->Ce_/this->Ck_)*sqrt(k)/this->delta() ); } diff --git a/src/MomentumTransportModels/momentumTransportModels/LES/LESModel/LESModel.C b/src/MomentumTransportModels/momentumTransportModels/LES/LESModel/LESModel.C index e9a0f26c83..79c06c39db 100644 --- a/src/MomentumTransportModels/momentumTransportModels/LES/LESModel/LESModel.C +++ b/src/MomentumTransportModels/momentumTransportModels/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-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -125,7 +125,7 @@ Foam::LESModel::LESModel ( LESdelta::New ( - IOobject::groupName("delta", alphaRhoPhi.group()), + this->groupName("delta"), *this, LESDict_ ) diff --git a/src/MomentumTransportModels/momentumTransportModels/LES/LESModel/LESModel.H b/src/MomentumTransportModels/momentumTransportModels/LES/LESModel/LESModel.H index 69c19e7750..4da45d9906 100644 --- a/src/MomentumTransportModels/momentumTransportModels/LES/LESModel/LESModel.H +++ b/src/MomentumTransportModels/momentumTransportModels/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-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -214,7 +214,7 @@ public: { return volScalarField::New ( - IOobject::groupName("nuEff", this->alphaRhoPhi_.group()), + this->groupName("nuEff"), this->nut() + this->nu() ); } diff --git a/src/MomentumTransportModels/momentumTransportModels/LES/LESeddyViscosity/LESeddyViscosity.C b/src/MomentumTransportModels/momentumTransportModels/LES/LESeddyViscosity/LESeddyViscosity.C index e167149969..3fbd24c61b 100644 --- a/src/MomentumTransportModels/momentumTransportModels/LES/LESeddyViscosity/LESeddyViscosity.C +++ b/src/MomentumTransportModels/momentumTransportModels/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-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -106,7 +106,7 @@ LESeddyViscosity::epsilon() const return volScalarField::New ( - IOobject::groupName("epsilon", this->alphaRhoPhi_.group()), + this->groupName("epsilon"), Ce_*tk()*sqrt(tk())/this->delta() ); } @@ -120,7 +120,7 @@ LESeddyViscosity::omega() const return volScalarField::New ( - IOobject::groupName("omega", this->alphaRhoPhi_.group()), + this->groupName("omega"), (Ce_/Ck_)*sqrt(tk())/this->delta() ); } diff --git a/src/MomentumTransportModels/momentumTransportModels/LES/Smagorinsky/Smagorinsky.C b/src/MomentumTransportModels/momentumTransportModels/LES/Smagorinsky/Smagorinsky.C index e67e0a729e..4915d7a251 100644 --- a/src/MomentumTransportModels/momentumTransportModels/LES/Smagorinsky/Smagorinsky.C +++ b/src/MomentumTransportModels/momentumTransportModels/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-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -50,7 +50,7 @@ tmp Smagorinsky::k return volScalarField::New ( - IOobject::groupName("k", this->alphaRhoPhi_.group()), + this->groupName("k"), sqr((-b + sqrt(sqr(b) + 4*a*c))/(2*a)) ); } diff --git a/src/MomentumTransportModels/momentumTransportModels/LES/WALE/WALE.C b/src/MomentumTransportModels/momentumTransportModels/LES/WALE/WALE.C index bc4674d57b..b79f01a471 100644 --- a/src/MomentumTransportModels/momentumTransportModels/LES/WALE/WALE.C +++ b/src/MomentumTransportModels/momentumTransportModels/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-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -56,7 +56,7 @@ tmp WALE::k return volScalarField::New ( - IOobject::groupName("k", this->alphaRhoPhi_.group()), + this->groupName("k"), sqr(sqr(Cw_)*this->delta()/Ck_)* ( pow3(magSqrSd) @@ -165,7 +165,7 @@ tmp WALE::epsilon() const return volScalarField::New ( - IOobject::groupName("epsilon", this->alphaRhoPhi_.group()), + this->groupName("epsilon"), this->Ce_*k*sqrt(k)/this->delta() ); } diff --git a/src/MomentumTransportModels/momentumTransportModels/LES/dynamicKEqn/dynamicKEqn.C b/src/MomentumTransportModels/momentumTransportModels/LES/dynamicKEqn/dynamicKEqn.C index a1991a315c..d243056c10 100644 --- a/src/MomentumTransportModels/momentumTransportModels/LES/dynamicKEqn/dynamicKEqn.C +++ b/src/MomentumTransportModels/momentumTransportModels/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-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -169,7 +169,7 @@ dynamicKEqn::dynamicKEqn ( IOobject ( - IOobject::groupName("k", this->alphaRhoPhi_.group()), + this->groupName("k"), this->runTime_.name(), this->mesh_, IOobject::MUST_READ, @@ -214,7 +214,7 @@ tmp dynamicKEqn::epsilon() const { return volScalarField::New ( - IOobject::groupName("epsilon", this->alphaRhoPhi_.group()), + this->groupName("epsilon"), Ce()*k()*sqrt(k())/this->delta() ); } diff --git a/src/MomentumTransportModels/momentumTransportModels/LES/dynamicLagrangian/dynamicLagrangian.C b/src/MomentumTransportModels/momentumTransportModels/LES/dynamicLagrangian/dynamicLagrangian.C index beb9037260..119713d9d1 100644 --- a/src/MomentumTransportModels/momentumTransportModels/LES/dynamicLagrangian/dynamicLagrangian.C +++ b/src/MomentumTransportModels/momentumTransportModels/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-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -84,7 +84,7 @@ dynamicLagrangian::dynamicLagrangian ( IOobject ( - IOobject::groupName("flm", this->alphaRhoPhi_.group()), + this->groupName("flm"), this->runTime_.name(), this->mesh_, IOobject::MUST_READ, @@ -96,7 +96,7 @@ dynamicLagrangian::dynamicLagrangian ( IOobject ( - IOobject::groupName("fmm", this->alphaRhoPhi_.group()), + this->groupName("fmm"), this->runTime_.name(), this->mesh_, IOobject::MUST_READ, diff --git a/src/MomentumTransportModels/momentumTransportModels/LES/kEqn/kEqn.C b/src/MomentumTransportModels/momentumTransportModels/LES/kEqn/kEqn.C index 73c62adbcb..e1306ffbe1 100644 --- a/src/MomentumTransportModels/momentumTransportModels/LES/kEqn/kEqn.C +++ b/src/MomentumTransportModels/momentumTransportModels/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-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -89,7 +89,7 @@ kEqn::kEqn ( IOobject ( - IOobject::groupName("k", this->alphaRhoPhi_.group()), + this->groupName("k"), this->runTime_.name(), this->mesh_, IOobject::MUST_READ, @@ -140,7 +140,7 @@ tmp kEqn::epsilon() const { return volScalarField::New ( - IOobject::groupName("epsilon", this->alphaRhoPhi_.group()), + this->groupName("epsilon"), this->Ce_*k()*sqrt(k())/this->delta() ); } diff --git a/src/MomentumTransportModels/momentumTransportModels/RAS/LRR/LRR.C b/src/MomentumTransportModels/momentumTransportModels/RAS/LRR/LRR.C index d9a1588aec..24bdba27b7 100644 --- a/src/MomentumTransportModels/momentumTransportModels/RAS/LRR/LRR.C +++ b/src/MomentumTransportModels/momentumTransportModels/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-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -190,7 +190,7 @@ LRR::LRR ( IOobject ( - IOobject::groupName("k", alphaRhoPhi.group()), + this->groupName("k"), this->runTime_.name(), this->mesh_, IOobject::NO_READ, @@ -202,7 +202,7 @@ LRR::LRR ( IOobject ( - IOobject::groupName("epsilon", alphaRhoPhi.group()), + this->groupName("epsilon"), this->runTime_.name(), this->mesh_, IOobject::MUST_READ, diff --git a/src/MomentumTransportModels/momentumTransportModels/RAS/LaunderSharmaKE/LaunderSharmaKE.C b/src/MomentumTransportModels/momentumTransportModels/RAS/LaunderSharmaKE/LaunderSharmaKE.C index a62c0c280d..fa379b4be0 100644 --- a/src/MomentumTransportModels/momentumTransportModels/RAS/LaunderSharmaKE/LaunderSharmaKE.C +++ b/src/MomentumTransportModels/momentumTransportModels/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-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -179,7 +179,7 @@ LaunderSharmaKE::LaunderSharmaKE ( IOobject ( - IOobject::groupName("k", alphaRhoPhi.group()), + this->groupName("k"), this->runTime_.name(), this->mesh_, IOobject::MUST_READ, @@ -192,7 +192,7 @@ LaunderSharmaKE::LaunderSharmaKE ( IOobject ( - IOobject::groupName("epsilon", alphaRhoPhi.group()), + this->groupName("epsilon"), this->runTime_.name(), this->mesh_, IOobject::MUST_READ, diff --git a/src/MomentumTransportModels/momentumTransportModels/RAS/RASModel/RASModel.H b/src/MomentumTransportModels/momentumTransportModels/RAS/RASModel/RASModel.H index 3d099219f9..d0d1f284fa 100644 --- a/src/MomentumTransportModels/momentumTransportModels/RAS/RASModel/RASModel.H +++ b/src/MomentumTransportModels/momentumTransportModels/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-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -222,7 +222,7 @@ public: { return volScalarField::New ( - IOobject::groupName("nuEff", this->alphaRhoPhi_.group()), + this->groupName("nuEff"), this->nut() + this->nu() ); } diff --git a/src/MomentumTransportModels/momentumTransportModels/RAS/RNGkEpsilon/RNGkEpsilon.C b/src/MomentumTransportModels/momentumTransportModels/RAS/RNGkEpsilon/RNGkEpsilon.C index 2e5e486727..17ea2fce31 100644 --- a/src/MomentumTransportModels/momentumTransportModels/RAS/RNGkEpsilon/RNGkEpsilon.C +++ b/src/MomentumTransportModels/momentumTransportModels/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-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -179,7 +179,7 @@ RNGkEpsilon::RNGkEpsilon ( IOobject ( - IOobject::groupName("k", alphaRhoPhi.group()), + this->groupName("k"), this->runTime_.name(), this->mesh_, IOobject::MUST_READ, @@ -191,7 +191,7 @@ RNGkEpsilon::RNGkEpsilon ( IOobject ( - IOobject::groupName("epsilon", alphaRhoPhi.group()), + this->groupName("epsilon"), this->runTime_.name(), this->mesh_, IOobject::MUST_READ, diff --git a/src/MomentumTransportModels/momentumTransportModels/RAS/SSG/SSG.C b/src/MomentumTransportModels/momentumTransportModels/RAS/SSG/SSG.C index e83a9913d0..26b6f345e3 100644 --- a/src/MomentumTransportModels/momentumTransportModels/RAS/SSG/SSG.C +++ b/src/MomentumTransportModels/momentumTransportModels/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-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -199,7 +199,7 @@ SSG::SSG ( IOobject ( - IOobject::groupName("k", alphaRhoPhi.group()), + this->groupName("k"), this->runTime_.name(), this->mesh_, IOobject::NO_READ, @@ -211,7 +211,7 @@ SSG::SSG ( IOobject ( - IOobject::groupName("epsilon", alphaRhoPhi.group()), + this->groupName("epsilon"), this->runTime_.name(), this->mesh_, IOobject::MUST_READ, diff --git a/src/MomentumTransportModels/momentumTransportModels/RAS/kEpsilon/kEpsilon.C b/src/MomentumTransportModels/momentumTransportModels/RAS/kEpsilon/kEpsilon.C index 374bb83280..c0464bd8bf 100644 --- a/src/MomentumTransportModels/momentumTransportModels/RAS/kEpsilon/kEpsilon.C +++ b/src/MomentumTransportModels/momentumTransportModels/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-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -160,7 +160,7 @@ kEpsilon::kEpsilon ( IOobject ( - IOobject::groupName("k", alphaRhoPhi.group()), + this->groupName("k"), this->runTime_.name(), this->mesh_, IOobject::MUST_READ, @@ -172,7 +172,7 @@ kEpsilon::kEpsilon ( IOobject ( - IOobject::groupName("epsilon", alphaRhoPhi.group()), + this->groupName("epsilon"), this->runTime_.name(), this->mesh_, IOobject::MUST_READ, diff --git a/src/MomentumTransportModels/momentumTransportModels/RAS/kOmega/kOmega.C b/src/MomentumTransportModels/momentumTransportModels/RAS/kOmega/kOmega.C index 2307a7a890..fb80ee2c9a 100644 --- a/src/MomentumTransportModels/momentumTransportModels/RAS/kOmega/kOmega.C +++ b/src/MomentumTransportModels/momentumTransportModels/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-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -150,7 +150,7 @@ kOmega::kOmega ( IOobject ( - IOobject::groupName("k", alphaRhoPhi.group()), + this->groupName("k"), this->runTime_.name(), this->mesh_, IOobject::MUST_READ, @@ -162,7 +162,7 @@ kOmega::kOmega ( IOobject ( - IOobject::groupName("omega", alphaRhoPhi.group()), + this->groupName("omega"), this->runTime_.name(), this->mesh_, IOobject::MUST_READ, diff --git a/src/MomentumTransportModels/momentumTransportModels/RAS/kOmega2006/kOmega2006.C b/src/MomentumTransportModels/momentumTransportModels/RAS/kOmega2006/kOmega2006.C index 0781a6284b..37b159c3a3 100644 --- a/src/MomentumTransportModels/momentumTransportModels/RAS/kOmega2006/kOmega2006.C +++ b/src/MomentumTransportModels/momentumTransportModels/RAS/kOmega2006/kOmega2006.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2021-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2021-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -216,7 +216,7 @@ kOmega2006::kOmega2006 ( IOobject ( - IOobject::groupName("k", alphaRhoPhi.group()), + this->groupName("k"), this->runTime_.name(), this->mesh_, IOobject::MUST_READ, @@ -228,7 +228,7 @@ kOmega2006::kOmega2006 ( IOobject ( - IOobject::groupName("omega", alphaRhoPhi.group()), + this->groupName("omega"), this->runTime_.name(), this->mesh_, IOobject::MUST_READ, diff --git a/src/MomentumTransportModels/momentumTransportModels/RAS/kOmegaSSTLM/kOmegaSSTLM.C b/src/MomentumTransportModels/momentumTransportModels/RAS/kOmegaSSTLM/kOmegaSSTLM.C index d5faceb2b8..ffe39f2999 100644 --- a/src/MomentumTransportModels/momentumTransportModels/RAS/kOmegaSSTLM/kOmegaSSTLM.C +++ b/src/MomentumTransportModels/momentumTransportModels/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-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -88,7 +88,7 @@ tmp kOmegaSSTLM::Fthetat return volScalarField::Internal::New ( - IOobject::groupName("Fthetat", this->alphaRhoPhi_.group()), + this->groupName("Fthetat"), min ( max @@ -110,7 +110,7 @@ kOmegaSSTLM::ReThetac() const ( volScalarField::Internal::New ( - IOobject::groupName("ReThetac", this->alphaRhoPhi_.group()), + this->groupName("ReThetac"), this->mesh_, dimless ) @@ -148,7 +148,7 @@ tmp kOmegaSSTLM::Flength ( volScalarField::Internal::New ( - IOobject::groupName("Flength", this->alphaRhoPhi_.group()), + this->groupName("Flength"), this->mesh_, dimless ) @@ -209,7 +209,7 @@ kOmegaSSTLM::ReThetat0 ( volScalarField::Internal::New ( - IOobject::groupName("ReThetat0", this->alphaRhoPhi_.group()), + this->groupName("ReThetat0"), this->mesh_, dimless ) @@ -325,7 +325,7 @@ tmp kOmegaSSTLM::Fonset return volScalarField::Internal::New ( - IOobject::groupName("Fonset", this->alphaRhoPhi_.group()), + this->groupName("Fonset"), max(Fonset2 - Fonset3, scalar(0)) ); } @@ -423,7 +423,7 @@ kOmegaSSTLM::kOmegaSSTLM ( IOobject ( - IOobject::groupName("ReThetat", alphaRhoPhi.group()), + this->groupName("ReThetat"), this->runTime_.name(), this->mesh_, IOobject::MUST_READ, @@ -436,7 +436,7 @@ kOmegaSSTLM::kOmegaSSTLM ( IOobject ( - IOobject::groupName("gammaInt", alphaRhoPhi.group()), + this->groupName("gammaInt"), this->runTime_.name(), this->mesh_, IOobject::MUST_READ, @@ -449,7 +449,7 @@ kOmegaSSTLM::kOmegaSSTLM ( IOobject ( - IOobject::groupName("gammaIntEff", alphaRhoPhi.group()), + this->groupName("gammaIntEff"), this->runTime_.name(), this->mesh_ ), diff --git a/src/MomentumTransportModels/momentumTransportModels/RAS/kOmegaSSTSAS/kOmegaSSTSAS.C b/src/MomentumTransportModels/momentumTransportModels/RAS/kOmegaSSTSAS/kOmegaSSTSAS.C index 6ff2858732..730bb8c244 100644 --- a/src/MomentumTransportModels/momentumTransportModels/RAS/kOmegaSSTSAS/kOmegaSSTSAS.C +++ b/src/MomentumTransportModels/momentumTransportModels/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-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -165,7 +165,7 @@ kOmegaSSTSAS::kOmegaSSTSAS ( LESdelta::New ( - IOobject::groupName("delta", alphaRhoPhi.group()), + this->groupName("delta"), *this, this->coeffDict_ ) diff --git a/src/MomentumTransportModels/momentumTransportModels/RAS/realizableKE/realizableKE.C b/src/MomentumTransportModels/momentumTransportModels/RAS/realizableKE/realizableKE.C index e13f1a5d23..3fa695ffde 100644 --- a/src/MomentumTransportModels/momentumTransportModels/RAS/realizableKE/realizableKE.C +++ b/src/MomentumTransportModels/momentumTransportModels/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-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -191,7 +191,7 @@ realizableKE::realizableKE ( IOobject ( - IOobject::groupName("k", alphaRhoPhi.group()), + this->groupName("k"), this->runTime_.name(), this->mesh_, IOobject::MUST_READ, @@ -203,7 +203,7 @@ realizableKE::realizableKE ( IOobject ( - IOobject::groupName("epsilon", alphaRhoPhi.group()), + this->groupName("epsilon"), this->runTime_.name(), this->mesh_, IOobject::MUST_READ, diff --git a/src/MomentumTransportModels/momentumTransportModels/RAS/v2f/v2f.C b/src/MomentumTransportModels/momentumTransportModels/RAS/v2f/v2f.C index 2f0e2c3d91..910297dcd0 100644 --- a/src/MomentumTransportModels/momentumTransportModels/RAS/v2f/v2f.C +++ b/src/MomentumTransportModels/momentumTransportModels/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-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -183,7 +183,7 @@ v2f::v2f ( IOobject ( - IOobject::groupName("k", alphaRhoPhi.group()), + this->groupName("k"), this->runTime_.name(), this->mesh_, IOobject::MUST_READ, @@ -195,7 +195,7 @@ v2f::v2f ( IOobject ( - IOobject::groupName("epsilon", alphaRhoPhi.group()), + this->groupName("epsilon"), this->runTime_.name(), this->mesh_, IOobject::MUST_READ, @@ -207,7 +207,7 @@ v2f::v2f ( IOobject ( - IOobject::groupName("v2", alphaRhoPhi.group()), + this->groupName("v2"), this->runTime_.name(), this->mesh_, IOobject::MUST_READ, @@ -219,7 +219,7 @@ v2f::v2f ( IOobject ( - IOobject::groupName("f", alphaRhoPhi.group()), + this->groupName("f"), this->runTime_.name(), this->mesh_, IOobject::MUST_READ, diff --git a/src/MomentumTransportModels/momentumTransportModels/ReynoldsStress/ReynoldsStress.C b/src/MomentumTransportModels/momentumTransportModels/ReynoldsStress/ReynoldsStress.C index 5e21ca7008..6ffb32f1da 100644 --- a/src/MomentumTransportModels/momentumTransportModels/ReynoldsStress/ReynoldsStress.C +++ b/src/MomentumTransportModels/momentumTransportModels/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-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -154,7 +154,7 @@ Foam::ReynoldsStress::ReynoldsStress ( IOobject ( - IOobject::groupName("R", alphaRhoPhi.group()), + this->groupName("R"), this->runTime_.name(), this->mesh_, IOobject::MUST_READ, @@ -167,7 +167,7 @@ Foam::ReynoldsStress::ReynoldsStress ( IOobject ( - IOobject::groupName("nut", alphaRhoPhi.group()), + this->groupName("nut"), this->runTime_.name(), this->mesh_, IOobject::MUST_READ, @@ -219,7 +219,7 @@ Foam::ReynoldsStress::devTau() const { return volSymmTensorField::New ( - IOobject::groupName("devTau", this->alphaRhoPhi_.group()), + this->groupName("devTau"), this->alpha_*this->rho_*R_ - (this->alpha_*this->rho_*this->nu()) *dev(twoSymm(fvc::grad(this->U_))) diff --git a/src/MomentumTransportModels/momentumTransportModels/eddyViscosity/eddyViscosity.C b/src/MomentumTransportModels/momentumTransportModels/eddyViscosity/eddyViscosity.C index 7a2d2d2aa3..429dccf78f 100644 --- a/src/MomentumTransportModels/momentumTransportModels/eddyViscosity/eddyViscosity.C +++ b/src/MomentumTransportModels/momentumTransportModels/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-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -57,7 +57,7 @@ Foam::eddyViscosity::eddyViscosity ( IOobject ( - IOobject::groupName("nut", alphaRhoPhi.group()), + this->groupName("nut"), this->runTime_.name(), this->mesh_, IOobject::MUST_READ, @@ -102,7 +102,7 @@ Foam::eddyViscosity::sigma() const return volSymmTensorField::New ( - IOobject::groupName("R", this->alphaRhoPhi_.group()), + this->groupName("R"), ((2.0/3.0)*I)*tk() - (nut_)*dev(twoSymm(fvc::grad(this->U_))), patchFieldTypes ); diff --git a/src/MomentumTransportModels/momentumTransportModels/laminar/Maxwell/Maxwell.C b/src/MomentumTransportModels/momentumTransportModels/laminar/Maxwell/Maxwell.C index 777244bf88..337cf2b6d5 100644 --- a/src/MomentumTransportModels/momentumTransportModels/laminar/Maxwell/Maxwell.C +++ b/src/MomentumTransportModels/momentumTransportModels/laminar/Maxwell/Maxwell.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2016-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -144,7 +144,7 @@ Maxwell::Maxwell ( IOobject ( - IOobject::groupName("sigma", alphaRhoPhi.group()), + this->groupName("sigma"), this->runTime_.name(), this->mesh_, IOobject::MUST_READ, @@ -161,7 +161,7 @@ Maxwell::Maxwell { typeIOobject header ( - IOobject::groupName("sigma" + name(modei), alphaRhoPhi.group()), + this->groupName("sigma" + name(modei)), this->runTime_.name(), this->mesh_, IOobject::NO_READ @@ -249,7 +249,7 @@ tmp Maxwell::nuEff() const { return volScalarField::New ( - IOobject::groupName("nuEff", this->alphaRhoPhi_.group()), + this->groupName("nuEff"), this->nu() ); } @@ -277,7 +277,7 @@ tmp Maxwell::devTau() const { return volSymmTensorField::New ( - IOobject::groupName("devTau", this->alphaRhoPhi_.group()), + this->groupName("devTau"), this->alpha_*this->rho_*sigma_ - (this->alpha_*this->rho_*this->nu()) *dev(twoSymm(fvc::grad(this->U_))) @@ -352,11 +352,10 @@ void Maxwell::correct() ( IOobject ( - IOobject::groupName + this->groupName ( "rLambda" - + (nModes_ == 1 ? word::null : name(modei)), - this->alphaRhoPhi_.group() + + (nModes_ == 1 ? word::null : name(modei)) ), this->runTime_.constant(), this->mesh_ diff --git a/src/MomentumTransportModels/momentumTransportModels/laminar/Stokes/Stokes.C b/src/MomentumTransportModels/momentumTransportModels/laminar/Stokes/Stokes.C index 97b05058e2..6fe73db0bc 100644 --- a/src/MomentumTransportModels/momentumTransportModels/laminar/Stokes/Stokes.C +++ b/src/MomentumTransportModels/momentumTransportModels/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-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -84,7 +84,7 @@ tmp Stokes::nuEff() const { return volScalarField::New ( - IOobject::groupName("nuEff", this->alphaRhoPhi_.group()), + this->groupName("nuEff"), this->nu() ); } diff --git a/src/MomentumTransportModels/momentumTransportModels/laminar/generalisedNewtonian/generalisedNewtonian.C b/src/MomentumTransportModels/momentumTransportModels/laminar/generalisedNewtonian/generalisedNewtonian.C index 5336a9a2d2..ea82525511 100644 --- a/src/MomentumTransportModels/momentumTransportModels/laminar/generalisedNewtonian/generalisedNewtonian.C +++ b/src/MomentumTransportModels/momentumTransportModels/laminar/generalisedNewtonian/generalisedNewtonian.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2018-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2018-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -90,7 +90,7 @@ generalisedNewtonian::nuEff() const { return volScalarField::New ( - IOobject::groupName("nuEff", this->alphaRhoPhi_.group()), + this->groupName("nuEff"), viscosityModel_->nu() ); } diff --git a/src/MomentumTransportModels/momentumTransportModels/laminar/lambdaThixotropic/lambdaThixotropic.C b/src/MomentumTransportModels/momentumTransportModels/laminar/lambdaThixotropic/lambdaThixotropic.C index dc6e39db9c..072548ce7b 100644 --- a/src/MomentumTransportModels/momentumTransportModels/laminar/lambdaThixotropic/lambdaThixotropic.C +++ b/src/MomentumTransportModels/momentumTransportModels/laminar/lambdaThixotropic/lambdaThixotropic.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2020-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2020-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -73,11 +73,7 @@ lambdaThixotropic::lambdaThixotropic ( IOobject ( - IOobject::groupName - ( - typedName("lambda"), - alphaRhoPhi.group() - ), + this->groupName(typedName("lambda")), this->runTime_.name(), this->mesh_, IOobject::MUST_READ, @@ -90,11 +86,7 @@ lambdaThixotropic::lambdaThixotropic ( IOobject ( - IOobject::groupName - ( - typedName("nu"), - alphaRhoPhi.group() - ), + this->groupName(typedName("nu")), this->runTime_.name(), this->mesh_, IOobject::NO_READ, @@ -161,7 +153,7 @@ lambdaThixotropic::nuEff() const { return volScalarField::New ( - IOobject::groupName("nuEff", this->alphaRhoPhi_.group()), + this->groupName("nuEff"), nu_ ); } diff --git a/src/MomentumTransportModels/momentumTransportModels/laminar/laminarModel/laminarModel.C b/src/MomentumTransportModels/momentumTransportModels/laminar/laminarModel/laminarModel.C index e269b5c572..5727ac6c2a 100644 --- a/src/MomentumTransportModels/momentumTransportModels/laminar/laminarModel/laminarModel.C +++ b/src/MomentumTransportModels/momentumTransportModels/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-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -183,7 +183,7 @@ Foam::laminarModel::nut() const { return volScalarField::New ( - IOobject::groupName("nut", this->alphaRhoPhi_.group()), + this->groupName("nut"), this->mesh_, dimensionedScalar(dimViscosity, 0) ); @@ -210,7 +210,7 @@ Foam::laminarModel::k() const { return volScalarField::New ( - IOobject::groupName("k", this->alphaRhoPhi_.group()), + this->groupName("k"), this->mesh_, dimensionedScalar(sqr(dimVelocity), 0) ); @@ -223,7 +223,7 @@ Foam::laminarModel::epsilon() const { return volScalarField::New ( - IOobject::groupName("epsilon", this->alphaRhoPhi_.group()), + this->groupName("epsilon"), this->mesh_, dimensionedScalar(sqr(dimVelocity)/dimTime, 0) ); @@ -236,7 +236,7 @@ Foam::laminarModel::omega() const { return volScalarField::New ( - IOobject::groupName("omega", this->alphaRhoPhi_.group()), + this->groupName("omega"), this->mesh_, dimensionedScalar(dimless/dimTime, 0) ); @@ -249,7 +249,7 @@ Foam::laminarModel::sigma() const { return volSymmTensorField::New ( - IOobject::groupName("sigma", this->alphaRhoPhi_.group()), + this->groupName("sigma"), this->mesh_, dimensionedSymmTensor(sqr(this->U_.dimensions()), Zero) ); diff --git a/src/MomentumTransportModels/momentumTransportModels/nonlinearEddyViscosity/nonlinearEddyViscosity.C b/src/MomentumTransportModels/momentumTransportModels/nonlinearEddyViscosity/nonlinearEddyViscosity.C index 65137ad063..77b9926a32 100644 --- a/src/MomentumTransportModels/momentumTransportModels/nonlinearEddyViscosity/nonlinearEddyViscosity.C +++ b/src/MomentumTransportModels/momentumTransportModels/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-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -55,7 +55,7 @@ nonlinearEddyViscosity ( IOobject ( - IOobject::groupName("nonlinearStress", alphaRhoPhi.group()), + this->groupName("nonlinearStress"), this->runTime_.name(), this->mesh_ ), diff --git a/src/MomentumTransportModels/phaseCompressible/RAS/continuousGasKEpsilon/continuousGasKEpsilon.C b/src/MomentumTransportModels/phaseCompressible/RAS/continuousGasKEpsilon/continuousGasKEpsilon.C index e19bc80ac2..4b7af316de 100644 --- a/src/MomentumTransportModels/phaseCompressible/RAS/continuousGasKEpsilon/continuousGasKEpsilon.C +++ b/src/MomentumTransportModels/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-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -68,7 +68,7 @@ continuousGasKEpsilon::continuousGasKEpsilon ( IOobject ( - IOobject::groupName("nutEff", alphaRhoPhi.group()), + this->groupName("nutEff"), this->runTime_.name(), this->mesh_, IOobject::READ_IF_PRESENT, @@ -188,7 +188,7 @@ continuousGasKEpsilon::nuEff() const return volScalarField::New ( - IOobject::groupName("nuEff", this->alphaRhoPhi_.group()), + this->groupName("nuEff"), blend*this->nut_ + (1.0 - blend)*rhoEff()*nutEff_/this->rho_ + this->nu() @@ -211,7 +211,7 @@ continuousGasKEpsilon::rhoEff() const return volScalarField::New ( - IOobject::groupName("rhoEff", this->alphaRhoPhi_.group()), + this->groupName("rhoEff"), gas.rho() + (virtualMass.Cvm() + 3.0/20.0)*liquid.rho() ); } @@ -274,7 +274,7 @@ continuousGasKEpsilon::sigma() const return volSymmTensorField::New ( - IOobject::groupName("R", this->alphaRhoPhi_.group()), + this->groupName("R"), ((2.0/3.0)*I)*tk() - (nutEff_)*dev(twoSymm(fvc::grad(this->U_))), tk().boundaryField().types() ); diff --git a/src/MomentumTransportModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.C b/src/MomentumTransportModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.C index d29ecdf94e..1c637bf6f6 100644 --- a/src/MomentumTransportModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.C +++ b/src/MomentumTransportModels/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-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -146,7 +146,7 @@ mixtureKEpsilon::mixtureKEpsilon ( IOobject ( - IOobject::groupName("k", alphaRhoPhi.group()), + this->groupName("k"), this->runTime_.name(), this->mesh_, IOobject::MUST_READ, @@ -158,7 +158,7 @@ mixtureKEpsilon::mixtureKEpsilon ( IOobject ( - IOobject::groupName("epsilon", alphaRhoPhi.group()), + this->groupName("epsilon"), this->runTime_.name(), this->mesh_, IOobject::MUST_READ, diff --git a/src/MomentumTransportModels/phaseCompressible/phaseCompressibleMomentumTransportModel.C b/src/MomentumTransportModels/phaseCompressible/phaseCompressibleMomentumTransportModel.C index 7bc1ba63e6..b7acb27e90 100644 --- a/src/MomentumTransportModels/phaseCompressible/phaseCompressibleMomentumTransportModel.C +++ b/src/MomentumTransportModels/phaseCompressible/phaseCompressibleMomentumTransportModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -89,7 +89,7 @@ Foam::phaseCompressibleMomentumTransportModel::pPrime() const { return volScalarField::New ( - IOobject::groupName("pPrime", this->alphaRhoPhi_.group()), + this->groupName("pPrime"), this->mesh_, dimensionedScalar(dimPressure, 0) ); @@ -101,7 +101,7 @@ Foam::phaseCompressibleMomentumTransportModel::pPrimef() const { return surfaceScalarField::New ( - IOobject::groupName("pPrimef", this->alphaRhoPhi_.group()), + this->groupName("pPrimef"), this->mesh_, dimensionedScalar(dimPressure, 0) ); diff --git a/src/MomentumTransportModels/phaseIncompressible/phaseIncompressibleMomentumTransportModel.C b/src/MomentumTransportModels/phaseIncompressible/phaseIncompressibleMomentumTransportModel.C index 16e9f19ab4..579a2af7ac 100644 --- a/src/MomentumTransportModels/phaseIncompressible/phaseIncompressibleMomentumTransportModel.C +++ b/src/MomentumTransportModels/phaseIncompressible/phaseIncompressibleMomentumTransportModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -88,7 +88,7 @@ Foam::phaseIncompressibleMomentumTransportModel::pPrime() const { return volScalarField::New ( - IOobject::groupName("pPrime", this->alphaRhoPhi_.group()), + this->groupName("pPrime"), this->mesh_, dimensionedScalar(dimPressure, 0) ); @@ -100,7 +100,7 @@ Foam::phaseIncompressibleMomentumTransportModel::pPrimef() const { return surfaceScalarField::New ( - IOobject::groupName("pPrimef", this->alphaRhoPhi_.group()), + this->groupName("pPrimef"), this->mesh_, dimensionedScalar(dimPressure, 0) );