diff --git a/applications/solvers/multiphase/VoF/createAlphaFluxes.H b/applications/solvers/multiphase/VoF/createAlphaFluxes.H index a9004f2f8e..9c1004951b 100644 --- a/applications/solvers/multiphase/VoF/createAlphaFluxes.H +++ b/applications/solvers/multiphase/VoF/createAlphaFluxes.H @@ -1,6 +1,6 @@ IOobject alphaPhi10Header ( - "alphaPhi10", + IOobject::groupName("alphaPhi0", alpha1.group()), runTime.timeName(), mesh, IOobject::READ_IF_PRESENT, diff --git a/src/TurbulenceModels/compressible/EddyDiffusivity/EddyDiffusivity.C b/src/TurbulenceModels/compressible/EddyDiffusivity/EddyDiffusivity.C index 1647c88ca8..f983d60aa6 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 | - \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -77,7 +77,7 @@ Foam::EddyDiffusivity::EddyDiffusivity ( IOobject ( - IOobject::groupName("alphat", U.group()), + IOobject::groupName("alphat", alphaRhoPhi.group()), this->runTime_.timeName(), this->mesh_, IOobject::MUST_READ, diff --git a/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.C b/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.C index f0f04409c6..28db75565e 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 | - \\ / A nd | Copyright (C) 2015-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -122,7 +122,7 @@ Foam::ThermalDiffusivity::alphat() const ( IOobject ( - IOobject::groupName("alphat", this->U_.group()), + IOobject::groupName("alphat", this->alphaRhoPhi_.group()), this->runTime_.timeName(), this->mesh_, IOobject::NO_READ, diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.C index 139940c731..3dc96f6c8f 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 | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -151,7 +151,7 @@ LamBremhorstKE::LamBremhorstKE ( IOobject ( - IOobject::groupName("k", U.group()), + IOobject::groupName("k", alphaRhoPhi.group()), runTime_.timeName(), mesh_, IOobject::MUST_READ, @@ -164,7 +164,7 @@ LamBremhorstKE::LamBremhorstKE ( IOobject ( - IOobject::groupName("epsilon", U.group()), + IOobject::groupName("epsilon", alphaRhoPhi.group()), runTime_.timeName(), mesh_, IOobject::MUST_READ, diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKE/LienCubicKE.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKE/LienCubicKE.C index 9adfc03f8e..99a64089ed 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 | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -301,7 +301,7 @@ LienCubicKE::LienCubicKE ( IOobject ( - IOobject::groupName("k", U.group()), + IOobject::groupName("k", alphaRhoPhi.group()), runTime_.timeName(), mesh_, IOobject::MUST_READ, @@ -314,7 +314,7 @@ LienCubicKE::LienCubicKE ( IOobject ( - IOobject::groupName("epsilon", U.group()), + IOobject::groupName("epsilon", alphaRhoPhi.group()), runTime_.timeName(), mesh_, IOobject::MUST_READ, diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienLeschziner/LienLeschziner.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienLeschziner/LienLeschziner.C index 682bbee971..5d4d00a0cb 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 | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -195,7 +195,7 @@ LienLeschziner::LienLeschziner ( IOobject ( - IOobject::groupName("k", U.group()), + IOobject::groupName("k", alphaRhoPhi.group()), runTime_.timeName(), mesh_, IOobject::MUST_READ, @@ -208,7 +208,7 @@ LienLeschziner::LienLeschziner ( IOobject ( - IOobject::groupName("epsilon", U.group()), + IOobject::groupName("epsilon", alphaRhoPhi.group()), runTime_.timeName(), mesh_, IOobject::MUST_READ, diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/ShihQuadraticKE/ShihQuadraticKE.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/ShihQuadraticKE/ShihQuadraticKE.C index 8c26c970a1..d385bdf756 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 | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -195,7 +195,7 @@ ShihQuadraticKE::ShihQuadraticKE ( IOobject ( - IOobject::groupName("k", U.group()), + IOobject::groupName("k", alphaRhoPhi.group()), runTime_.timeName(), mesh_, IOobject::MUST_READ, @@ -208,7 +208,7 @@ ShihQuadraticKE::ShihQuadraticKE ( IOobject ( - IOobject::groupName("epsilon", U.group()), + IOobject::groupName("epsilon", alphaRhoPhi.group()), runTime_.timeName(), mesh_, IOobject::MUST_READ, diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kkLOmega/kkLOmega.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kkLOmega/kkLOmega.C index 05533785c7..218fdb555c 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 | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -490,7 +490,7 @@ kkLOmega::kkLOmega ( IOobject ( - IOobject::groupName("kt", U.group()), + IOobject::groupName("kt", alphaRhoPhi.group()), runTime_.timeName(), mesh_, IOobject::MUST_READ, @@ -502,7 +502,7 @@ kkLOmega::kkLOmega ( IOobject ( - IOobject::groupName("kl", U.group()), + IOobject::groupName("kl", alphaRhoPhi.group()), runTime_.timeName(), mesh_, IOobject::MUST_READ, @@ -514,7 +514,7 @@ kkLOmega::kkLOmega ( IOobject ( - IOobject::groupName("omega", U.group()), + IOobject::groupName("omega", alphaRhoPhi.group()), runTime_.timeName(), mesh_, IOobject::MUST_READ, diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/qZeta/qZeta.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/qZeta/qZeta.C index a55f8d78e5..bb8ff6a151 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 | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -153,7 +153,7 @@ qZeta::qZeta ( IOobject ( - IOobject::groupName("k", U.group()), + IOobject::groupName("k", alphaRhoPhi.group()), runTime_.timeName(), mesh_, IOobject::MUST_READ, @@ -166,7 +166,7 @@ qZeta::qZeta ( IOobject ( - IOobject::groupName("epsilon", U.group()), + IOobject::groupName("epsilon", alphaRhoPhi.group()), runTime_.timeName(), mesh_, IOobject::MUST_READ, @@ -179,7 +179,7 @@ qZeta::qZeta ( IOobject ( - IOobject::groupName("q", U.group()), + IOobject::groupName("q", alphaRhoPhi.group()), runTime_.timeName(), mesh_, IOobject::NO_READ, @@ -193,7 +193,7 @@ qZeta::qZeta ( IOobject ( - IOobject::groupName("zeta", U.group()), + IOobject::groupName("zeta", alphaRhoPhi.group()), runTime_.timeName(), mesh_, IOobject::NO_READ, diff --git a/src/TurbulenceModels/phaseCompressible/PhaseCompressibleTurbulenceModel/PhaseCompressibleTurbulenceModel.C b/src/TurbulenceModels/phaseCompressible/PhaseCompressibleTurbulenceModel/PhaseCompressibleTurbulenceModel.C index 62bc1b5963..7399b5ed70 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 | - \\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -108,7 +108,7 @@ Foam::PhaseCompressibleTurbulenceModel::pPrime() const ( IOobject ( - IOobject::groupName("pPrime", this->U_.group()), + IOobject::groupName("pPrime", this->alphaRhoPhi_.group()), this->runTime_.timeName(), this->mesh_, IOobject::NO_READ, @@ -128,7 +128,7 @@ Foam::PhaseCompressibleTurbulenceModel::pPrimef() const ( IOobject ( - IOobject::groupName("pPrimef", this->U_.group()), + IOobject::groupName("pPrimef", this->alphaRhoPhi_.group()), this->runTime_.timeName(), this->mesh_, IOobject::NO_READ, diff --git a/src/TurbulenceModels/phaseCompressible/RAS/continuousGasKEpsilon/continuousGasKEpsilon.C b/src/TurbulenceModels/phaseCompressible/RAS/continuousGasKEpsilon/continuousGasKEpsilon.C index 7e8b5ac4b4..e0d6396383 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 | - \\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -68,7 +68,7 @@ continuousGasKEpsilon::continuousGasKEpsilon ( IOobject ( - IOobject::groupName("nutEff", U.group()), + IOobject::groupName("nutEff", alphaRhoPhi.group()), this->runTime_.timeName(), this->mesh_, IOobject::READ_IF_PRESENT, @@ -189,7 +189,7 @@ continuousGasKEpsilon::nuEff() const ( new volScalarField ( - IOobject::groupName("nuEff", this->U_.group()), + IOobject::groupName("nuEff", this->alphaRhoPhi_.group()), blend*this->nut_ + (1.0 - blend)*rhoEff()*nutEff_/this->transport().rho() + this->nu() @@ -210,7 +210,7 @@ continuousGasKEpsilon::rhoEff() const ( new volScalarField ( - IOobject::groupName("rhoEff", this->U_.group()), + IOobject::groupName("rhoEff", this->alphaRhoPhi_.group()), gas.rho() + (fluid.virtualMass(gas).Cvm() + 3.0/20.0)*liquid.rho() ) ); @@ -278,7 +278,7 @@ continuousGasKEpsilon::R() const ( IOobject ( - IOobject::groupName("R", this->U_.group()), + IOobject::groupName("R", this->alphaRhoPhi_.group()), this->runTime_.timeName(), this->mesh_, IOobject::NO_READ, diff --git a/src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.C b/src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.C index 4e30c83276..70aad6da5c 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 | - \\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -136,7 +136,7 @@ mixtureKEpsilon::mixtureKEpsilon ( IOobject ( - IOobject::groupName("k", U.group()), + IOobject::groupName("k", alphaRhoPhi.group()), this->runTime_.timeName(), this->mesh_, IOobject::MUST_READ, @@ -148,7 +148,7 @@ mixtureKEpsilon::mixtureKEpsilon ( IOobject ( - IOobject::groupName("epsilon", U.group()), + IOobject::groupName("epsilon", alphaRhoPhi.group()), this->runTime_.timeName(), this->mesh_, IOobject::MUST_READ, diff --git a/src/TurbulenceModels/phaseIncompressible/PhaseIncompressibleTurbulenceModel/PhaseIncompressibleTurbulenceModel.C b/src/TurbulenceModels/phaseIncompressible/PhaseIncompressibleTurbulenceModel/PhaseIncompressibleTurbulenceModel.C index 472d2cae7d..aff35bcd6e 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 | - \\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -107,7 +107,7 @@ Foam::PhaseIncompressibleTurbulenceModel::pPrime() const ( IOobject ( - IOobject::groupName("pPrime", this->U_.group()), + IOobject::groupName("pPrime", this->alphaRhoPhi_.group()), this->runTime_.timeName(), this->mesh_, IOobject::NO_READ, @@ -127,7 +127,7 @@ Foam::PhaseIncompressibleTurbulenceModel::pPrimef() const ( IOobject ( - IOobject::groupName("pPrimef", this->U_.group()), + IOobject::groupName("pPrimef", this->alphaRhoPhi_.group()), this->runTime_.timeName(), this->mesh_, IOobject::NO_READ, @@ -160,8 +160,7 @@ Foam::PhaseIncompressibleTurbulenceModel::divDevReff template Foam::tmp -Foam::PhaseIncompressibleTurbulenceModel:: -devRhoReff() const +Foam::PhaseIncompressibleTurbulenceModel::devRhoReff() const { NotImplemented; @@ -171,8 +170,7 @@ devRhoReff() const template Foam::tmp -Foam::PhaseIncompressibleTurbulenceModel:: -divDevRhoReff +Foam::PhaseIncompressibleTurbulenceModel::divDevRhoReff ( volVectorField& U ) const diff --git a/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.C b/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.C index b1a02a2d35..d148925c51 100644 --- a/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.C +++ b/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.C @@ -365,7 +365,7 @@ kOmegaSSTBase::kOmegaSSTBase ( IOobject ( - IOobject::groupName("k", U.group()), + IOobject::groupName("k", alphaRhoPhi.group()), this->runTime_.timeName(), this->mesh_, IOobject::MUST_READ, @@ -377,7 +377,7 @@ kOmegaSSTBase::kOmegaSSTBase ( IOobject ( - IOobject::groupName("omega", U.group()), + IOobject::groupName("omega", alphaRhoPhi.group()), this->runTime_.timeName(), this->mesh_, IOobject::MUST_READ, diff --git a/src/TurbulenceModels/turbulenceModels/LES/DeardorffDiffStress/DeardorffDiffStress.C b/src/TurbulenceModels/turbulenceModels/LES/DeardorffDiffStress/DeardorffDiffStress.C index b2e6cd9796..80feeafb95 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 | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -150,7 +150,7 @@ tmp DeardorffDiffStress::epsilon() const ( IOobject ( - IOobject::groupName("epsilon", this->U_.group()), + IOobject::groupName("epsilon", this->alphaRhoPhi_.group()), this->runTime_.timeName(), this->mesh_, IOobject::NO_READ, diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C b/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C index 0bd80034de..4449f258f4 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C +++ b/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C @@ -106,7 +106,7 @@ Foam::LESModel::LESModel ( LESdelta::New ( - IOobject::groupName("delta", U.group()), + IOobject::groupName("delta", alphaRhoPhi.group()), *this, LESDict_ ) @@ -141,7 +141,7 @@ Foam::LESModel::New ( IOobject ( - IOobject::groupName(propertiesName, U.group()), + IOobject::groupName(propertiesName, alphaRhoPhi.group()), U.time().constant(), U.db(), IOobject::MUST_READ_IF_MODIFIED, diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.H b/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.H index b3a57319aa..ccf7922c71 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 | - \\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -212,7 +212,7 @@ public: ( new volScalarField ( - IOobject::groupName("nuEff", this->U_.group()), + IOobject::groupName("nuEff", this->alphaRhoPhi_.group()), this->nut() + this->nu() ) ); diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESeddyViscosity/LESeddyViscosity.C b/src/TurbulenceModels/turbulenceModels/LES/LESeddyViscosity/LESeddyViscosity.C index 0aa485a0ec..6e1c91775b 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 | - \\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd. ------------------------------------------------------------------------------- License @@ -101,7 +101,7 @@ tmp LESeddyViscosity::epsilon() const ( IOobject ( - IOobject::groupName("epsilon", this->U_.group()), + IOobject::groupName("epsilon", this->alphaRhoPhi_.group()), this->runTime_.timeName(), this->mesh_, IOobject::NO_READ, diff --git a/src/TurbulenceModels/turbulenceModels/LES/Smagorinsky/Smagorinsky.C b/src/TurbulenceModels/turbulenceModels/LES/Smagorinsky/Smagorinsky.C index 8f11a96b9e..4f9c3c1427 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 | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -53,7 +53,7 @@ tmp Smagorinsky::k ( IOobject ( - IOobject::groupName("k", this->U_.group()), + IOobject::groupName("k", this->alphaRhoPhi_.group()), this->runTime_.timeName(), this->mesh_ ), @@ -149,7 +149,7 @@ tmp Smagorinsky::epsilon() const ( IOobject ( - IOobject::groupName("epsilon", this->U_.group()), + IOobject::groupName("epsilon", this->alphaRhoPhi_.group()), this->runTime_.timeName(), this->mesh_ ), diff --git a/src/TurbulenceModels/turbulenceModels/LES/WALE/WALE.C b/src/TurbulenceModels/turbulenceModels/LES/WALE/WALE.C index e70ff8fabf..4ed19ef0ab 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 | - \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -59,7 +59,7 @@ tmp WALE::k ( IOobject ( - IOobject::groupName("k", this->U_.group()), + IOobject::groupName("k", this->alphaRhoPhi_.group()), this->runTime_.timeName(), this->mesh_ ), @@ -180,7 +180,7 @@ tmp WALE::epsilon() const ( IOobject ( - IOobject::groupName("epsilon", this->U_.group()), + IOobject::groupName("epsilon", this->alphaRhoPhi_.group()), this->runTime_.timeName(), this->mesh_, IOobject::NO_READ, diff --git a/src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.C b/src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.C index 4d3f38d9a8..2f98064f08 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 | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -178,7 +178,7 @@ dynamicKEqn::dynamicKEqn ( IOobject ( - IOobject::groupName("k", this->U_.group()), + IOobject::groupName("k", this->alphaRhoPhi_.group()), this->runTime_.timeName(), this->mesh_, IOobject::MUST_READ, @@ -227,7 +227,7 @@ tmp dynamicKEqn::epsilon() const ( IOobject ( - IOobject::groupName("epsilon", this->U_.group()), + IOobject::groupName("epsilon", this->alphaRhoPhi_.group()), this->runTime_.timeName(), this->mesh_, IOobject::NO_READ, diff --git a/src/TurbulenceModels/turbulenceModels/LES/dynamicLagrangian/dynamicLagrangian.C b/src/TurbulenceModels/turbulenceModels/LES/dynamicLagrangian/dynamicLagrangian.C index 28ad1eb75a..e5e6907b01 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/dynamicLagrangian/dynamicLagrangian.C +++ b/src/TurbulenceModels/turbulenceModels/LES/dynamicLagrangian/dynamicLagrangian.C @@ -87,7 +87,7 @@ dynamicLagrangian::dynamicLagrangian ( IOobject ( - IOobject::groupName("flm", this->U_.group()), + IOobject::groupName("flm", this->alphaRhoPhi_.group()), this->runTime_.timeName(), this->mesh_, IOobject::MUST_READ, @@ -99,7 +99,7 @@ dynamicLagrangian::dynamicLagrangian ( IOobject ( - IOobject::groupName("fmm", this->U_.group()), + IOobject::groupName("fmm", this->alphaRhoPhi_.group()), this->runTime_.timeName(), this->mesh_, IOobject::MUST_READ, diff --git a/src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.C b/src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.C index 5f617bf84e..9c255bbd4b 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 | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -92,7 +92,7 @@ kEqn::kEqn ( IOobject ( - IOobject::groupName("k", this->U_.group()), + IOobject::groupName("k", this->alphaRhoPhi_.group()), this->runTime_.timeName(), this->mesh_, IOobject::MUST_READ, @@ -147,7 +147,7 @@ tmp kEqn::epsilon() const ( IOobject ( - IOobject::groupName("epsilon", this->U_.group()), + IOobject::groupName("epsilon", this->alphaRhoPhi_.group()), this->runTime_.timeName(), this->mesh_, IOobject::NO_READ, diff --git a/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.C b/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.C index 424c286f79..70c4dacaa2 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.C +++ b/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.C @@ -131,7 +131,7 @@ Foam::RASModel::New ( IOobject ( - IOobject::groupName(propertiesName, U.group()), + IOobject::groupName(propertiesName, alphaRhoPhi.group()), U.time().constant(), U.db(), IOobject::MUST_READ_IF_MODIFIED, diff --git a/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.H b/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.H index cf862ef5e3..85487fc353 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 | - \\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -220,7 +220,7 @@ public: ( new volScalarField ( - IOobject::groupName("nuEff", this->U_.group()), + IOobject::groupName("nuEff", this->alphaRhoPhi_.group()), this->nut() + this->nu() ) ); diff --git a/src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.C b/src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.C index 5356ad4e96..5041b9b814 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.C +++ b/src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.C @@ -181,7 +181,7 @@ RNGkEpsilon::RNGkEpsilon ( IOobject ( - IOobject::groupName("k", U.group()), + IOobject::groupName("k", alphaRhoPhi.group()), this->runTime_.timeName(), this->mesh_, IOobject::MUST_READ, @@ -193,7 +193,7 @@ RNGkEpsilon::RNGkEpsilon ( IOobject ( - IOobject::groupName("epsilon", U.group()), + IOobject::groupName("epsilon", alphaRhoPhi.group()), this->runTime_.timeName(), this->mesh_, IOobject::MUST_READ, diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.C b/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.C index a660faa979..1e20632c98 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.C +++ b/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.C @@ -163,7 +163,7 @@ kEpsilon::kEpsilon ( IOobject ( - IOobject::groupName("k", U.group()), + IOobject::groupName("k", alphaRhoPhi.group()), this->runTime_.timeName(), this->mesh_, IOobject::MUST_READ, @@ -175,7 +175,7 @@ kEpsilon::kEpsilon ( IOobject ( - IOobject::groupName("epsilon", U.group()), + IOobject::groupName("epsilon", alphaRhoPhi.group()), this->runTime_.timeName(), this->mesh_, IOobject::MUST_READ, diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kOmega/kOmega.C b/src/TurbulenceModels/turbulenceModels/RAS/kOmega/kOmega.C index 8c720c42d6..48a888032b 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 | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -124,7 +124,7 @@ kOmega::kOmega ( IOobject ( - IOobject::groupName("k", U.group()), + IOobject::groupName("k", alphaRhoPhi.group()), this->runTime_.timeName(), this->mesh_, IOobject::MUST_READ, @@ -136,7 +136,7 @@ kOmega::kOmega ( IOobject ( - IOobject::groupName("omega", U.group()), + IOobject::groupName("omega", alphaRhoPhi.group()), this->runTime_.timeName(), this->mesh_, IOobject::MUST_READ, diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTLM/kOmegaSSTLM.C b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTLM/kOmegaSSTLM.C index e7488ad9f4..67ed00ac5c 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 | - \\ / A nd | Copyright (C) 2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -94,7 +94,7 @@ tmp kOmegaSSTLM::Fthetat ( new volScalarField::Internal ( - IOobject::groupName("Fthetat", this->U_.group()), + IOobject::groupName("Fthetat", this->alphaRhoPhi_.group()), min ( max @@ -119,7 +119,7 @@ kOmegaSSTLM::ReThetac() const ( IOobject ( - IOobject::groupName("ReThetac", this->U_.group()), + IOobject::groupName("ReThetac", this->alphaRhoPhi_.group()), this->runTime_.timeName(), this->mesh_ ), @@ -162,7 +162,7 @@ tmp kOmegaSSTLM::Flength ( IOobject ( - IOobject::groupName("Flength", this->U_.group()), + IOobject::groupName("Flength", this->alphaRhoPhi_.group()), this->runTime_.timeName(), this->mesh_ ), @@ -227,7 +227,7 @@ tmp kOmegaSSTLM::ReThetat0 ( IOobject ( - IOobject::groupName("ReThetat0", this->U_.group()), + IOobject::groupName("ReThetat0", this->alphaRhoPhi_.group()), this->runTime_.timeName(), this->mesh_ ), @@ -348,7 +348,7 @@ tmp kOmegaSSTLM::Fonset ( new volScalarField::Internal ( - IOobject::groupName("Fonset", this->U_.group()), + IOobject::groupName("Fonset", this->alphaRhoPhi_.group()), max(Fonset2 - Fonset3, scalar(0)) ) ); @@ -450,7 +450,7 @@ kOmegaSSTLM::kOmegaSSTLM ( IOobject ( - IOobject::groupName("ReThetat", U.group()), + IOobject::groupName("ReThetat", alphaRhoPhi.group()), this->runTime_.timeName(), this->mesh_, IOobject::MUST_READ, @@ -463,7 +463,7 @@ kOmegaSSTLM::kOmegaSSTLM ( IOobject ( - IOobject::groupName("gammaInt", U.group()), + IOobject::groupName("gammaInt", alphaRhoPhi.group()), this->runTime_.timeName(), this->mesh_, IOobject::MUST_READ, @@ -476,7 +476,7 @@ kOmegaSSTLM::kOmegaSSTLM ( IOobject ( - IOobject::groupName("gammaIntEff", U.group()), + IOobject::groupName("gammaIntEff", alphaRhoPhi.group()), this->runTime_.timeName(), this->mesh_ ), diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTSAS/kOmegaSSTSAS.C b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTSAS/kOmegaSSTSAS.C index 4957f06378..618739c0a1 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 | - \\ / A nd | Copyright (C) 2015-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -167,7 +167,7 @@ kOmegaSSTSAS::kOmegaSSTSAS ( LESdelta::New ( - IOobject::groupName("delta", U.group()), + IOobject::groupName("delta", alphaRhoPhi.group()), *this, this->coeffDict_ ) diff --git a/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2f.C b/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2f.C index 9798151e89..2763a97cf5 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 | - \\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -217,7 +217,7 @@ v2f::v2f ( IOobject ( - IOobject::groupName("k", U.group()), + IOobject::groupName("k", alphaRhoPhi.group()), this->runTime_.timeName(), this->mesh_, IOobject::MUST_READ, @@ -229,7 +229,7 @@ v2f::v2f ( IOobject ( - IOobject::groupName("epsilon", U.group()), + IOobject::groupName("epsilon", alphaRhoPhi.group()), this->runTime_.timeName(), this->mesh_, IOobject::MUST_READ, @@ -241,7 +241,7 @@ v2f::v2f ( IOobject ( - IOobject::groupName("v2", U.group()), + IOobject::groupName("v2", alphaRhoPhi.group()), this->runTime_.timeName(), this->mesh_, IOobject::MUST_READ, @@ -253,7 +253,7 @@ v2f::v2f ( IOobject ( - IOobject::groupName("f", U.group()), + IOobject::groupName("f", alphaRhoPhi.group()), this->runTime_.timeName(), this->mesh_, IOobject::MUST_READ, diff --git a/src/TurbulenceModels/turbulenceModels/ReynoldsStress/ReynoldsStress.C b/src/TurbulenceModels/turbulenceModels/ReynoldsStress/ReynoldsStress.C index b9f91bd180..dc061715dd 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 | - \\ / A nd | Copyright (C) 2015-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -143,7 +143,7 @@ Foam::ReynoldsStress::ReynoldsStress ( IOobject ( - IOobject::groupName("R", U.group()), + IOobject::groupName("R", alphaRhoPhi.group()), this->runTime_.timeName(), this->mesh_, IOobject::MUST_READ, @@ -156,7 +156,7 @@ Foam::ReynoldsStress::ReynoldsStress ( IOobject ( - IOobject::groupName("nut", U.group()), + IOobject::groupName("nut", alphaRhoPhi.group()), this->runTime_.timeName(), this->mesh_, IOobject::MUST_READ, @@ -212,7 +212,7 @@ Foam::ReynoldsStress::devRhoReff() const ( IOobject ( - IOobject::groupName("devRhoReff", this->U_.group()), + IOobject::groupName("devRhoReff", this->alphaRhoPhi_.group()), this->runTime_.timeName(), this->mesh_, IOobject::NO_READ, diff --git a/src/TurbulenceModels/turbulenceModels/TurbulenceModel/TurbulenceModel.C b/src/TurbulenceModels/turbulenceModels/TurbulenceModel/TurbulenceModel.C index 18d5be2cb9..b48b35099e 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 | - \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -93,7 +93,7 @@ Foam::TurbulenceModel::New ( IOobject ( - IOobject::groupName(propertiesName, U.group()), + IOobject::groupName(propertiesName, alphaRhoPhi.group()), U.time().constant(), U.db(), IOobject::MUST_READ_IF_MODIFIED, diff --git a/src/TurbulenceModels/turbulenceModels/eddyViscosity/eddyViscosity.C b/src/TurbulenceModels/turbulenceModels/eddyViscosity/eddyViscosity.C index 82a0da7719..dd2ab3fb5a 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 | - \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -58,7 +58,7 @@ Foam::eddyViscosity::eddyViscosity ( IOobject ( - IOobject::groupName("nut", U.group()), + IOobject::groupName("nut", alphaRhoPhi.group()), this->runTime_.timeName(), this->mesh_, IOobject::MUST_READ, @@ -107,7 +107,7 @@ Foam::eddyViscosity::R() const ( IOobject ( - IOobject::groupName("R", this->U_.group()), + IOobject::groupName("R", this->alphaRhoPhi_.group()), this->runTime_.timeName(), this->mesh_, IOobject::NO_READ, diff --git a/src/TurbulenceModels/turbulenceModels/laminar/Maxwell/Maxwell.C b/src/TurbulenceModels/turbulenceModels/laminar/Maxwell/Maxwell.C index 1a7f409cd1..2fc55e0fd7 100644 --- a/src/TurbulenceModels/turbulenceModels/laminar/Maxwell/Maxwell.C +++ b/src/TurbulenceModels/turbulenceModels/laminar/Maxwell/Maxwell.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -84,7 +84,7 @@ Maxwell::Maxwell ( IOobject ( - IOobject::groupName("sigma", U.group()), + IOobject::groupName("sigma", alphaRhoPhi.group()), this->runTime_.timeName(), this->mesh_, IOobject::MUST_READ, @@ -135,7 +135,7 @@ Maxwell::devRhoReff() const ( IOobject ( - IOobject::groupName("devRhoReff", this->U_.group()), + IOobject::groupName("devRhoReff", this->alphaRhoPhi_.group()), this->runTime_.timeName(), this->mesh_, IOobject::NO_READ, diff --git a/src/TurbulenceModels/turbulenceModels/laminar/Stokes/Stokes.C b/src/TurbulenceModels/turbulenceModels/laminar/Stokes/Stokes.C index d0c214979d..7da73f5246 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 | - \\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -90,7 +90,7 @@ Stokes::nut() const ( IOobject ( - IOobject::groupName("nut", this->U_.group()), + IOobject::groupName("nut", this->alphaRhoPhi_.group()), this->runTime_.timeName(), this->mesh_, IOobject::NO_READ, @@ -125,7 +125,7 @@ Stokes::nuEff() const ( new volScalarField ( - IOobject::groupName("nuEff", this->U_.group()), this->nu() + IOobject::groupName("nuEff", this->alphaRhoPhi_.group()), this->nu() ) ); } @@ -150,7 +150,7 @@ Stokes::k() const ( IOobject ( - IOobject::groupName("k", this->U_.group()), + IOobject::groupName("k", this->alphaRhoPhi_.group()), this->runTime_.timeName(), this->mesh_, IOobject::NO_READ, @@ -171,7 +171,7 @@ Stokes::epsilon() const ( IOobject ( - IOobject::groupName("epsilon", this->U_.group()), + IOobject::groupName("epsilon", this->alphaRhoPhi_.group()), this->runTime_.timeName(), this->mesh_, IOobject::NO_READ, @@ -192,7 +192,7 @@ Stokes::R() const ( IOobject ( - IOobject::groupName("R", this->U_.group()), + IOobject::groupName("R", this->alphaRhoPhi_.group()), this->runTime_.timeName(), this->mesh_, IOobject::NO_READ, diff --git a/src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.C b/src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.C index 52c69b43b9..b6bbdbaf05 100644 --- a/src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.C +++ b/src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.C @@ -94,7 +94,7 @@ Foam::laminarModel::New ( IOobject ( - IOobject::groupName(propertiesName, U.group()), + IOobject::groupName(propertiesName, alphaRhoPhi.group()), U.time().constant(), U.db(), IOobject::MUST_READ_IF_MODIFIED, @@ -188,7 +188,7 @@ Foam::laminarModel::nut() const ( IOobject ( - IOobject::groupName("nut", this->U_.group()), + IOobject::groupName("nut", this->alphaRhoPhi_.group()), this->runTime_.timeName(), this->mesh_, IOobject::NO_READ, @@ -223,7 +223,7 @@ Foam::laminarModel::nuEff() const ( new volScalarField ( - IOobject::groupName("nuEff", this->U_.group()), this->nu() + IOobject::groupName("nuEff", this->alphaRhoPhi_.group()), this->nu() ) ); } @@ -248,7 +248,7 @@ Foam::laminarModel::k() const ( IOobject ( - IOobject::groupName("k", this->U_.group()), + IOobject::groupName("k", this->alphaRhoPhi_.group()), this->runTime_.timeName(), this->mesh_, IOobject::NO_READ, @@ -269,7 +269,7 @@ Foam::laminarModel::epsilon() const ( IOobject ( - IOobject::groupName("epsilon", this->U_.group()), + IOobject::groupName("epsilon", this->alphaRhoPhi_.group()), this->runTime_.timeName(), this->mesh_, IOobject::NO_READ, @@ -290,7 +290,7 @@ Foam::laminarModel::R() const ( IOobject ( - IOobject::groupName("R", this->U_.group()), + IOobject::groupName("R", this->alphaRhoPhi_.group()), this->runTime_.timeName(), this->mesh_, IOobject::NO_READ, diff --git a/src/TurbulenceModels/turbulenceModels/linearViscousStress/linearViscousStress.C b/src/TurbulenceModels/turbulenceModels/linearViscousStress/linearViscousStress.C index d5e61def56..1f53e67f2e 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 | - \\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -75,7 +75,7 @@ Foam::linearViscousStress::devRhoReff() const ( IOobject ( - IOobject::groupName("devRhoReff", this->U_.group()), + IOobject::groupName("devRhoReff", this->alphaRhoPhi_.group()), this->runTime_.timeName(), this->mesh_, IOobject::NO_READ, diff --git a/src/TurbulenceModels/turbulenceModels/nonlinearEddyViscosity/nonlinearEddyViscosity.C b/src/TurbulenceModels/turbulenceModels/nonlinearEddyViscosity/nonlinearEddyViscosity.C index fe62ba077f..7ae7b2297d 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 | - \\ / A nd | Copyright (C) 2015-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -58,7 +58,7 @@ Foam::nonlinearEddyViscosity::nonlinearEddyViscosity ( IOobject ( - IOobject::groupName("nonlinearStress", U.group()), + IOobject::groupName("nonlinearStress", alphaRhoPhi.group()), this->runTime_.timeName(), this->mesh_ ), diff --git a/src/TurbulenceModels/turbulenceModels/turbulenceModel.C b/src/TurbulenceModels/turbulenceModels/turbulenceModel.C index 58a1c34ebd..8c67fe1d07 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 | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -52,7 +52,7 @@ Foam::turbulenceModel::turbulenceModel ( IOobject ( - IOobject::groupName(propertiesName, U.group()), + IOobject::groupName(propertiesName, alphaRhoPhi.group()), U.time().constant(), U.db(), IOobject::MUST_READ_IF_MODIFIED,