WIP: support command-line redirection of stdout/stderr

- allows, for example, rebinding of the output stream to a file

.gitlab/issue_templates/bug.md

@@ -49,7 +49,7 @@
 
 <!--
   Providing details of your set-up can help us identify any issues, e.g.
-  OpenFOAM version : v2312|v2306|v2212|v2206|v2112 etc
+  OpenFOAM version : v2306|v2212|v2206|v2112|v2106 etc
   Operating system : ubuntu|openSUSE|centos etc
   Hardware info    : any info that may help?
   Compiler         : gcc|intel|clang etc

.gitmodules

@@ -17,6 +17,3 @@
 [submodule "external-solver"]
 	path = modules/external-solver
 	url = https://develop.openfoam.com/Modules/external-solver.git
-[submodule "turbulence-community"]
-	path = modules/turbulence-community
-	url = https://gitlab.com/openfoam/community/tc-turbulence/turbulence-community.git

CONTRIBUTORS.md

@@ -9,7 +9,6 @@ It is likely incomplete...
 - Yu Ankun
 - Tetsuo Aoyagi
 - Akira Azami
-- Pete Bachant
 - William Bainbridge
 - Gabriel Barajas
 - Kutalmis Bercin
@@ -34,7 +33,6 @@ It is likely incomplete...
 - Alexander Kabat vel Job
 - Thilo Knacke
 - Shannon Leakey
-- Sergey Lesnik
 - Tommaso Lucchini
 - Graham Macpherson
 - Alexey Matveichev
@@ -47,7 +45,6 @@ It is likely incomplete...
 - Victor Olesen
 - Evangelos Papoutsis-Kiachagias
 - Juho Peltola
-- Josep Pocurull
 - Johan Roenby
 - Henrik Rusche
 - Bruno Santos
@@ -62,7 +59,6 @@ It is likely incomplete...
 - Vuko Vukcevic
 - Yi Wang
 - Norbert Weber
-- Gregor Weiss
 - Volker Weissmann
 - Henry Weller
 - Niklas Wikstrom

META-INFO/api-info

@@ -1,2 +1,2 @@
-api=2401
-patch=240220
+api=2306
+patch=0

README.md

@@ -40,9 +40,9 @@ Violations of the Trademark are monitored, and will be duly prosecuted.
 
 If OpenFOAM has already been compiled on your system, simply source
 the appropriate `etc/bashrc` or `etc/cshrc` file and get started.
-For example, for the OpenFOAM-v2312 version:
+For example, for the OpenFOAM-v2306 version:
 ```
-source /installation/path/OpenFOAM-v2312/etc/bashrc
+source /installation/path/OpenFOAM-v2306/etc/bashrc
 ```
 
 ## Compiling OpenFOAM
@@ -127,8 +127,8 @@ These 3rd-party sources are normally located in a directory parallel
 to the OpenFOAM directory. For example,
 ```
 /path/parent
-|-- OpenFOAM-v2312
-\-- ThirdParty-v2312
+|-- OpenFOAM-v2306
+\-- ThirdParty-v2306
 ```
 There are, however, many cases where this simple convention is inadequate:
 
@@ -136,7 +136,7 @@ There are, however, many cases where this simple convention is inadequate:
   operating system or cluster installation provides it)
 
 * When we have changed the OpenFOAM directory name to some arbitrary
-  directory name, e.g. openfoam-sandbox2312, etc..
+  directory name, e.g. openfoam-sandbox2306, etc..
 
 * When we would like any additional 3rd party software to be located
   inside of the OpenFOAM directory to ensure that the installation is
@@ -156,9 +156,9 @@ when locating the ThirdParty directory with the following precedence:
 2. PREFIX/ThirdParty-VERSION
    * this corresponds to the traditional approach
 3. PREFIX/ThirdParty-vAPI
-   * allows for an updated value of VERSION, *eg*, `v2312-myCustom`,
+   * allows for an updated value of VERSION, *eg*, `v2306-myCustom`,
      without requiring a renamed ThirdParty. The API value would still
-     be `2312` and the original `ThirdParty-v2312/` would be found.
+     be `2306` and the original `ThirdParty-v2306/` would be found.
 4. PREFIX/ThirdParty-API
    * same as the previous example, but using an unadorned API value.
 5. PREFIX/ThirdParty-common
@@ -213,4 +213,4 @@ ThirdParty directory will contain either an `Allwmake` file or a
 - [Governance](http://www.openfoam.com/governance/), [Governance Projects](https://www.openfoam.com/governance/projects)
 - [Contacting OpenCFD](http://www.openfoam.com/contact/)
 
-Copyright 2016-2023 OpenCFD Ltd
+Copyright 2016-2022 OpenCFD Ltd

applications/solvers/DNS/dnsFoam/dnsFoam.C

@@ -118,7 +118,7 @@ int main(int argc, char *argv[])
                 fvm::laplacian(rAUf, p) == fvc::div(phiHbyA)
             );
 
-            pEqn.solve(p.select(piso.finalInnerIter()));
+            pEqn.solve(mesh.solver(p.select(piso.finalInnerIter())));
 
             phi = phiHbyA - pEqn.flux();
 

applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.C

@@ -6,7 +6,6 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -94,14 +93,24 @@ Foam::PDRDragModels::basic::~basic()
 
 Foam::tmp<Foam::volSymmTensorField> Foam::PDRDragModels::basic::Dcu() const
 {
-    auto tDragDcu = volSymmTensorField::New
+    tmp<volSymmTensorField> tDragDcu
     (
-        "tDragDcu",
-        IOobject::NO_REGISTER,
-        U_.mesh(),
-        dimensionedSymmTensor(dimMass/dimTime/dimVolume, Zero)
+        new volSymmTensorField
+        (
+            IOobject
+            (
+                "tDragDcu",
+                U_.mesh().time().constant(),
+                U_.mesh(),
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            U_.mesh(),
+            dimensionedSymmTensor(dimMass/dimTime/dimVolume, Zero)
+        )
     );
-    auto& DragDcu = tDragDcu.ref();
+
+    volSymmTensorField& DragDcu = tDragDcu.ref();
 
     if (on_)
     {
@@ -118,14 +127,24 @@ Foam::tmp<Foam::volSymmTensorField> Foam::PDRDragModels::basic::Dcu() const
 
 Foam::tmp<Foam::volScalarField> Foam::PDRDragModels::basic::Gk() const
 {
-    auto tGk = volScalarField::New
+    tmp<volScalarField> tGk
     (
-        "tGk",
-        IOobject::NO_REGISTER,
-        U_.mesh(),
-        dimensionedScalar(dimMass/dimLength/pow3(dimTime), Zero)
+        new volScalarField
+        (
+            IOobject
+            (
+                "tGk",
+                U_.mesh().time().constant(),
+                U_.mesh(),
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            U_.mesh(),
+            dimensionedScalar(dimMass/dimLength/pow3(dimTime), Zero)
+        )
     );
-    auto& Gk = tGk.ref();
+
+    volScalarField& Gk = tGk.ref();
 
     if (on_)
     {

applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.C

@@ -69,8 +69,7 @@ Foam::XiEqModels::Gulder::~Gulder()
 Foam::tmp<Foam::volScalarField> Foam::XiEqModels::Gulder::XiEq() const
 {
     volScalarField up(sqrt((2.0/3.0)*turbulence_.k()));
-    const tmp<volScalarField> tepsilon(turbulence_.epsilon());
-    const volScalarField& epsilon = tepsilon();
+    const volScalarField& epsilon = turbulence_.epsilon();
 
     if (subGridSchelkin_)
     {

applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.C

@@ -6,7 +6,6 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -76,10 +75,8 @@ Foam::XiEqModels::SCOPEXiEq::~SCOPEXiEq()
 
 Foam::tmp<Foam::volScalarField> Foam::XiEqModels::SCOPEXiEq::XiEq() const
 {
-    const tmp<volScalarField> tk(turbulence_.k());
-    const volScalarField& k = tk();
-    const tmp<volScalarField> tepsilon(turbulence_.epsilon());
-    const volScalarField& epsilon = tepsilon();
+    const volScalarField& k = turbulence_.k();
+    const volScalarField& epsilon = turbulence_.epsilon();
 
     volScalarField up(sqrt((2.0/3.0)*k));
     if (subGridSchelkin_)
@@ -94,14 +91,23 @@ Foam::tmp<Foam::volScalarField> Foam::XiEqModels::SCOPEXiEq::XiEq() const
     volScalarField K(0.157*upBySu/sqrt(Rl));
     volScalarField Ma(MaModel.Ma());
 
-    auto tXiEq = volScalarField::New
+    tmp<volScalarField> tXiEq
     (
-        "XiEq",
-        IOobject::NO_REGISTER,
-        epsilon.mesh(),
-        dimensionedScalar(dimless, Zero)
+        new volScalarField
+        (
+            IOobject
+            (
+                "XiEq",
+                epsilon.time().timeName(),
+                epsilon.db(),
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            epsilon.mesh(),
+            dimensionedScalar(dimless, Zero)
+        )
     );
-    auto& xieq = tXiEq.ref();
+    volScalarField& xieq = tXiEq.ref();
 
     forAll(xieq, celli)
     {

applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C

@@ -78,10 +78,11 @@ bool Foam::XiEqModel::read(const dictionary& XiEqProperties)
 void Foam::XiEqModel::writeFields() const
 {
     //***HGW It is not clear why B is written here
-    const auto* B = Su_.mesh().cfindObject<volSymmTensorField>("B");
-    if (B)
+    if (Su_.mesh().foundObject<volSymmTensorField>("B"))
     {
-        B->write();
+        const volSymmTensorField& B =
+            Su_.mesh().lookupObject<volSymmTensorField>("B");
+        B.write();
     }
 }
 
@@ -97,26 +98,39 @@ Foam::XiEqModel::calculateSchelkinEffect(const scalar uPrimeCoef) const
     const volSymmTensorField& nsv =
         mesh.lookupObject<volSymmTensorField>("nsv");
 
-    auto tN = volScalarField::New
+    tmp<volScalarField> tN
     (
-        "tN",
-        IOobject::NO_REGISTER,
-        mesh,
-        dimensionedScalar(Nv.dimensions(), Zero)
+        new volScalarField
+        (
+            IOobject
+            (
+                "tN",
+                mesh.time().timeName(),
+                mesh,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE,
+                IOobject::NO_REGISTER
+            ),
+            mesh,
+            dimensionedScalar(Nv.dimensions(), Zero)
+        )
     );
-    auto& N = tN.ref();
-
+    volScalarField& N = tN.ref();
     N.primitiveFieldRef() = Nv.primitiveField()*pow(mesh.V(), 2.0/3.0);
 
-    auto tns = volSymmTensorField::New
+    volSymmTensorField ns
     (
-        "tns",
-        IOobject::NO_REGISTER,
+        IOobject
+        (
+            "tns",
+            mesh.time().timeName(),
+            mesh,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE
+        ),
         mesh,
         dimensionedSymmTensor(nsv.dimensions(), Zero)
     );
-    auto& ns = tns.ref();
-
     ns.primitiveFieldRef() = nsv.primitiveField()*pow(mesh.V(), 2.0/3.0);
 
     const volVectorField Uhat

applications/solvers/combustion/PDRFoam/XiModels/XiGModels/KTS/KTS.C

@@ -66,8 +66,7 @@ Foam::XiGModels::KTS::~KTS()
 Foam::tmp<Foam::volScalarField> Foam::XiGModels::KTS::G() const
 {
     volScalarField up(sqrt((2.0/3.0)*turbulence_.k()));
-    const tmp<volScalarField> tepsilon(turbulence_.epsilon());
-    const volScalarField& epsilon = tepsilon();
+    const volScalarField& epsilon = turbulence_.epsilon();
 
     volScalarField tauEta(sqrt(mag(thermo_.muu()/(thermo_.rhou()*epsilon))));
 

applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C

@@ -6,7 +6,6 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -256,14 +255,24 @@ Foam::tmp<Foam::volScalarField> Foam::laminarFlameSpeedModels::SCOPE::Su0pTphi
     scalar phi
 ) const
 {
-    auto tSu0 = volScalarField::New
+    tmp<volScalarField> tSu0
     (
-        "Su0",
-        IOobject::NO_REGISTER,
-        p.mesh(),
-        dimensionedScalar(dimVelocity, Zero)
+        new volScalarField
+        (
+            IOobject
+            (
+                "Su0",
+                p.time().timeName(),
+                p.db(),
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            p.mesh(),
+            dimensionedScalar(dimVelocity, Zero)
+        )
     );
-    auto& Su0 = tSu0.ref();
+
+    volScalarField& Su0 = tSu0.ref();
 
     forAll(Su0, celli)
     {
@@ -295,14 +304,24 @@ Foam::tmp<Foam::volScalarField> Foam::laminarFlameSpeedModels::SCOPE::Su0pTphi
     const volScalarField& phi
 ) const
 {
-    auto tSu0 = volScalarField::New
+    tmp<volScalarField> tSu0
     (
-        "Su0",
-        IOobject::NO_REGISTER,
-        p.mesh(),
-        dimensionedScalar(dimVelocity, Zero)
+        new volScalarField
+        (
+            IOobject
+            (
+                "Su0",
+                p.time().timeName(),
+                p.db(),
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            p.mesh(),
+            dimensionedScalar(dimVelocity, Zero)
+        )
     );
-    auto& Su0 = tSu0.ref();
+
+    volScalarField& Su0 = tSu0.ref();
 
     forAll(Su0, celli)
     {
@@ -339,14 +358,24 @@ Foam::tmp<Foam::volScalarField> Foam::laminarFlameSpeedModels::SCOPE::Ma
     const volScalarField& phi
 ) const
 {
-    auto tMa = volScalarField::New
+    tmp<volScalarField> tMa
     (
-        "Ma",
-        IOobject::NO_REGISTER,
-        phi.mesh(),
-        dimensionedScalar(dimless, Zero)
+        new volScalarField
+        (
+            IOobject
+            (
+                "Ma",
+                phi.time().timeName(),
+                phi.db(),
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            phi.mesh(),
+            dimensionedScalar(dimless, Zero)
+        )
     );
-    auto& ma = tMa.ref();
+
+    volScalarField& ma = tMa.ref();
 
     forAll(ma, celli)
     {
@@ -389,12 +418,21 @@ Foam::laminarFlameSpeedModels::SCOPE::Ma() const
     {
         const fvMesh& mesh = psiuReactionThermo_.p().mesh();
 
-        return volScalarField::New
+        return tmp<volScalarField>
         (
-            "Ma",
-            IOobject::NO_REGISTER,
-            mesh,
-            dimensionedScalar("Ma", dimless, Ma(equivalenceRatio_))
+            new volScalarField
+            (
+                IOobject
+                (
+                    "Ma",
+                    mesh.time().timeName(),
+                    mesh,
+                    IOobject::NO_READ,
+                    IOobject::NO_WRITE
+                ),
+                mesh,
+                dimensionedScalar("Ma", dimless, Ma(equivalenceRatio_))
+            )
         );
     }
 }

applications/solvers/combustion/PDRFoam/pEqn.H

@@ -27,7 +27,7 @@ if (pimple.transonic())
             betav*fvOptions(psi, p, rho.name())
         );
 
-        pEqn.solve(p.select(pimple.finalInnerIter()));
+        pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
 
         if (pimple.finalNonOrthogonalIter())
         {
@@ -57,7 +57,7 @@ else
             betav*fvOptions(psi, p, rho.name())
         );
 
-        pEqn.solve(p.select(pimple.finalInnerIter()));
+        pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
 
         if (pimple.finalNonOrthogonalIter())
         {

applications/solvers/combustion/XiFoam/XiDyMFoam/pEqn.H

@@ -30,7 +30,7 @@ if (pimple.transonic())
             fvOptions(psi, p, rho.name())
         );
 
-        pEqn.solve(p.select(pimple.finalInnerIter()));
+        pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
 
         if (pimple.finalNonOrthogonalIter())
         {
@@ -66,7 +66,7 @@ else
             fvOptions(psi, p, rho.name())
         );
 
-        pEqn.solve(p.select(pimple.finalInnerIter()));
+        pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
 
         if (pimple.finalNonOrthogonalIter())
         {

applications/solvers/combustion/XiFoam/XiEngineFoam/pEqn.H

@@ -35,7 +35,7 @@ if (pimple.transonic())
             fvOptions(psi, p, rho.name())
         );
 
-        pEqn.solve(p.select(pimple.finalInnerIter()));
+        pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
 
         if (pimple.finalNonOrthogonalIter())
         {
@@ -71,7 +71,7 @@ else
             fvOptions(psi, p, rho.name())
         );
 
-        pEqn.solve(p.select(pimple.finalInnerIter()));
+        pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
 
         if (pimple.finalNonOrthogonalIter())
         {

applications/solvers/combustion/XiFoam/pEqn.H

@@ -29,7 +29,7 @@ if (pimple.transonic())
             fvOptions(psi, p, rho.name())
         );
 
-        pEqn.solve(p.select(pimple.finalInnerIter()));
+        pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
 
         if (pimple.finalNonOrthogonalIter())
         {
@@ -64,7 +64,7 @@ else
             fvOptions(psi, p, rho.name())
         );
 
-        pEqn.solve(p.select(pimple.finalInnerIter()));
+        pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
 
         if (pimple.finalNonOrthogonalIter())
         {

applications/solvers/combustion/chemFoam/YEqn.H

@@ -6,7 +6,7 @@
         solve
         (
             fvm::ddt(rho, Yi) - chemistry.RR(specieI),
-            "Yi"
+            mesh.solver("Yi")
         );
     }
 }

applications/solvers/combustion/fireFoam/YEEqn.H

@@ -35,7 +35,7 @@ tmp<fv::convectionScheme<scalar>> mvConvection
 
             fvOptions.constrain(YiEqn);
 
-            YiEqn.solve("Yi");
+            YiEqn.solve(mesh.solver("Yi"));
 
             fvOptions.correct(Yi);
 

applications/solvers/combustion/fireFoam/pEqn.H

@@ -36,7 +36,7 @@ while (pimple.correctNonOrthogonal())
       + fvOptions(psi, p_rgh, rho.name())
     );
 
-    p_rghEqn.solve(p_rgh.select(pimple.finalInnerIter()));
+    p_rghEqn.solve(mesh.solver(p_rgh.select(pimple.finalInnerIter())));
 
     if (pimple.finalNonOrthogonalIter())
     {

applications/solvers/combustion/fireFoam/phrghEqn.H

@@ -10,8 +10,7 @@ if (pimple.dict().getOrDefault("hydrostaticInitialization", false))
                 "0",
                 mesh,
                 IOobject::MUST_READ,
-                IOobject::NO_WRITE,
-                IOobject::REGISTER
+                IOobject::NO_WRITE
             ),
             mesh
         )

applications/solvers/combustion/reactingFoam/YEqn.H

@@ -34,7 +34,7 @@ tmp<fv::convectionScheme<scalar>> mvConvection
 
             fvOptions.constrain(YiEqn);
 
-            YiEqn.solve("Yi");
+            YiEqn.solve(mesh.solver("Yi"));
 
             fvOptions.correct(Yi);
 

applications/solvers/combustion/reactingFoam/pEqn.H

@@ -37,7 +37,7 @@ if (pimple.transonic())
             fvOptions(psi, p, rho.name())
         );
 
-        pEqn.solve(p.select(pimple.finalInnerIter()));
+        pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
 
         if (pimple.finalNonOrthogonalIter())
         {
@@ -72,7 +72,7 @@ else
             fvOptions(psi, p, rho.name())
         );
 
-        pEqn.solve(p.select(pimple.finalInnerIter()));
+        pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
 
         if (pimple.finalNonOrthogonalIter())
         {

applications/solvers/combustion/reactingFoam/pcEqn.H

@@ -49,7 +49,7 @@ if (pimple.transonic())
             fvOptions(psi, p, rho.name())
         );
 
-        pEqn.solve(p.select(pimple.finalInnerIter()));
+        pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
 
         if (pimple.finalNonOrthogonalIter())
         {
@@ -89,7 +89,7 @@ else
             fvOptions(psi, p, rho.name())
         );
 
-        pEqn.solve(p.select(pimple.finalInnerIter()));
+        pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
 
         if (pimple.finalNonOrthogonalIter())
         {

applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/pEqn.H

@@ -41,7 +41,7 @@ while (pimple.correctNonOrthogonal())
       - fvm::laplacian(rhorAUf, p_rgh)
     );
 
-    p_rghEqn.solve(p_rgh.select(pimple.finalInnerIter()));
+    p_rghEqn.solve(mesh.solver(p_rgh.select(pimple.finalInnerIter())));
 
     if (pimple.finalNonOrthogonalIter())
     {

applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.H

@@ -110,6 +110,15 @@ public:
             const fvPatchFieldMapper&
         );
 
+        //- Construct and return a clone
+        virtual tmp<fvPatchScalarField> clone() const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new smoluchowskiJumpTFvPatchScalarField(*this)
+            );
+        }
+
         //- Construct as copy setting internal field reference
         smoluchowskiJumpTFvPatchScalarField
         (
@@ -117,22 +126,18 @@ public:
             const DimensionedField<scalar, volMesh>&
         );
 
-        //- Return a clone
-        virtual tmp<fvPatchField<scalar>> clone() const
-        {
-            return fvPatchField<scalar>::Clone(*this);
-        }
-
-        //- Clone with an internal field reference
-        virtual tmp<fvPatchField<scalar>> clone
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchScalarField> clone
         (
             const DimensionedField<scalar, volMesh>& iF
         ) const
         {
-            return fvPatchField<scalar>::Clone(*this, iF);
+            return tmp<fvPatchScalarField>
+            (
+                new smoluchowskiJumpTFvPatchScalarField(*this, iF)
+            );
         }
 
-
         // Mapping functions
 
             //- Map (and resize as needed) from self given a mapping object

applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.H

@@ -118,6 +118,15 @@ public:
             const fvPatchFieldMapper&
         );
 
+        //- Construct and return a clone
+        virtual tmp<fvPatchVectorField> clone() const
+        {
+            return tmp<fvPatchVectorField>
+            (
+                new maxwellSlipUFvPatchVectorField(*this)
+            );
+        }
+
         //- Construct as copy setting internal field reference
         maxwellSlipUFvPatchVectorField
         (
@@ -125,19 +134,16 @@ public:
             const DimensionedField<vector, volMesh>&
         );
 
-        //- Return a clone
-        virtual tmp<fvPatchField<vector>> clone() const
-        {
-            return fvPatchField<vector>::Clone(*this);
-        }
-
-        //- Clone with an internal field reference
-        virtual tmp<fvPatchField<vector>> clone
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchVectorField> clone
         (
             const DimensionedField<vector, volMesh>& iF
         ) const
         {
-            return fvPatchField<vector>::Clone(*this, iF);
+            return tmp<fvPatchVectorField>
+            (
+                new maxwellSlipUFvPatchVectorField(*this, iF)
+            );
         }
 
 

applications/solvers/compressible/rhoCentralFoam/BCs/rho/fixedRhoFvPatchScalarField.H

@@ -135,6 +135,15 @@ public:
             const fixedRhoFvPatchScalarField&
         );
 
+        //- Construct and return a clone
+        virtual tmp<fvPatchScalarField> clone() const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new fixedRhoFvPatchScalarField(*this)
+            );
+        }
+
         //- Construct as copy setting internal field reference
         fixedRhoFvPatchScalarField
         (
@@ -142,19 +151,16 @@ public:
             const DimensionedField<scalar, volMesh>&
         );
 
-        //- Return a clone
-        virtual tmp<fvPatchField<scalar>> clone() const
-        {
-            return fvPatchField<scalar>::Clone(*this);
-        }
-
-        //- Clone with an internal field reference
-        virtual tmp<fvPatchField<scalar>> clone
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchScalarField> clone
         (
             const DimensionedField<scalar, volMesh>& iF
         ) const
         {
-            return fvPatchField<scalar>::Clone(*this, iF);
+            return tmp<fvPatchScalarField>
+            (
+                new fixedRhoFvPatchScalarField(*this, iF)
+            );
         }
 
 

applications/solvers/compressible/rhoCentralFoam/createFieldRefs.H

@@ -1,9 +1,10 @@
 volScalarField& p = thermo.p();
 const volScalarField& T = thermo.T();
 const volScalarField& psi = thermo.psi();
+const volScalarField& mu = thermo.mu();
 
 bool inviscid(true);
-if (max(thermo.mu().cref().primitiveField()) > 0.0)
+if (max(mu.primitiveField()) > 0.0)
 {
     inviscid = false;
 }

applications/solvers/compressible/rhoPimpleAdiabaticFoam/pEqn.H

@@ -63,7 +63,7 @@
                 fvOptions(psi, p, rho.name())
             );
 
-            pEqn.solve(p.select(pimple.finalInnerIter()));
+            pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
 
             // Rhie & Chow interpolation (part 2)
             if (pimple.finalNonOrthogonalIter())

applications/solvers/compressible/rhoPimpleFoam/overRhoPimpleDyMFoam/correctPhi.H

@@ -72,7 +72,7 @@ if (mesh.changing())
             divrhoU()
         );
 
-        pcorrEqn.solve(pcorr.select(pimple.finalInnerIter()));
+        pcorrEqn.solve(mesh.solver(pcorr.select(pimple.finalInnerIter())));
         //Bypass virtual layer
         //mesh.fvMesh::solve(pcorrEqn, d);
 

applications/solvers/compressible/rhoPimpleFoam/overRhoPimpleDyMFoam/pEqn.H

@@ -56,7 +56,7 @@ if (pimple.transonic())
         // Relax the pressure equation to ensure diagonal-dominance
         pEqn.relax();
 
-        pEqn.solve(p.select(pimple.finalInnerIter()));
+        pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
 
         if (pimple.finalNonOrthogonalIter())
         {
@@ -78,7 +78,7 @@ else
     {
         fvScalarMatrix pEqn(pDDtEqn - fvm::laplacian(rhorAUf, p));
 
-        pEqn.solve(p.select(pimple.finalInnerIter()));
+        pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
 
         if (pimple.finalNonOrthogonalIter())
         {

applications/solvers/compressible/rhoPimpleFoam/pEqn.H

@@ -54,7 +54,7 @@ if (pimple.transonic())
         // Relax the pressure equation to ensure diagonal-dominance
         pEqn.relax();
 
-        pEqn.solve(p.select(pimple.finalInnerIter()));
+        pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
 
         if (pimple.finalNonOrthogonalIter())
         {
@@ -76,7 +76,7 @@ else
     {
         fvScalarMatrix pEqn(pDDtEqn - fvm::laplacian(rhorAUf, p));
 
-        pEqn.solve(p.select(pimple.finalInnerIter()));
+        pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
 
         if (pimple.finalNonOrthogonalIter())
         {

applications/solvers/compressible/rhoPimpleFoam/pcEqn.H

@@ -65,7 +65,7 @@ if (pimple.transonic())
         // Relax the pressure equation to ensure diagonal-dominance
         pEqn.relax();
 
-        pEqn.solve(p.select(pimple.finalInnerIter()));
+        pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
 
         if (pimple.finalNonOrthogonalIter())
         {
@@ -90,7 +90,7 @@ else
     {
         fvScalarMatrix pEqn(pDDtEqn - fvm::laplacian(rhorAtU, p));
 
-        pEqn.solve(p.select(pimple.finalInnerIter()));
+        pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
 
         if (pimple.finalNonOrthogonalIter())
         {

applications/solvers/electromagnetics/mhdFoam/mhdFoam.C

@@ -127,7 +127,7 @@ int main(int argc, char *argv[])
                     );
 
                     pEqn.setReference(pRefCell, pRefValue);
-                    pEqn.solve(p.select(piso.finalInnerIter()));
+                    pEqn.solve(mesh.solver(p.select(piso.finalInnerIter())));
 
                     if (piso.finalNonOrthogonalIter())
                     {
@@ -167,7 +167,7 @@ int main(int argc, char *argv[])
                     fvm::laplacian(rABf, pB) == fvc::div(phiB)
                 );
 
-                pBEqn.solve(pB.select(bpiso.finalInnerIter()));
+                pBEqn.solve(mesh.solver(pB.select(bpiso.finalInnerIter())));
 
                 if (bpiso.finalNonOrthogonalIter())
                 {

applications/solvers/finiteArea/liquidFilmFoam/createFaFields.H

@@ -5,7 +5,7 @@
         (
             "h",
             runTime.timeName(),
-            aMesh.thisDb(),
+            mesh,
             IOobject::MUST_READ,
             IOobject::AUTO_WRITE
         ),
@@ -20,7 +20,7 @@
         (
             "Us",
             runTime.timeName(),
-            aMesh.thisDb(),
+            mesh,
             IOobject::MUST_READ,
             IOobject::AUTO_WRITE
         ),
@@ -34,7 +34,7 @@
         (
             "phis",
             runTime.timeName(),
-            aMesh.thisDb(),
+            mesh,
             IOobject::READ_IF_PRESENT,
             IOobject::AUTO_WRITE
         ),
@@ -48,7 +48,7 @@
         (
             "phi2s",
             runTime.timeName(),
-            aMesh.thisDb(),
+            mesh,
             IOobject::READ_IF_PRESENT,
             IOobject::AUTO_WRITE
         ),
@@ -67,7 +67,7 @@
         (
             "Sm",
             runTime.timeName(),
-            aMesh.thisDb(),
+            mesh,
             IOobject::NO_READ,
             IOobject::NO_WRITE
         ),
@@ -82,7 +82,7 @@
         (
             "Sd",
             runTime.timeName(),
-            aMesh.thisDb(),
+            mesh,
             IOobject::NO_READ,
             IOobject::NO_WRITE
         ),
@@ -96,7 +96,7 @@
         (
             "Sg",
             runTime.timeName(),
-            aMesh.thisDb(),
+            mesh,
             IOobject::NO_READ,
             IOobject::NO_WRITE
         ),
@@ -112,7 +112,7 @@
         (
             "ps",
             runTime.timeName(),
-            aMesh.thisDb(),
+            mesh,
             IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
@@ -134,7 +134,7 @@
         (
             "manningField",
             runTime.timeName(),
-            aMesh.thisDb(),
+            mesh,
             IOobject::MUST_READ,
             IOobject::AUTO_WRITE
         ),
@@ -147,7 +147,7 @@
         (
             "frictionFactor",
             runTime.timeName(),
-            aMesh.thisDb(),
+            mesh,
             IOobject::NO_READ,
             IOobject::NO_WRITE
         ),

applications/solvers/finiteArea/liquidFilmFoam/createFvFields.H

@@ -7,7 +7,7 @@ volVectorField U
     (
         "U",
         runTime.timeName(),
-        mesh.thisDb(),
+        mesh,
         IOobject::NO_READ,
         IOobject::AUTO_WRITE
     ),
@@ -22,7 +22,7 @@ volScalarField H
     (
         "H",
         runTime.timeName(),
-        mesh.thisDb(),
+        mesh,
         IOobject::NO_READ,
         IOobject::AUTO_WRITE
     ),

applications/solvers/finiteArea/sphereSurfactantFoam/createFaFields.H

@@ -5,7 +5,7 @@ areaScalarField Cs
     (
         "Cs",
         runTime.timeName(),
-        aMesh.thisDb(),
+        mesh,
         IOobject::MUST_READ,
         IOobject::AUTO_WRITE
     ),
@@ -26,7 +26,7 @@ areaVectorField Us
     (
         "Us",
         runTime.timeName(),
-        aMesh.thisDb(),
+        mesh,
         IOobject::NO_READ,
         IOobject::NO_WRITE
     ),
@@ -58,7 +58,7 @@ edgeScalarField phis
     (
         "phis",
         runTime.timeName(),
-        aMesh.thisDb(),
+        mesh,
         IOobject::NO_READ,
         IOobject::NO_WRITE
     ),

applications/solvers/finiteArea/sphereSurfactantFoam/createFaMesh.H

@@ -0,0 +1,2 @@
+    // Create Finite Area mesh
+    faMesh aMesh(mesh);

applications/solvers/finiteArea/sphereSurfactantFoam/createVolFields.H

@@ -7,7 +7,7 @@
         (
             "Cvf",
             runTime.timeName(),
-            mesh.thisDb(),
+            mesh,
             IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
@@ -24,7 +24,7 @@
         (
             "U",
             runTime.timeName(),
-            mesh.thisDb(),
+            mesh,
             IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),

applications/solvers/finiteArea/surfactantFoam/createFaFields.H

@@ -5,7 +5,7 @@ areaScalarField Cs
     (
         "Cs",
         runTime.timeName(),
-        aMesh.thisDb(),
+        mesh,
         IOobject::MUST_READ,
         IOobject::AUTO_WRITE
     ),
@@ -37,7 +37,7 @@ areaVectorField Us
     (
         "Us",
         runTime.timeName(),
-        aMesh.thisDb(),
+        mesh,
         IOobject::MUST_READ,
         IOobject::NO_WRITE
     ),
@@ -51,7 +51,7 @@ edgeScalarField phis
     (
         "phis",
         runTime.timeName(),
-        aMesh.thisDb(),
+        mesh,
         IOobject::NO_READ,
         IOobject::NO_WRITE
     ),

applications/solvers/finiteArea/surfactantFoam/createFaMesh.H

@@ -0,0 +1,2 @@
+    // Create Finite Area mesh
+    faMesh aMesh(mesh);

applications/solvers/finiteArea/surfactantFoam/createVolFields.H

@@ -7,7 +7,7 @@
         (
             "Cvf",
             runTime.timeName(),
-            mesh.thisDb(),
+            mesh,
             IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
@@ -24,7 +24,7 @@
         (
             "U",
             runTime.timeName(),
-            mesh.thisDb(),
+            mesh,
             IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),

applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/pEqn.H

@@ -27,7 +27,7 @@
 
         p_rghEqn.setReference(pRefCell, getRefCellValue(p_rgh, pRefCell));
 
-        p_rghEqn.solve(p_rgh.select(pimple.finalInnerIter()));
+        p_rghEqn.solve(mesh.solver(p_rgh.select(pimple.finalInnerIter())));
 
         if (pimple.finalNonOrthogonalIter())
         {

applications/solvers/heatTransfer/buoyantPimpleFoam/overBuoyantPimpleDyMFoam/correctPhi.H

@@ -72,7 +72,7 @@ if (mesh.changing())
             divrhoU()
         );
 
-        //pcorrEqn.solve(pcorr.select(pimple.finalInnerIter()));
+        //pcorrEqn.solve(mesh.solver(pcorr.select(pimple.finalInnerIter())));
         //Bypass virtual layer
         const dictionary& d = mesh.solver
             (

applications/solvers/heatTransfer/buoyantPimpleFoam/overBuoyantPimpleDyMFoam/pEqn.H

@@ -50,7 +50,7 @@ while (pimple.correctNonOrthogonal())
       - fvm::laplacian(rhorAUf, p_rgh)
     );
 
-    p_rghEqn.solve(p_rgh.select(pimple.finalInnerIter()));
+    p_rghEqn.solve(mesh.solver(p_rgh.select(pimple.finalInnerIter())));
 
     if (pimple.finalNonOrthogonalIter())
     {

applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H

@@ -52,7 +52,7 @@ while (pimple.correctNonOrthogonal())
         compressible ? getRefCellValue(p_rgh, pRefCell) : pRefValue
     );
 
-    p_rghEqn.solve(p_rgh.select(pimple.finalInnerIter()));
+    p_rghEqn.solve(mesh.solver(p_rgh.select(pimple.finalInnerIter())));
 
     if (pimple.finalNonOrthogonalIter())
     {

applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/derivedFvPatchFields/turbulentTemperatureTwoPhaseRadCoupledMixed/turbulentTemperatureTwoPhaseRadCoupledMixedFvPatchScalarField.H

@@ -196,6 +196,18 @@ public:
             const fvPatchFieldMapper&
         );
 
+        //- Construct and return a clone
+        virtual tmp<fvPatchScalarField> clone() const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new turbulentTemperatureTwoPhaseRadCoupledMixedFvPatchScalarField
+                (
+                    *this
+                )
+            );
+        }
+
         //- Construct as copy setting internal field reference
         turbulentTemperatureTwoPhaseRadCoupledMixedFvPatchScalarField
         (
@@ -203,19 +215,20 @@ public:
             const DimensionedField<scalar, volMesh>&
         );
 
-        //- Return a clone
-        virtual tmp<fvPatchField<scalar>> clone() const
-        {
-            return fvPatchField<scalar>::Clone(*this);
-        }
-
-        //- Clone with an internal field reference
-        virtual tmp<fvPatchField<scalar>> clone
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchScalarField> clone
         (
             const DimensionedField<scalar, volMesh>& iF
         ) const
         {
-            return fvPatchField<scalar>::Clone(*this, iF);
+            return tmp<fvPatchScalarField>
+            (
+                new turbulentTemperatureTwoPhaseRadCoupledMixedFvPatchScalarField
+                (
+                    *this,
+                    iF
+                )
+            );
         }
 
 

applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/fluid/solveFluid.H

@@ -1,6 +1,6 @@
 if (finalIter)
 {
-    mesh.data().setFinalIteration(true);
+    mesh.data::add("finalIteration", true);
 }
 
 if (frozenFlow)
@@ -35,5 +35,5 @@ else
 
 if (finalIter)
 {
-    mesh.data().setFinalIteration(false);
+    mesh.data::remove("finalIteration");
 }

applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/solid/solveSolid.H

@@ -1,6 +1,6 @@
 if (finalIter)
 {
-    mesh.data().setFinalIteration(true);
+    mesh.data::add("finalIteration", true);
 }
 
 {
@@ -22,7 +22,7 @@ if (finalIter)
 
         fvOptions.constrain(hEqn);
 
-        hEqn.solve(h.select(finalIter));
+        hEqn.solve(mesh.solver(h.select(finalIter)));
 
         fvOptions.correct(h);
     }
@@ -35,5 +35,5 @@ if (finalIter)
 
 if (finalIter)
 {
-    mesh.data().setFinalIteration(false);
+    mesh.data::remove("finalIteration");
 }

applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/EEqn.H

@@ -33,7 +33,7 @@
     }
     else
     {
-        EEqn.solve(he.select(finalIter));
+        EEqn.solve(mesh.solver(he.select(finalIter)));
         fvOptions.correct(he);
 
         thermo.correct();

applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/UEqn.H

@@ -28,7 +28,7 @@
                   - fvc::snGrad(p_rgh)
                 )*mesh.magSf()
             ),
-            U.select(finalIter)
+            mesh.solver(U.select(finalIter))
         );
 
         fvOptions.correct(U);

applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/YEqn.H

@@ -44,7 +44,7 @@ if (Y.size())
 
             fvOptions.constrain(YiEqn);
 
-            YiEqn.solve("Yi");
+            YiEqn.solve(mesh.solver("Yi"));
 
             fvOptions.correct(Yi);
 

applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/pEqn.H

@@ -52,12 +52,15 @@ constrainPressure(p_rgh, rho, U, phiHbyA, rhorAUf, MRF);
 
         p_rghEqn.solve
         (
-            p_rgh.select
+            mesh.solver
             (
+                p_rgh.select
                 (
-                    oCorr == nOuterCorr-1
-                 && corr == nCorr-1
-                 && nonOrth == nNonOrthCorr
+                    (
+                        oCorr == nOuterCorr-1
+                     && corr == nCorr-1
+                     && nonOrth == nNonOrthCorr
+                    )
                 )
             )
         );

applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/solveFluid.H

@@ -1,6 +1,6 @@
 if (finalIter)
 {
-    mesh.data().setFinalIteration(true);
+    mesh.data::add("finalIteration", true);
 }
 
 if (frozenFlow)
@@ -36,5 +36,5 @@ else
 
 if (finalIter)
 {
-    mesh.data().setFinalIteration(false);
+    mesh.data::remove("finalIteration");
 }

applications/solvers/heatTransfer/chtMultiRegionFoam/include/createCoupledRegions.H

@@ -1,8 +1,6 @@
-bool coupled = false;
-{
-    fvSolution solutionDict(runTime);
-    solutionDict.readIfPresent("coupledEnergyField", coupled);
-}
+fvSolution solutionDict(runTime);
+
+bool coupled(solutionDict.getOrDefault("coupledEnergyField", false));
 
 autoPtr<fvMatrix<scalar>> fvMatrixAssemblyPtr;
 

applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solveSolid.H

@@ -25,10 +25,10 @@
 
         if (finalIter)
         {
-            mesh.data().setFinalIteration(true);
+            mesh.data::add("finalIteration", true);
         }
 
-        hEqn.solve(h.select(finalIter));
+        hEqn.solve(mesh.solver(h.select(finalIter)));
 
         fvOptions.correct(h);
 
@@ -39,7 +39,7 @@
 
         if (finalIter)
         {
-            mesh.data().setFinalIteration(false);
+            mesh.data::remove("finalIteration");
         }
     }
 }

applications/solvers/incompressible/adjointOptimisationFoam/adjointOptimisationFoam.C

@@ -43,8 +43,6 @@ Description
 
 int main(int argc, char *argv[])
 {
-    #include "postProcess.H"
-
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
@@ -66,13 +64,13 @@ int main(int argc, char *argv[])
         {
             // Solve all primal equations
             om.solvePrimalEquations();
-
-            // Clear sensitivities
-            om.clearSensitivities();
-
-            // Solve all adjoint equations
-            om.solveAdjointEquations();
         }
+
+        // Update primal-based quantities of the adjoint solvers
+        om.updatePrimalBasedQuantities();
+
+        // Solve all adjoint equations
+        om.solveAdjointEquations();
     }
 
     Info<< "End\n" << endl;

applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.H

@@ -85,6 +85,15 @@ public:
             const fvPatchFieldMapper&
         );
 
+        //- Construct and return a clone
+        virtual tmp<fvPatchScalarField> clone() const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new adjointOutletPressureFvPatchScalarField(*this)
+            );
+        }
+
         //- Construct as copy setting internal field reference
         adjointOutletPressureFvPatchScalarField
         (
@@ -92,19 +101,16 @@ public:
             const DimensionedField<scalar, volMesh>&
         );
 
-        //- Return a clone
-        virtual tmp<fvPatchField<scalar>> clone() const
-        {
-            return fvPatchField<scalar>::Clone(*this);
-        }
-
-        //- Clone with an internal field reference
-        virtual tmp<fvPatchField<scalar>> clone
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchScalarField> clone
         (
             const DimensionedField<scalar, volMesh>& iF
         ) const
         {
-            return fvPatchField<scalar>::Clone(*this, iF);
+            return tmp<fvPatchScalarField>
+            (
+                new adjointOutletPressureFvPatchScalarField(*this, iF)
+            );
         }
 
 

applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.H

@@ -85,6 +85,15 @@ public:
             const fvPatchFieldMapper&
         );
 
+        //- Construct and return a clone
+        virtual tmp<fvPatchVectorField> clone() const
+        {
+            return tmp<fvPatchVectorField>
+            (
+                new adjointOutletVelocityFvPatchVectorField(*this)
+            );
+        }
+
         //- Construct as copy setting internal field reference
         adjointOutletVelocityFvPatchVectorField
         (
@@ -92,19 +101,16 @@ public:
             const DimensionedField<vector, volMesh>&
         );
 
-        //- Return a clone
-        virtual tmp<fvPatchField<vector>> clone() const
-        {
-            return fvPatchField<vector>::Clone(*this);
-        }
-
-        //- Clone with an internal field reference
-        virtual tmp<fvPatchField<vector>> clone
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchVectorField> clone
         (
             const DimensionedField<vector, volMesh>& iF
         ) const
         {
-            return fvPatchField<vector>::Clone(*this, iF);
+            return tmp<fvPatchVectorField>
+            (
+                new adjointOutletVelocityFvPatchVectorField(*this, iF)
+            );
         }
 
 

applications/solvers/incompressible/icoFoam/icoFoam.C

@@ -141,7 +141,7 @@ int main(int argc, char *argv[])
 
                 pEqn.setReference(pRefCell, pRefValue);
 
-                pEqn.solve(p.select(piso.finalInnerIter()));
+                pEqn.solve(mesh.solver(p.select(piso.finalInnerIter())));
 
                 if (piso.finalNonOrthogonalIter())
                 {

applications/solvers/incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C

@@ -114,7 +114,7 @@ int main(int argc, char *argv[])
 
                 pEqn.setReference(pRefCell, pRefValue);
 
-                pEqn.solve(p.select(piso.finalInnerIter()));
+                pEqn.solve(mesh.solver(p.select(piso.finalInnerIter())));
 
                 if (piso.finalNonOrthogonalIter())
                 {

applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/pEqn.H

@@ -40,7 +40,7 @@ while (pimple.correctNonOrthogonal())
 
     pEqn.setReference(pRefCell, pRefValue);
 
-    pEqn.solve(p.select(pimple.finalInnerIter()));
+    pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
 
     if (pimple.finalNonOrthogonalIter())
     {

applications/solvers/incompressible/pimpleFoam/overPimpleDyMFoam/pEqn.H

@@ -32,7 +32,7 @@ while (pimple.correctNonOrthogonal())
 
     pEqn.setReference(pRefCell, pRefValue);
 
-    pEqn.solve(p.select(pimple.finalInnerIter()));
+    pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
 
     if (pimple.finalNonOrthogonalIter())
     {

applications/solvers/incompressible/pimpleFoam/pEqn.H

@@ -45,7 +45,7 @@ while (pimple.correctNonOrthogonal())
 
     pEqn.setReference(pRefCell, pRefValue);
 
-    pEqn.solve(p.select(pimple.finalInnerIter()));
+    pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
 
     if (pimple.finalNonOrthogonalIter())
     {

applications/solvers/incompressible/pisoFoam/pEqn.H

@@ -26,7 +26,7 @@ while (piso.correctNonOrthogonal())
 
     pEqn.setReference(pRefCell, pRefValue);
 
-    pEqn.solve(p.select(piso.finalInnerIter()));
+    pEqn.solve(mesh.solver(p.select(piso.finalInnerIter())));
 
     if (piso.finalNonOrthogonalIter())
     {

applications/solvers/incompressible/pisoFoam/pisoFoam.C

@@ -6,7 +6,6 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -106,9 +105,6 @@ int main(int argc, char *argv[])
 
         #include "CourantNo.H"
 
-        // Update settings from the control dictionary
-        piso.read();
-
         // Pressure-velocity PISO corrector
         {
             #include "UEqn.H"

applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C

@@ -135,7 +135,7 @@ int main(int argc, char *argv[])
                       - fvm::laplacian(ghrAUf, h)
                     );
 
-                    hEqn.solve(h.select(pimple.finalInnerIter()));
+                    hEqn.solve(mesh.solver(h.select(pimple.finalInnerIter())));
 
                     if (pimple.finalNonOrthogonalIter())
                     {

applications/solvers/lagrangian/DPMFoam/DPMDyMFoam/pEqn.H

@@ -34,7 +34,7 @@
 
         pEqn.setReference(pRefCell, pRefValue);
 
-        pEqn.solve(p.select(pimple.finalInnerIter()));
+        pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
 
         if (pimple.finalNonOrthogonalIter())
         {

applications/solvers/lagrangian/DPMFoam/pEqn.H

@@ -32,7 +32,7 @@
 
         pEqn.setReference(pRefCell, pRefValue);
 
-        pEqn.solve(p.select(pimple.finalInnerIter()));
+        pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
 
         if (pimple.finalNonOrthogonalIter())
         {

applications/solvers/lagrangian/coalChemistryFoam/YEqn.H

@@ -36,7 +36,7 @@ tmp<fv::convectionScheme<scalar>> mvConvection
 
             fvOptions.constrain(YiEqn);
 
-            YiEqn.solve("Yi");
+            YiEqn.solve(mesh.solver("Yi"));
 
             fvOptions.correct(Yi);
 

applications/solvers/lagrangian/coalChemistryFoam/pEqn.H

@@ -33,7 +33,7 @@ if (pimple.transonic())
           + fvOptions(psi, p, rho.name())
         );
 
-        pEqn.solve(p.select(pimple.finalInnerIter()));
+        pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
 
         if (pimple.finalNonOrthogonalIter())
         {
@@ -69,7 +69,7 @@ else
           + fvOptions(psi, p, rho.name())
         );
 
-        pEqn.solve(p.select(pimple.finalInnerIter()));
+        pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
 
         if (pimple.finalNonOrthogonalIter())
         {

applications/solvers/lagrangian/kinematicParcelFoam/pEqn.H

@@ -34,7 +34,7 @@ while (pimple.correctNonOrthogonal())
 
     pEqn.setReference(pRefCell, pRefValue);
 
-    pEqn.solve(p.select(pimple.finalInnerIter()));
+    pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
 
     if (pimple.finalNonOrthogonalIter())
     {

applications/solvers/lagrangian/reactingParcelFoam/YEqn.H

@@ -37,7 +37,7 @@ tmp<fv::convectionScheme<scalar>> mvConvection
 
             fvOptions.constrain(YEqn);
 
-            YEqn.solve("Yi");
+            YEqn.solve(mesh.solver("Yi"));
 
             fvOptions.correct(Yi);
 

applications/solvers/lagrangian/reactingParcelFoam/pEqn.H

@@ -47,7 +47,7 @@ while (pimple.correctNonOrthogonal())
       - fvm::laplacian(rhorAUf, p_rgh)
     );
 
-    p_rghEqn.solve(p_rgh.select(pimple.finalInnerIter()));
+    p_rghEqn.solve(mesh.solver(p_rgh.select(pimple.finalInnerIter())));
 
     if (pimple.finalNonOrthogonalIter())
     {

applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/YEqn.H

@@ -34,7 +34,7 @@ tmp<fv::convectionScheme<scalar>> mvConvection
 
             fvOptions.constrain(YEqn);
 
-            YEqn.solve("Yi");
+            YEqn.solve(mesh.solver("Yi"));
 
             fvOptions.correct(Yi);
 

applications/solvers/lagrangian/simpleCoalParcelFoam/YEqn.H

@@ -34,7 +34,7 @@ tmp<fv::convectionScheme<scalar>> mvConvection
 
             fvOptions.constrain(YEqn);
 
-            YEqn.solve("Yi");
+            YEqn.solve(mesh.solver("Yi"));
 
             fvOptions.correct(Yi);
 

applications/solvers/lagrangian/sprayFoam/YEqn.H

@@ -35,7 +35,7 @@ tmp<fv::convectionScheme<scalar>> mvConvection
 
             fvOptions.constrain(YEqn);
 
-            YEqn.solve("Yi");
+            YEqn.solve(mesh.solver("Yi"));
 
             fvOptions.correct(Yi);
 

applications/solvers/lagrangian/sprayFoam/pEqn.H

@@ -41,7 +41,7 @@ if (pimple.transonic())
           + fvOptions(psi, p, rho.name())
         );
 
-        pEqn.solve(p.select(pimple.finalInnerIter()));
+        pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
 
         if (pimple.finalNonOrthogonalIter())
         {
@@ -77,7 +77,7 @@ else
           + fvOptions(psi, p, rho.name())
         );
 
-        pEqn.solve(p.select(pimple.finalInnerIter()));
+        pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
 
         if (pimple.finalNonOrthogonalIter())
         {

applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/pEqn.H

@@ -42,7 +42,7 @@ if (pimple.transonic())
           + fvOptions(psi, p, rho.name())
         );
 
-        pEqn.solve(p.select(pimple.finalInnerIter()));
+        pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
 
         if (pimple.finalNonOrthogonalIter())
         {
@@ -77,7 +77,7 @@ else
           + fvOptions(psi, p, rho.name())
         );
 
-        pEqn.solve(p.select(pimple.finalInnerIter()));
+        pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
 
         if (pimple.finalNonOrthogonalIter())
         {

applications/solvers/multiphase/MPPICInterFoam/alphaEqnSubCycle.H

@@ -3,7 +3,12 @@ if (nAlphaSubCycles > 1)
     dimensionedScalar totalDeltaT = runTime.deltaT();
     surfaceScalarField rhoPhiSum
     (
-        mesh.newIOobject("rhoPhiSum"),
+        IOobject
+        (
+            "rhoPhiSum",
+            runTime.timeName(),
+            mesh
+        ),
         mesh,
         dimensionedScalar(rhoPhi.dimensions(), Zero)
     );

applications/solvers/multiphase/MPPICInterFoam/pEqn.H

@@ -38,7 +38,7 @@
 
         p_rghEqn.setReference(pRefCell, getRefCellValue(p_rgh, pRefCell));
 
-        p_rghEqn.solve(p_rgh.select(pimple.finalInnerIter()));
+        p_rghEqn.solve(mesh.solver(p_rgh.select(pimple.finalInnerIter())));
 
         if (pimple.finalNonOrthogonalIter())
         {

applications/solvers/multiphase/VoF/alphaEqnSubCycle.H

@@ -3,7 +3,12 @@ if (nAlphaSubCycles > 1)
     dimensionedScalar totalDeltaT = runTime.deltaT();
     surfaceScalarField rhoPhiSum
     (
-        mesh.newIOobject("rhoPhiSum"),
+        IOobject
+        (
+            "rhoPhiSum",
+            runTime.timeName(),
+            mesh
+        ),
         mesh,
         dimensionedScalar(rhoPhi.dimensions(), Zero)
     );

applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/pEqn.H

@@ -36,7 +36,7 @@
           - fvm::laplacian(rhorAUf, p)
         );
 
-        pEqn.solve(p.select(pimple.finalInnerIter()));
+        pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
 
         if (pimple.finalNonOrthogonalIter())
         {

applications/solvers/multiphase/cavitatingFoam/pEqn.H

@@ -33,7 +33,7 @@
           - fvm::laplacian(rhorAUf, p)
         );
 
-        pEqn.solve(p.select(pimple.finalInnerIter()));
+        pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));
 
         if (pimple.finalNonOrthogonalIter())
         {

applications/solvers/multiphase/compressibleInterFoam/compressibleAlphaEqnSubCycle.H

@@ -4,19 +4,26 @@ if (nAlphaSubCycles > 1)
 {
     dimensionedScalar totalDeltaT = runTime.deltaT();
 
-    talphaPhi1.reset
+    talphaPhi1 = new surfaceScalarField
     (
-        new surfaceScalarField
+        IOobject
         (
-            mesh.newIOobject("alphaPhi1"),
-            mesh,
-            dimensionedScalar(alphaPhi10.dimensions(), Zero)
-        )
+            "alphaPhi1",
+            runTime.timeName(),
+            mesh
+        ),
+        mesh,
+        dimensionedScalar(alphaPhi10.dimensions(), Zero)
     );
 
     surfaceScalarField rhoPhiSum
     (
-        mesh.newIOobject("rhoPhiSum"),
+        IOobject
+        (
+            "rhoPhiSum",
+            runTime.timeName(),
+            mesh
+        ),
         mesh,
         dimensionedScalar(rhoPhi.dimensions(), Zero)
     );

applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/pEqn.H

@@ -99,7 +99,7 @@
               + (max(alpha2, scalar(0))/rho2)*p_rghEqnComp2()
             )
           + p_rghEqnIncomp,
-            p_rgh.select(pimple.finalInnerIter())
+            mesh.solver(p_rgh.select(pimple.finalInnerIter()))
         );
 
         if (pimple.finalNonOrthogonalIter())

applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFPatchTransfer/VoFPatchTransfer.C

@@ -160,8 +160,7 @@ void VoFPatchTransfer::correct
     const volScalarField& heVoF = thermo.thermo1().he();
     const volScalarField& TVoF = thermo.thermo1().T();
     const volScalarField CpVoF(thermo.thermo1().Cp());
-    const tmp<volScalarField> trhoVoF(thermo.thermo1().rho());
-    const volScalarField& rhoVoF = trhoVoF();
+    const volScalarField& rhoVoF = thermo.thermo1().rho()();
     const volScalarField& alphaVoF = thermo.alpha1();
 
     forAll(patchIDs_, pidi)

applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/pEqn.H

@@ -108,7 +108,7 @@
         solve
         (
             p_rghEqnComp1() + p_rghEqnComp2() + p_rghEqnIncomp,
-            p_rgh.select(pimple.finalInnerIter())
+            mesh.solver(p_rgh.select(pimple.finalInnerIter()))
         );
 
         if (pimple.finalNonOrthogonalIter())

applications/solvers/multiphase/compressibleInterFoam/compressibleInterIsoFoam/compressibleAlphaEqnSubCycle.H

@@ -13,19 +13,26 @@ if (nAlphaSubCycles > 1)
 {
     dimensionedScalar totalDeltaT = runTime.deltaT();
 
-    talphaPhi1.reset
+    talphaPhi1 = new surfaceScalarField
     (
-        new surfaceScalarField
+        IOobject
         (
-            mesh.newIOobject("alphaPhi1"),
-            mesh,
-            dimensionedScalar(alphaPhi10.dimensions(), Zero)
-        )
+            "alphaPhi1",
+            runTime.timeName(),
+            mesh
+        ),
+        mesh,
+        dimensionedScalar(alphaPhi10.dimensions(), Zero)
     );
 
     surfaceScalarField rhoPhiSum
     (
-        mesh.newIOobject("rhoPhiSum"),
+        IOobject
+        (
+            "rhoPhiSum",
+            runTime.timeName(),
+            mesh
+        ),
         mesh,
         dimensionedScalar(rhoPhi.dimensions(), Zero)
     );

applications/solvers/multiphase/compressibleInterFoam/compressibleInterIsoFoam/pEqn.H

@@ -124,7 +124,7 @@
          solve
          (
              p_rghEqnComp1() + p_rghEqnComp2() + p_rghEqnIncomp,
-             p_rgh.select(pimple.finalInnerIter())
+             mesh.solver(p_rgh.select(pimple.finalInnerIter()))
          );
 
         if (pimple.finalNonOrthogonalIter())

applications/solvers/multiphase/compressibleInterFoam/overCompressibleInterDyMFoam/pEqn.H

@@ -110,7 +110,7 @@
         solve
         (
             p_rghEqnComp1() + p_rghEqnComp2() + p_rghEqnIncomp,
-            p_rgh.select(pimple.finalInnerIter())
+            mesh.solver(p_rgh.select(pimple.finalInnerIter()))
         );
 
         if (pimple.finalNonOrthogonalIter())

applications/solvers/multiphase/compressibleInterFoam/pEqn.H

@@ -108,7 +108,7 @@
         solve
         (
             p_rghEqnComp1() + p_rghEqnComp2() + p_rghEqnIncomp,
-            p_rgh.select(pimple.finalInnerIter())
+            mesh.solver(p_rgh.select(pimple.finalInnerIter()))
         );
 
         if (pimple.finalNonOrthogonalIter())

applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/twoPhaseMixtureThermo.H

@@ -135,14 +135,14 @@ public:
             virtual volScalarField& he()
             {
                 NotImplemented;
-                return const_cast<volScalarField&>(volScalarField::null());
+                return thermo1_->he();
             }
 
             //- Enthalpy/Internal energy [J/kg]
             virtual const volScalarField& he() const
             {
                 NotImplemented;
-                return volScalarField::null();
+                return thermo1_->he();
             }
 
             //- Enthalpy/Internal energy
@@ -213,7 +213,7 @@ public:
             ) const
             {
                 NotImplemented;
-                return nullptr;
+                return tmp<scalarField>::New(p);
             }
 
             //- Heat capacity at constant volume [J/kg/K]
@@ -236,7 +236,7 @@ public:
             ) const
             {
                 NotImplemented;
-                return nullptr;
+                return tmp<scalarField>::New(p);
             }
 
             //- Gamma = Cp/Cv []

applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/alphaContactAngle/alphaContactAngleFvPatchScalarField.H

@@ -164,6 +164,15 @@ public:
             const fvPatchFieldMapper&
         );
 
+        //- Construct and return a clone
+        virtual tmp<fvPatchScalarField> clone() const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new alphaContactAngleFvPatchScalarField(*this)
+            );
+        }
+
         //- Construct as copy setting internal field reference
         alphaContactAngleFvPatchScalarField
         (
@@ -171,19 +180,16 @@ public:
             const DimensionedField<scalar, volMesh>&
         );
 
-        //- Return a clone
-        virtual tmp<fvPatchField<scalar>> clone() const
-        {
-            return fvPatchField<scalar>::Clone(*this);
-        }
-
-        //- Clone with an internal field reference
-        virtual tmp<fvPatchField<scalar>> clone
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchScalarField> clone
         (
             const DimensionedField<scalar, volMesh>& iF
         ) const
         {
-            return fvPatchField<scalar>::Clone(*this, iF);
+            return tmp<fvPatchScalarField>
+            (
+                new alphaContactAngleFvPatchScalarField(*this, iF)
+            );
         }
 
 

applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C

@@ -99,8 +99,7 @@ Foam::multiphaseMixtureThermo::multiphaseMixtureThermo
             mesh_.time().timeName(),
             mesh_,
             IOobject::NO_READ,
-            IOobject::AUTO_WRITE,
-            IOobject::REGISTER
+            IOobject::AUTO_WRITE
         ),
         mesh_,
         dimensionedScalar(dimless, Zero)
@@ -999,12 +998,19 @@ Foam::tmp<Foam::volScalarField> Foam::multiphaseMixtureThermo::K
 Foam::tmp<Foam::volScalarField>
 Foam::multiphaseMixtureThermo::nearInterface() const
 {
-    auto tnearInt = volScalarField::New
+    tmp<volScalarField> tnearInt
     (
-        "nearInterface",
-        IOobject::NO_REGISTER,
-        mesh_,
-        dimensionedScalar(dimless, Zero)
+        new volScalarField
+        (
+            IOobject
+            (
+                "nearInterface",
+                mesh_.time().timeName(),
+                mesh_
+            ),
+            mesh_,
+            dimensionedScalar(dimless, Zero)
+        )
     );
 
     for (const phaseModel& phase : phases_)

applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.H

@@ -243,14 +243,14 @@ public:
             virtual volScalarField& he()
             {
                 NotImplemented;
-                return const_cast<volScalarField&>(volScalarField::null());
+                return phases_[0].thermo().he();
             }
 
             //- Enthalpy/Internal energy [J/kg]
             virtual const volScalarField& he() const
             {
                 NotImplemented;
-                return volScalarField::null();
+                return phases_[0].thermo().he();
             }
 
             //- Enthalpy/Internal energy
@@ -327,7 +327,7 @@ public:
             ) const
             {
                 NotImplemented;
-                return nullptr;
+                return tmp<scalarField>::New(p);
             }
 
             //- Heat capacity at constant volume [J/kg/K]
@@ -350,7 +350,7 @@ public:
             ) const
             {
                 NotImplemented;
-                return nullptr;
+                return tmp<scalarField>::New(p);
             }
 
             //- Gamma = Cp/Cv []

applications/solvers/multiphase/compressibleMultiphaseInterFoam/pEqn.H

@@ -28,8 +28,7 @@
     forAllConstIters(mixture.phases(), phase)
     {
         const rhoThermo& thermo = phase().thermo();
-        const tmp<volScalarField> trho(thermo.rho());
-        const volScalarField& rho = trho();
+        const volScalarField& rho = thermo.rho()();
 
         p_rghEqnComps.set
         (
@@ -81,7 +80,7 @@
         (
             p_rghEqnComp
           + p_rghEqnIncomp,
-            p_rgh.select(pimple.finalInnerIter())
+            mesh.solver(p_rgh.select(pimple.finalInnerIter()))
         );
 
         if (pimple.finalNonOrthogonalIter())

applications/solvers/multiphase/driftFluxFoam/alphaEqnSubCycle.H

@@ -18,7 +18,12 @@
         dimensionedScalar totalDeltaT = runTime.deltaT();
         surfaceScalarField alphaPhiSum
         (
-            mesh.newIOobject("alphaPhiSum"),
+            IOobject
+            (
+                "alphaPhiSum",
+                runTime.timeName(),
+                mesh
+            ),
             mesh,
             dimensionedScalar(phi.dimensions(), Zero)
         );
@@ -49,7 +54,7 @@
           - fvm::laplacian(turbulence->nut(), alpha1)
         );
 
-        alpha1Eqn.solve("alpha1Diffusion");
+        alpha1Eqn.solve(mesh.solver("alpha1Diffusion"));
 
         alphaPhi += alpha1Eqn.flux();
         alpha2 = 1.0 - alpha1;

applications/solvers/multiphase/driftFluxFoam/pEqn.H

@@ -32,7 +32,7 @@
 
         p_rghEqn.setReference(pRefCell, getRefCellValue(p_rgh, pRefCell));
 
-        p_rghEqn.solve(p_rgh.select(pimple.finalInnerIter()));
+        p_rghEqn.solve(mesh.solver(p_rgh.select(pimple.finalInnerIter())));
 
         if (pimple.finalNonOrthogonalIter())
         {

applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.C

@@ -158,11 +158,13 @@ Foam::tmp<Foam::volSymmTensorField> Foam::relativeVelocityModel::tauDm() const
     // Calculate the relative velocity of the continuous phase w.r.t the mean
     volVectorField Ucm(betad*Udm_/betac);
 
-    return volSymmTensorField::New
+    return tmp<volSymmTensorField>
     (
-        "tauDm",
-        IOobject::NO_REGISTER,
-        betad*sqr(Udm_) + betac*sqr(Ucm)
+        new volSymmTensorField
+        (
+            "tauDm",
+            betad*sqr(Udm_) + betac*sqr(Ucm)
+        )
     );
 }