TUT: added two unsteady adjoint optimisation tutorials

showcasing the use of compressedFullStorage and binomialCheckPointing
ENH: introduced unsteady adjoint functionality
2022-07-15 16:43:12 +03:00 · 2022-07-15 16:43:10 +03:00 · 2022-07-15 16:43:07 +03:00 · 2022-07-15 16:43:06 +03:00
1117 changed files with 24148 additions and 21111 deletions
--- a/META-INFO/api-info
+++ b/META-INFO/api-info
@ -1,2 +1,2 @@
 api=2206
-patch=220907
+patch=0
--- a/applications/solvers/acoustic/acousticFoam/Make/options
+++ b/applications/solvers/acoustic/acousticFoam/Make/options
@ -11,5 +11,4 @@ EXE_LIBS = \
    -lfvOptions \
    -lmeshTools \
    -lsampling \
-    -lregionFaModels \
-    -lfiniteArea
+    -lregionFaModels
--- a/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
+++ b/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
@ -116,7 +116,7 @@ int main(int argc, char *argv[])
            "normalisedGradP",
            tmagGradP()/max(tmagGradP())
        );
-        normalisedGradP.writeOpt(IOobject::AUTO_WRITE);
+        normalisedGradP.writeOpt() = IOobject::AUTO_WRITE;
        tmagGradP.clear();

        ++runTime;
--- a/applications/solvers/combustion/fireFoam/Make/options
+++ b/applications/solvers/combustion/fireFoam/Make/options
@ -1,8 +1,8 @@
 EXE_INC = \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/finiteArea/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude \
+    -I${LIB_SRC}/meshTools/lnInclude \
+    -I${LIB_SRC}/sampling/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
    -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \
--- a/applications/solvers/compressible/rhoPimpleFoam/Make/options
+++ b/applications/solvers/compressible/rhoPimpleFoam/Make/options
@ -26,5 +26,4 @@ EXE_LIBS = \
    -ltopoChangerFvMesh \
    -lsampling \
    -latmosphericModels \
-    -lregionFaModels \
-    -lfiniteArea
+    -lregionFaModels
--- a/applications/solvers/compressible/rhoSimpleFoam/Make/options
+++ b/applications/solvers/compressible/rhoSimpleFoam/Make/options
@ -21,5 +21,4 @@ EXE_LIBS = \
    -lcompressibleTurbulenceModels \
    -lthermoTools \
    -latmosphericModels \
-    -lregionFaModels \
-    -lfiniteArea
+    -lregionFaModels
--- a/applications/solvers/heatTransfer/buoyantPimpleFoam/Make/options
+++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/Make/options
@ -28,5 +28,4 @@ EXE_LIBS = \
    -ldynamicMesh \
    -ldynamicFvMesh \
    -ltopoChangerFvMesh \
-    -lregionFaModels \
-    -lfiniteArea
+    -lregionFaModels
--- a/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options
+++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options
@ -22,5 +22,4 @@ EXE_LIBS = \
    -lcompressibleTurbulenceModels \
    -lthermoTools \
    -latmosphericModels \
-    -lregionFaModels \
-    -lfiniteArea
+    -lregionFaModels
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options
@ -40,5 +40,4 @@ EXE_LIBS = \
    -lthermoTools \
    -lradiationModels \
    -lregionModels \
-    -lregionFaModels \
-    -lfiniteArea
+    -lregionFaModels
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options
@ -36,5 +36,5 @@ EXE_LIBS = \
    -lfaOptions \
    -lregionModels \
    -lsampling \
-    -lregionFaModels \
-    -lfiniteArea
+    -lregionFaModels
+
--- a/applications/solvers/incompressible/pimpleFoam/Make/options
+++ b/applications/solvers/incompressible/pimpleFoam/Make/options
@ -22,5 +22,4 @@ EXE_LIBS = \
    -ldynamicFvMesh \
    -ltopoChangerFvMesh \
    -latmosphericModels \
-    -lregionFaModels \
-    -lfiniteArea
+    -lregionFaModels
--- a/applications/solvers/lagrangian/coalChemistryFoam/Make/options
+++ b/applications/solvers/lagrangian/coalChemistryFoam/Make/options
@ -1,7 +1,7 @@
 EXE_INC = \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/finiteArea/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I${LIB_SRC}/meshTools/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
    -I$(LIB_SRC)/lagrangian/basic/lnInclude \
--- a/applications/solvers/lagrangian/reactingParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/reactingParcelFoam/Make/options
@ -2,10 +2,10 @@ EXE_INC = \
    -I../reactingParcelFoam \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/finiteArea/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I${LIB_SRC}/meshTools/lnInclude \
    -I$(LIB_SRC)/dynamicMesh/lnInclude \
    -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude \
+    -I${LIB_SRC}/sampling/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
    -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \
--- a/applications/solvers/lagrangian/reactingParcelFoam/reactingHeterogenousParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/reactingParcelFoam/reactingHeterogenousParcelFoam/Make/options
@ -2,8 +2,8 @@ EXE_INC = \
    -I.. \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/finiteArea/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I${LIB_SRC}/sampling/lnInclude \
+    -I${LIB_SRC}/meshTools/lnInclude \
    -I$(LIB_SRC)/dynamicMesh/lnInclude \
    -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
--- a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options
@ -1,7 +1,7 @@
 EXE_INC = \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/finiteArea/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I${LIB_SRC}/meshTools/lnInclude \
    -I$(LIB_SRC)/sampling/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
--- a/applications/solvers/lagrangian/simpleCoalParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/simpleCoalParcelFoam/Make/options
@ -2,7 +2,7 @@ EXE_INC = \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/finiteArea/lnInclude \
    -I$(LIB_SRC)/fvOptions/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I${LIB_SRC}/meshTools/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
    -I$(LIB_SRC)/lagrangian/basic/lnInclude \
--- a/applications/solvers/lagrangian/sprayFoam/Make/options
+++ b/applications/solvers/lagrangian/sprayFoam/Make/options
@ -2,8 +2,8 @@ EXE_INC = \
    -I../reactingParcelFoam \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/finiteArea/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude \
+    -I${LIB_SRC}/meshTools/lnInclude \
+    -I${LIB_SRC}/sampling/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
    -I$(LIB_SRC)/lagrangian/basic/lnInclude \
--- a/applications/solvers/lagrangian/sprayFoam/engineFoam/Make/options
+++ b/applications/solvers/lagrangian/sprayFoam/engineFoam/Make/options
@ -4,8 +4,8 @@ EXE_INC = \
    -I../../reactingParcelFoam \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/finiteArea/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude \
+    -I${LIB_SRC}/meshTools/lnInclude \
+    -I${LIB_SRC}/sampling/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
    -I$(LIB_SRC)/lagrangian/basic/lnInclude \
--- a/applications/solvers/lagrangian/sprayFoam/simpleSprayFoam/Make/options
+++ b/applications/solvers/lagrangian/sprayFoam/simpleSprayFoam/Make/options
@ -2,7 +2,7 @@ EXE_INC = \
    -I$(FOAM_SOLVERS)/lagrangian/reactingParcelFoam/simpleReactingParcelFoam \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/finiteArea/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I${LIB_SRC}/meshTools/lnInclude \
    -I$(LIB_SRC)/sampling/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
--- a/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/Make/options
+++ b/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/Make/options
@ -4,8 +4,8 @@ EXE_INC = \
    -I../../../compressible/rhoPimpleFoam \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/finiteArea/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude \
+    -I${LIB_SRC}/meshTools/lnInclude \
+    -I${LIB_SRC}/sampling/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
    -I$(LIB_SRC)/lagrangian/basic/lnInclude \
--- a/applications/solvers/multiphase/MPPICInterFoam/Make/options
+++ b/applications/solvers/multiphase/MPPICInterFoam/Make/options
@ -42,5 +42,4 @@ EXE_LIBS = \
    -lregionModels \
    -lregionFaModels \
    -lsurfaceFilmModels \
-    -lfiniteArea \
    -lcompressibleTwoPhaseMixtureTurbulenceModels
--- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/laserDTRM/DTRMParticle/DTRMParticleIO.C
+++ b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/laserDTRM/DTRMParticle/DTRMParticleIO.C
@ -5,7 +5,7 @@
    \\  /    A nd           | www.openfoam.com
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2017-2022 OpenCFD Ltd.
+    Copyright (C) 2017-2019 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -59,7 +59,7 @@ Foam::DTRMParticle::DTRMParticle
 {
    if (readFields)
    {
-        if (is.format() == IOstreamOption::ASCII)
+        if (is.format() == IOstream::ASCII)
        {
            is >> p0_ >> p1_ >> I0_ >> I_ >> dA_ >> transmissiveId_;
        }
@ -115,7 +115,7 @@ void Foam::DTRMParticle::writeProperties

 Foam::Ostream& Foam::operator<<(Ostream& os, const DTRMParticle& p)
 {
-    if (os.format() == IOstreamOption::ASCII)
+    if (os.format() == IOstream::ASCII)
    {
        os  << static_cast<const particle&>(p)
            << token::SPACE << p.p0_
--- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/laserDTRM/laserDTRM.C
+++ b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/laserDTRM/laserDTRM.C
@ -699,7 +699,7 @@ void Foam::radiation::laserDTRM::calculate()

            for (label pointi = 0; pointi < lines.size(); pointi += 2)
            {
-                os.writeLine(lines[pointi], lines[pointi+1]);
+                os.write(linePointRef(lines[pointi], lines[pointi+1]));
            }
        }

--- a/applications/test/CompactIOList/Test-CompactIOList.C
+++ b/applications/test/CompactIOList/Test-CompactIOList.C
@ -6,7 +6,7 @@
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
    Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2020-2022 OpenCFD Ltd.
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -49,8 +49,8 @@ int main(int argc, char *argv[])
    #include "setRootCase.H"
    #include "createTime.H"

-    IOstreamOption streamOpt(IOstreamOption::BINARY);
-    // IOstreamOption streamOpt(IOstreamOption::ASCII);
+    IOstream::streamFormat format = IOstream::BINARY;
+    // IOstream::streamFormat format = IOstream::ASCII;

    const label size = 20000000;

@ -85,7 +85,11 @@ int main(int argc, char *argv[])
            << runTime.cpuTimeIncrement() << " s" << nl << endl;


-        faces2.writeObject(streamOpt, true);
+        faces2.writeObject
+        (
+            IOstreamOption(format),
+            true
+        );

        Info<< "Written old format faceList in = "
            << runTime.cpuTimeIncrement() << " s" << nl << endl;
@ -141,7 +145,11 @@ int main(int argc, char *argv[])
            << runTime.cpuTimeIncrement() << " s" << nl << endl;


-        faces2.writeObject(streamOpt, true);
+        faces2.writeObject
+        (
+            IOstreamOption(format),
+            true
+        );

        Info<< "Written new format faceList in = "
            << runTime.cpuTimeIncrement() << " s" << nl << endl;
--- a/applications/test/DynamicList2/Test-DynamicList2.C
+++ b/applications/test/DynamicList2/Test-DynamicList2.C
@ -5,7 +5,7 @@
    \\  /    A nd           | www.openfoam.com
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2021-2022 OpenCFD Ltd.
+    Copyright (C) 2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -104,7 +104,7 @@ void readList
 {
    OTstream os;
    os << input;
-    ITstream is(os.tokens());
+    ITstream is("input", os.tokens());

    is >> output;
 }
@ -118,7 +118,7 @@ void readList
 {
    OTstream os;
    os << input;
-    ITstream is(os.tokens());
+    ITstream is("input", os.tokens());

    is >> output;
 }
--- a/applications/test/FieldFields1/Make/files
+++ b/applications/test/FieldFields1/Make/files
@ -1,3 +0,0 @@
-Test-FieldFields1.C
-
-EXE = $(FOAM_USER_APPBIN)/Test-FieldFields1
--- a/applications/test/FieldFields1/Test-FieldFields1.C
+++ b/applications/test/FieldFields1/Test-FieldFields1.C
@ -1,117 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
-------------------------------------------------------------------------------
-    Copyright (C) 2022 OpenCFD Ltd.
-------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Application
-    Test-FieldFields1
-
-\*---------------------------------------------------------------------------*/
-
-#include "symmTensorField.H"
-#include "tensorField.H"
-#include "FieldFields.H"
-#include "Random.H"
-
-using namespace Foam;
-
-
-template<class Cmpt>
-void printFieldField(const FieldField<Field, Cmpt>& ff)
-{
-    forAll(ff, i)
-    {
-        Info<< i << ": " << flatOutput(ff[i]) << nl;
-    }
-    Info<< nl;
-}
-
-
-template<class Type>
-tmp<Field<Type>> randomField(Random& rnd, label dim)
-{
-    auto tfld = tmp<Field<Type>>::New(dim);
-    auto& fld = tfld.ref();
-
-    for (Type& val : fld)
-    {
-        for (direction cmpt=0; cmpt < pTraits<Type>::nComponents; ++cmpt)
-        {
-            setComponent(val, cmpt) = rnd.position<label>(0, 100);
-        }
-    }
-
-    return tfld;
-}
-
-
-template<class Type>
-tmp<Field<Type>> randomField(label dim)
-{
-    Random rnd;
-    return randomField<Type>(rnd, dim);
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-int main(int argc, char *argv[])
-{
-    // scalarField
-    {
-        Info<< nl << "scalarFieldField" << nl;
-
-        Random rnd;
-
-        FieldField<Field, scalar> sff1(6);
-        forAll(sff1, i)
-        {
-            sff1.set(i, randomField<scalar>(rnd, 8));
-        }
-
-        printFieldField(sff1);
-
-        Info<< nl << "indexing:" << nl;
-
-        {
-            labelPair index;
-            const label range1 = sff1.size()-1;
-            const label range2 = sff1[0].size()-1;
-
-            for (label iter = 0; iter < 10; ++iter)
-            {
-                index.first() = rnd.position<label>(0, range1);
-                index.second() = rnd.position<label>(0, range2);
-
-                Info<< index << " => " << sff1[index] << nl;
-            }
-        }
-    }
-
-    Info<< nl << "End\n" << nl;
-
-    return 0;
-}
-
-
-// ************************************************************************* //
--- a/applications/test/FieldFields2/Make/files
+++ b/applications/test/FieldFields2/Make/files
@ -1,3 +0,0 @@
-Test-FieldFields2.C
-
-EXE = $(FOAM_USER_APPBIN)/Test-FieldFields2
--- a/applications/test/FieldFields2/Make/options
+++ b/applications/test/FieldFields2/Make/options
@ -1,2 +0,0 @@
-/* EXE_INC = */
-/* EXE_LIBS = */
--- a/applications/test/HashPtrTable/Test-HashPtrTable.C
+++ b/applications/test/HashPtrTable/Test-HashPtrTable.C
@ -6,7 +6,7 @@
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
    Copyright (C) 2011 OpenFOAM Foundation
-    Copyright (C) 2017-2022 OpenCFD Ltd.
+    Copyright (C) 2017-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -31,10 +31,7 @@ Description
 #include <memory>
 #include <iostream>
 #include "autoPtr.H"
-#include "refPtr.H"
-#include "tmp.H"
-#include "PtrMap.H"
-#include "primitiveFields.H"
+#include "HashPtrTable.H"

 using namespace Foam;

@ -253,42 +250,6 @@ int main()
        Info<< "Table: " << tbl << nl;
    }

-    {
-        PtrMap<scalarField> fields;
-
-        {
-            const label patchi = 2;
-
-            scalarField fld1(patchi, 5.0);
-            scalarField fld2(patchi, 8.0);
-
-            // assign from tmp<>
-            fields.set( patchi, (fld1 * fld2));
-        }
-
-        {
-            const label patchi = 3;
-
-            scalarField fld1(patchi, 6.0);
-
-            // From tmp (clone)
-            fields.set(patchi, tmp<scalarField>(fld1));
-        }
-
-        {
-            const label patchi = 4;
-
-            // From refPtr
-            fields.set(patchi, refPtr<scalarField>::New(patchi, 10.0));
-        }
-
-        Info<< nl
-            << "PtrMap:" << nl
-            << fields << endl;
-    }
-
-    Info<< "\nEnd" << nl;
-
    return 0;
 }

--- a/applications/test/Hashing1/Make/options
+++ b/applications/test/Hashing1/Make/options
@ -1,3 +1,3 @@
-EXE_INC = $(c++LESSWARN)
+EXE_INC = ${c++LESSWARN}

 /* EXE_LIBS = */
--- a/applications/test/Hashing2/Make/options
+++ b/applications/test/Hashing2/Make/options
@ -1,3 +1,3 @@
-EXE_INC = $(c++LESSWARN)
+EXE_INC = ${c++LESSWARN}

 /* EXE_LIBS = */
--- a/applications/test/HashingSpeed/Make/options
+++ b/applications/test/HashingSpeed/Make/options
@ -1,3 +1,3 @@
-EXE_INC = $(c++LESSWARN)
+EXE_INC = ${c++LESSWARN}

 /* EXE_LIBS = */
--- a/applications/test/IndirectList/Test-IndirectList.C
+++ b/applications/test/IndirectList/Test-IndirectList.C
@ -146,7 +146,7 @@ int main(int argc, char *argv[])
    {
        Info<<"Writing output to " << binaryOutput << endl;

-        OFstream os(binaryOutput, IOstreamOption::BINARY);
+        OFstream os(binaryOutput, IOstream::BINARY);

        os.writeEntry("idl1", idl1);
        os.writeEntry("idl2", idl2);
--- a/applications/test/Polynomial/Test-Polynomial.C
+++ b/applications/test/Polynomial/Test-Polynomial.C
@ -6,7 +6,7 @@
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
    Copyright (C) 2011 OpenFOAM Foundation
-    Copyright (C) 2020-2022 OpenCFD Ltd.
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -132,7 +132,7 @@ int main(int argc, char *argv[])
        OTstream os;
        os << poly;

-        ITstream is(std::move(os.tokens()));
+        ITstream is("input", std::move(os.tokens()));
        is >> polyfunc;
    }

--- a/applications/test/TestTools/TestTools.H
+++ b/applications/test/TestTools/TestTools.H
@ -28,14 +28,15 @@ Description

 \*---------------------------------------------------------------------------*/

-#include "scalar.H"
+using namespace Foam;
+
+#include "floatScalar.H"
+#include "doubleScalar.H"
 #include "complex.H"
 #include "Matrix.H"
 #include "Random.H"
 #include <chrono>

-using namespace Foam;
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

 // Total number of unit tests
--- a/applications/test/autoPtr/Test-autoPtr.C
+++ b/applications/test/autoPtr/Test-autoPtr.C
@ -5,7 +5,7 @@
    \\  /    A nd           | www.openfoam.com
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -27,6 +27,7 @@ License

 // #define Foam_autoPtr_deprecate_setMethod

+#include <memory>
 #include "autoPtr.H"
 #include "labelList.H"
 #include "ListOps.H"
@ -76,14 +77,6 @@ autoPtr<T> testNullReturn2()
 }


-template<class T>
-struct DerivedList : public List<T>
-{
-    // Inherit constructors
-    using List<T>::List;
-};
-
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 //  Main program:

@ -261,16 +254,6 @@ int main(int argc, char *argv[])
        // autoPtr<labelList> ptr2 = testNullReturn2<labelList>();
    }

-    {
-        auto input1 = autoPtr<DerivedList<label>>::New(label(10), 1);
-        auto input2 = autoPtr<DerivedList<scalar>>::New(label(10), 1.0);
-
-        autoPtr<labelList> ptr1(std::move(input1));
-
-        // Does not compile: ptr1 = std::move(input2);
-        // Does not compile: ptr1 = autoPtr<List<scalar>>::New(label(10), 2);
-    }
-

    return 0;
 }
--- a/applications/test/decomposedBlockData/Test-decomposedBlockData.C
+++ b/applications/test/decomposedBlockData/Test-decomposedBlockData.C
@ -78,8 +78,8 @@ int main(int argc, char *argv[])
    OFstream os
    (
        objPath,
-        IOstreamOption::BINARY,
-        IOstreamOption::currentVersion,
+        IOstream::BINARY,
+        IOstream::currentVersion,
        runTime.writeCompression()
    );
    if (!os.good())
--- a/applications/test/dimField/Test-dimField.C
+++ b/applications/test/dimField/Test-dimField.C
@ -42,7 +42,7 @@ namespace Foam
    // Something like an internal state field. Probably only dimensionless
    typedef DimensionedField<uint8_t, volMesh> dimUint8Field;

-    defineTemplateTypeNameAndDebug(dimUint8Field, 0);
+    defineTemplate2TypeNameAndDebug(dimUint8Field, 0);

 } // End namespace Foam
 #endif
--- a/applications/test/dynamicLibrary/Test-dynamicLibrary.C
+++ b/applications/test/dynamicLibrary/Test-dynamicLibrary.C
@ -5,7 +5,7 @@
    \\  /    A nd           | www.openfoam.com
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2020-2022 OpenCFD Ltd.
+    Copyright (C) 2020-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -46,8 +46,8 @@ int main(int argc, char *argv[])
    profiling::disable(); // No profiling output
    argList::noBanner();
    argList::noParallel();
-    argList::noFunctionObjects();
    argList::removeOption("case");
+    argList::removeOption("noFunctionObjects");
    argList::addBoolOption("no-close", "Skip dlclose");
    argList::addBoolOption("quiet", "Disable verbosity");

--- a/applications/test/edges/Test-edges.C
+++ b/applications/test/edges/Test-edges.C
@ -5,7 +5,7 @@
    \\  /    A nd           | www.openfoam.com
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2017-2022 OpenCFD Ltd.
+    Copyright (C) 2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -82,7 +82,8 @@ int main(int argc, char *argv[])

    Info<< nl << "hash-like functionality" << nl;

-    e4.clear();
+    // doesn't work e4 = -1;
+    e4.start() = e4.end() = -1;

    printInfo(e4);
    for (label i : {2, -1, 2, 1, 4, 1, 2, 3})
@ -92,24 +93,24 @@ int main(int argc, char *argv[])
        printInfo(e4);
    }

-    e4.clear();
+    e4.start() = e4.end() = -1;
    Info<< "insert from list\n";
    labelHashSet newIndices({2, -1, 2, 1, 4, 1, 2, 3});
    e4.insert(newIndices.toc());
    printInfo(e4);

-    e4.clear();
+    e4.start() = e4.end() = -1;
    Info<< "insert from list\n";
    e4.insert({0, 5, 2, -1, 2, 1, 4, 1, 2, 3});
    printInfo(e4);

    FixedList<label, 8> otherIndices{12, 2, -1, 1, 4, 1, 2, 3};
-    e4.clear();
+    e4.start() = e4.end() = -1;
    Info<< "insert from list: " << otherIndices << nl;
    e4.insert(otherIndices);
    printInfo(e4);

-    e4.a() = e4.b();
+    e4.start() = e4.end();
    Info<< "erase from list: " << otherIndices << nl;
    Info<< "removed " << e4.erase(otherIndices) << " values" << nl;
    printInfo(e4);
--- a/applications/test/faceHashing/Make/options
+++ b/applications/test/faceHashing/Make/options
@ -1,3 +1,3 @@
-EXE_INC = $(c++LESSWARN)
+EXE_INC = ${c++LESSWARN}

 /* EXE_LIBS = */
--- a/applications/test/fieldTypes/Make/options
+++ b/applications/test/fieldTypes/Make/options
@ -1,7 +1,7 @@
 EXE_INC = \
    -I$(LIB_SRC)/finiteArea/lnInclude \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude
+    -I${LIB_SRC}/finiteVolume/lnInclude \
+    -I${LIB_SRC}/meshTools/lnInclude \

 EXE_LIBS = \
    -lfiniteArea \
--- a/applications/test/foamToMetisGraph/foamToMetisGraph.C
+++ b/applications/test/foamToMetisGraph/foamToMetisGraph.C
@ -5,7 +5,7 @@
    \\  /    A nd           | www.openfoam.com
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2017-2022 OpenCFD Ltd.
+    Copyright (C) 2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -56,7 +56,7 @@ int main(int argc, char *argv[])
    // No. of Nodes = nCells
    // No. of Edges connecting Nodes = nInternalFaces

-    OFstream os(args.caseName() + ".graph", IOstreamOption::ASCII);
+    OFstream os(args.caseName() + ".graph", IOstream::ASCII);

    os  << "%% metis graph file, of an OpenFOAM mesh %%" << nl
        << "%% nCells=" << mesh.nCells()
--- a/applications/test/fvc2D/Test-fvc2D.C
+++ b/applications/test/fvc2D/Test-fvc2D.C
@ -39,7 +39,7 @@ namespace Foam
 {
    typedef GeometricField<vector2D, fvPatchField, volMesh> volVector2DField;

-    defineTemplateTypeNameAndDebug(volVector2DField::Internal, 0);
+    defineTemplate2TypeNameAndDebug(volVector2DField::Internal, 0);
    defineTemplateTypeNameAndDebug(volVector2DField, 0);

    typedef fvPatchField<vector2D> fvPatchVector2DField;
--- a/applications/test/instant/Test-instant.C
+++ b/applications/test/instant/Test-instant.C
@ -5,7 +5,7 @@
    \\  /    A nd           | www.openfoam.com
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -30,31 +30,11 @@ Description

 #include "argList.H"
 #include "instant.H"
-#include "Pair.H"
 #include "fileNameInstant.H"
 #include "DynamicList.H"

 using namespace Foam;

-template<class T>
-Ostream& printInstant(const UList<T>& times, const label i)
-{
-    if (i >= 0 && i < times.size())
-    {
-        Info<< " (" << times[i] << ")";
-    }
-    return Info;
-}
-
-template<class T>
-Ostream& printInstant(const UList<T>& times, const Pair<label>& range)
-{
-    printInstant(times, range.first());
-    printInstant(times, range.second());
-    return Info;
-}
-
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 // Main program:

@ -68,7 +48,6 @@ int main(int argc, char *argv[])
    times.append({300.456, "def"});
    times.append({454.456, "xyz"});
    times.append({10, "ten"});
-    times.append({15, "fifteen"});

    {
        word timeName("twenty");
@ -82,19 +61,6 @@ int main(int argc, char *argv[])
    sort(times);
    Info<< "Sorted:" << times << nl;

-    for (const scalar val : { -0.5, 5.0, 18.0, 25.0, 450.0, 480.0 })
-    {
-        label start = instant::findStart(times, val);
-        Pair<label> range = instant::findRange(times, val);
-
-        Info<< nl
-            << "time:" << val << nl;
-        Info<< "    start:" << start;
-        printInstant(times, start) << nl;
-
-        Info<< "    range:" << range;
-        printInstant(times, range) << nl;
-    }

    DynamicList<fileNameInstant> files;
    files.append(fileNameInstant{});
--- a/applications/test/limits/Test-limits.C
+++ b/applications/test/limits/Test-limits.C
@ -5,7 +5,7 @@
    \\  /    A nd           | www.openfoam.com
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -24,11 +24,10 @@ License
    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.

 Description
-    Print some numerical limits.
+    Print max limits.

 \*---------------------------------------------------------------------------*/

-#include <cmath>
 #include <limits>
 #include "int.H"
 #include "uint.H"
@ -38,63 +37,21 @@ Description

 using namespace Foam;

-std::ostream& print(const char* tag, float val)
-{
-    std::cout
-        << tag << val
-        << " 0x" << std::hex << *reinterpret_cast<const uint32_t*>(&val);
-    return std::cout;
-}
-
-
-std::ostream& print(const char* tag, double val)
-{
-    std::cout
-        << tag << val
-        << " 0x" << std::hex << *reinterpret_cast<const uint64_t*>(&val);
-    return std::cout;
-}
-
-
-// Have (float|double)Scalar(GREAT|SMALL|..)
-
-#define PrintFloatLimits(FloatType, NanFunction)                              \
-{                                                                             \
-    print("max:", std::numeric_limits<FloatType>::max());                     \
-    print(" VGREAT:", FloatType##ScalarVGREAT);                               \
-    print(" ROOTVGREAT:", FloatType##ScalarROOTVGREAT) << nl;                 \
-                                                                              \
-    print("min:", std::numeric_limits<FloatType>::min());                     \
-    print(" VSMALL:", FloatType##ScalarVSMALL);                               \
-    print(" ROOTVSMALL:", FloatType##ScalarROOTVSMALL) << nl;                 \
-                                                                              \
-    print("epsilon:", std::numeric_limits<FloatType>::epsilon());             \
-    print(" SMALL:", FloatType##ScalarSMALL);                                 \
-    print(" ROOTSMALL:", FloatType##ScalarROOTSMALL) << nl;                   \
-                                                                              \
-    print("1/epsilon:", 1/std::numeric_limits<FloatType>::epsilon());         \
-    print(" GREAT:", FloatType##ScalarGREAT);                                 \
-    print(" ROOTGREAT:", FloatType##ScalarROOTGREAT) << nl;                   \
-                                                                              \
-    print("nan:", std::NanFunction("nan")) << nl;                             \
-}
-
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 // Main program:

 int main(int argc, char *argv[])
 {
-    //NONE cout<<"int16:" << pTraits<int16_t>::max << nl;
-    cout<< "=max=" << nl;
-    cout<< "uint8:" << pTraits<uint8_t>::max << nl;
-    cout<< "int16:" << std::numeric_limits<int16_t>::max() << nl;
-    cout<< "int32:" << pTraits<int32_t>::max << nl;
-    cout<< "uint32:" << pTraits<uint32_t>::max << nl;
-    cout<< "int64:" << pTraits<int64_t>::max << nl;
-    cout<< "uint64:" << pTraits<uint64_t>::max << nl;
+    //NONE Info<<"int16:" << pTraits<int16_t>::max << nl;
+    Info<< "=max=" << nl;
+    Info<< "uint8:" << pTraits<uint8_t>::max << nl;
+    Info<< "int16:" << std::numeric_limits<int16_t>::max() << nl;
+    Info<< "int32:" << pTraits<int32_t>::max << nl;
+    Info<< "uint32:" << pTraits<uint32_t>::max << nl;
+    Info<< "int64:" << pTraits<int64_t>::max << nl;
+    Info<< "uint64:" << pTraits<uint64_t>::max << nl;

-    cout<< nl;
+    Info<< nl;

    cout<< "int16:" << std::numeric_limits<int16_t>::max() << nl;
    cout<< "int32:" << pTraits<int32_t>::max << nl;
@ -102,7 +59,7 @@ int main(int argc, char *argv[])
    cout<< "int64:" << pTraits<int64_t>::max << nl;
    cout<< "uint64:" << pTraits<uint64_t>::max << nl;

-    cout<< nl << "=digits=" << nl;
+    Info<< nl << "=digits=" << nl;

    cout<< "int16:" << std::numeric_limits<int16_t>::digits << nl;
    cout<< "int32:" << std::numeric_limits<int32_t>::digits << nl;
@ -113,15 +70,29 @@ int main(int argc, char *argv[])
    cout<< "double:" << std::numeric_limits<double>::digits << nl;
    cout<< "long double:" << std::numeric_limits<long double>::digits << nl;

-    // std::nanl (long double)
-    cout<< nl;
-    cout<< nl << "=float=" << nl;
-    PrintFloatLimits(float, nanf);
+    Info<< nl << "=float=" << nl;

-    cout<< nl << "=double=" << nl;
-    PrintFloatLimits(double, nan);
+    cout<< "max:" << std::numeric_limits<float>::max()
+        << " VGREAT:" << floatScalarVGREAT << nl;
+    cout<< "min:" << std::numeric_limits<float>::min()
+        << " VSMALL:" << floatScalarVSMALL << nl;
+    cout<< "epsilon:" << std::numeric_limits<float>::epsilon()
+        << " SMALL:" << floatScalarSMALL << nl;
+    cout<< "1/epsilon:" << 1.0f/std::numeric_limits<float>::epsilon()
+        << " GREAT:" << floatScalarGREAT << nl;

-    cout<< "---\nEnd\n" << std::endl;
+    Info<< nl << "=double=" << nl;
+
+    cout<< "max:" << std::numeric_limits<double>::max()
+        << " VGREAT:" << doubleScalarVGREAT << nl;
+    cout<< "min:" << std::numeric_limits<double>::min()
+        << " VSMALL:" << doubleScalarVSMALL << nl;
+    cout<< "epsilon:" << std::numeric_limits<double>::epsilon()
+        << " SMALL:" << doubleScalarSMALL << nl;
+    cout<< "1/epsilon:" << 1.0f/std::numeric_limits<double>::epsilon()
+        << " GREAT:" << doubleScalarGREAT << nl;
+
+    Info << "---\nEnd\n" << endl;

    return 0;
 }
--- a/applications/test/matrices/DiagonalMatrix/Test-DiagonalMatrix.C
+++ b/applications/test/matrices/DiagonalMatrix/Test-DiagonalMatrix.C
@ -38,7 +38,8 @@ Description

 #include "DiagonalMatrix.H"
 #include "RectangularMatrix.H"
-#include "scalar.H"
+#include "floatScalar.H"
+#include "doubleScalar.H"
 #include "complex.H"
 #include "TestTools.H"

--- a/applications/test/matrices/RectangularMatrix/Test-RectangularMatrix.C
+++ b/applications/test/matrices/RectangularMatrix/Test-RectangularMatrix.C
@ -44,7 +44,8 @@ Note

 #include "RectangularMatrix.H"
 #include "SquareMatrix.H"
-#include "scalar.H"
+#include "floatScalar.H"
+#include "doubleScalar.H"
 #include "complex.H"
 #include "IOmanip.H"
 #include "TestTools.H"
--- a/applications/test/matrices/SquareMatrix/Test-SquareMatrix.C
+++ b/applications/test/matrices/SquareMatrix/Test-SquareMatrix.C
@ -45,7 +45,8 @@ Note
 #include "scalarMatrices.H"
 #include "RectangularMatrix.H"
 #include "SquareMatrix.H"
-#include "scalar.H"
+#include "floatScalar.H"
+#include "doubleScalar.H"
 #include "complex.H"
 #include "IOmanip.H"
 #include "TestTools.H"
--- a/applications/test/matrices/SymmetricSquareMatrix/Test-SymmetricSquareMatrix.C
+++ b/applications/test/matrices/SymmetricSquareMatrix/Test-SymmetricSquareMatrix.C
@ -46,7 +46,8 @@ Note
 #include "RectangularMatrix.H"
 #include "SquareMatrix.H"
 #include "SymmetricSquareMatrix.H"
-#include "scalar.H"
+#include "floatScalar.H"
+#include "doubleScalar.H"
 #include "complex.H"
 #include "IOmanip.H"
 #include "Random.H"
--- a/applications/test/openmp/Make/options
+++ b/applications/test/openmp/Make/options
@ -1,4 +1,4 @@
-EXE_INC = $(COMP_OPENMP) /* -UUSE_OMP */
+EXE_INC = ${COMP_OPENMP} /* -UUSE_OMP */

 /* Mostly do not need to explicitly link openmp libraries */
-/* EXE_LIBS = $(LINK_OPENMP) */
+/* EXE_LIBS = ${LINK_OPENMP} */
--- a/applications/test/parallel-chunks/Test-parallel-chunks.C
+++ b/applications/test/parallel-chunks/Test-parallel-chunks.C
@ -55,7 +55,7 @@ void do_exchangeBuf
    const bool wait
 )
 {
-    const label startOfRequests = UPstream::nRequests();
+    const label startOfRequests = Pstream::nRequests();

    // Set up receives
    // ~~~~~~~~~~~~~~~
@ -132,7 +132,7 @@ void do_exchangeContainer
    const bool wait
 )
 {
-    const label startOfRequests = UPstream::nRequests();
+    const label startOfRequests = Pstream::nRequests();

    // Set up receives
    // ~~~~~~~~~~~~~~~
--- a/applications/test/primitives/Test-primitives.C
+++ b/applications/test/primitives/Test-primitives.C
@ -5,7 +5,7 @@
    \\  /    A nd           | www.openfoam.com
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2017-2022 OpenCFD Ltd.
+    Copyright (C) 2017-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -334,7 +334,7 @@ int main(int argc, char *argv[])

        DynamicList<char> buf;

-        OListStream os(std::move(buf), IOstreamOption::BINARY);
+        OListStream os(std::move(buf), IOstream::BINARY);
        os << srcList;

        os.swap(buf); // Recover buffer
@ -342,7 +342,7 @@ int main(int argc, char *argv[])
        // Read back
        List<scalar> dstList;

-        UIListStream is(buf, IOstreamOption::BINARY);
+        UIListStream is(buf, IOstream::BINARY);
        is.setScalarByteSize(sizeof(otherType));

        Info<< "Stream scalar-size ("
--- a/applications/test/refPtr/Test-refPtr.C
+++ b/applications/test/refPtr/Test-refPtr.C
@ -5,7 +5,7 @@
    \\  /    A nd           | www.openfoam.com
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2020-2022 OpenCFD Ltd.
+    Copyright (C) 2020-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
@ -19,9 +19,6 @@ Description
 \*---------------------------------------------------------------------------*/

 #include "primitiveFields.H"
-#include "autoPtr.H"
-#include "refPtr.H"
-#include "tmp.H"
 #include "Switch.H"

 using namespace Foam;
@ -32,36 +29,6 @@ struct myScalarField : public scalarField
 };


-template<class T>
-void constructInfo()
-{
-    Info<< " move-constructible:"
-        << std::is_move_constructible<T>::value
-        << " move-assignable:"
-        << std::is_move_assignable<T>::value
-        << " nothrow:"
-        << std::is_nothrow_move_assignable<T>::value
-        << " trivially:"
-        << std::is_trivially_move_assignable<T>::value
-        << nl;
-}
-
-
-template<class T>
-void printInfo(const autoPtr<T>& item, const bool verbose = false)
-{
-    Info<< "autoPtr good:" << Switch::name(item.good())
-        << " addr: " << Foam::name(item.get());
-
-    constructInfo<autoPtr<T>>();
-
-    if (verbose && item)
-    {
-        Info<< "content: " << item() << nl;
-    }
-}
-
-
 template<class T>
 void printInfo(const refPtr<T>& item, const bool verbose = false)
 {
@ -70,24 +37,15 @@ void printInfo(const refPtr<T>& item, const bool verbose = false)
        << " addr: " << Foam::name(item.get())
        << " movable:" << Switch(item.movable());

-    constructInfo<refPtr<T>>();
-
-    if (verbose && item)
-    {
-        Info<< "content: " << item() << nl;
-    }
-}
-
-
-template<class T>
-void printInfo(const tmp<T>& item, const bool verbose = false)
-{
-    Info<< "tmp good:" << Switch::name(item.good())
-        << " pointer:" << Switch::name(item.is_pointer())
-        << " addr: " << Foam::name(item.get())
-        << " movable:" << Switch(item.movable());
-
-    constructInfo<tmp<T>>();
+    Info<< " move-constructible:"
+        << std::is_move_constructible<refPtr<T>>::value
+        << " move-assignable:"
+        << std::is_move_assignable<refPtr<T>>::value
+        << " nothrow:"
+        << std::is_nothrow_move_assignable<refPtr<T>>::value
+        << " trivially:"
+        << std::is_trivially_move_assignable<refPtr<T>>::value
+        << nl;

    if (verbose && item)
    {
@ -143,62 +101,6 @@ int main()
        printInfo(tfld3, true);
    }

-    {
-        refPtr<scalarField> tfld1;
-        auto aptr = autoPtr<scalarField>::New(2, scalar(2));
-
-        tmp<scalarField> tfld2;
-        printInfo(tfld2, true);
-
-        tfld2 = new scalarField(10, Zero);
-
-    /*
-        tfld2 = aptr.get();
-
-        // tfld1.reset(aptr);
-        // tfld1 = std::move(aptr);
-        // tfld1 = aptr;
-
-        Info<< nl << "From autoPtr" << nl;
-        printInfo(aptr, true);
-        //& Info<< nl << "Construct from autoPtr" << nl;
-        //& // refPtr<scalarField> tfld2(autoPtr<scalarField>::New(10, scalar(2)));
-        //& printInfo(tfld2, true);
-*/
-    }
-
-    {
-        auto aptr1 = autoPtr<labelField>::New(2, Zero);
-        //auto aptr1 = autoPtr<scalarField>::New(2, scalar(2));
-        auto aptr2 = autoPtr<scalarField>::New(2, scalar(2));
-
-        refPtr<scalarField> tfld2(std::move(aptr2));
-
-        // aptr2 = std::move(aptr1);
-    }
-
-    {
-        auto tptr1 = tmp<labelField>::New(2, Zero);
-        auto aptr1 = autoPtr<labelField>::New(2, Zero);
-        auto tfld2 = refPtr<labelField>::New(2, Zero);
-
-        // Deleted: refPtr<labelField> tfld1(aptr1);
-        refPtr<labelField> tfld1;
-
-        // refPtr<labelField> tfld1(std::move(tptr1));
-        // refPtr<labelField> tfld1(tptr1);
-
-        tfld1 = std::move(aptr1);
-
-        // tfld1.reset(aptr1);
-        // tfld1.reset(tfld2);
-
-        // tfld1 = std::move(tptr1);
-        // Does not compile: tfld1.ref(tptr1);
-        // Deleted: tfld1.cref(tptr1);
-        // Deleted: tfld1.ref(aptr1);
-    }
-
    Info<< "\nEnd" << endl;

    return 0;
--- a/applications/test/scalarOps/Test-scalarOps.C
+++ b/applications/test/scalarOps/Test-scalarOps.C
@ -126,9 +126,6 @@ int main(int argc, char *argv[])
    testDivide<vector>(vectors);


-    //(void) compareOp<vector>()(vector::zero, vector::one);
-
-
    Info<< "\nEnd\n" << endl;

    return 0;
--- a/applications/test/tensorFieldFields1/Make/files
+++ b/applications/test/tensorFieldFields1/Make/files
@ -0,0 +1,3 @@
+Test-tensorFieldFields1.C
+
+EXE = $(FOAM_USER_APPBIN)/Test-tensorFieldFields1
--- a/applications/test/tensorFieldFields1/Make/options
+++ b/applications/test/tensorFieldFields1/Make/options
--- a/applications/test/tensorFieldFields1/Test-tensorFieldFields1.C
+++ b/applications/test/tensorFieldFields1/Test-tensorFieldFields1.C
@ -24,7 +24,7 @@ License
    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.

 Application
-    Test-FieldFields2
+    Test-tensorFieldFields1

 \*---------------------------------------------------------------------------*/

@ -73,29 +73,21 @@ void allocComponents
 }


-template<class Type>
-tmp<Field<Type>> randomField(Random& rnd, label dim)
+vectorField randomVectorField(label size)
 {
-    auto tfld = tmp<Field<Type>>::New(dim);
-    auto& fld = tfld.ref();
+    Random rnd;

-    for (Type& val : fld)
+    vectorField vf(size);
+
+    forAll(vf, i)
    {
-        for (direction cmpt=0; cmpt < pTraits<Type>::nComponents; ++cmpt)
+        for (direction cmpt=0; cmpt < vector::nComponents; ++cmpt)
        {
-            setComponent(val, cmpt) = rnd.position<label>(0, 100);
+            vf[i][cmpt] = rnd.position<label>(0, 100);
        }
    }

-    return tfld;
-}
-
-
-template<class Type>
-tmp<Field<Type>> randomField(label dim)
-{
-    Random rnd;
-    return randomField<Type>(rnd, dim);
+    return vf;
 }


@ -199,7 +191,7 @@ int main(int argc, char *argv[])
        printFieldField(sf1);

        Info<< nl;
-        for (direction cmpt = 0; cmpt < pTraits<vector>::nComponents; ++cmpt)
+        for (direction cmpt = 0; cmpt < vector::nComponents; ++cmpt)
        {
            unzipRow(sf1, cmpt, slice[0]);

@ -261,9 +253,8 @@ int main(int argc, char *argv[])
    {
        Info<< nl << "vectorField" << nl;

-        Random rnd;
        FieldField<Field, vector> vf1(1);
-        vf1.set(0, randomField<vector>(rnd, 4));
+        vf1.set(0, new vectorField(randomVectorField(4)));

        FixedList<FieldField<Field, scalar>, 3> cmpts;
        allocComponents(cmpts, 4);
--- a/applications/test/tensorFields1/Test-tensorFields1.C
+++ b/applications/test/tensorFields1/Test-tensorFields1.C
@ -34,29 +34,21 @@ Application

 using namespace Foam;

-template<class Type>
-tmp<Field<Type>> randomField(Random& rnd, label dim)
+vectorField randomVectorField(label size)
 {
-    auto tfld = tmp<Field<Type>>::New(dim);
-    auto& fld = tfld.ref();
+    Random rnd;

-    for (Type& val : fld)
+    vectorField vf(size);
+
+    forAll(vf, i)
    {
-        for (direction cmpt=0; cmpt < pTraits<Type>::nComponents; ++cmpt)
+        for (direction cmpt=0; cmpt < vector::nComponents; ++cmpt)
        {
-            setComponent(val, cmpt) = rnd.position<label>(0, 100);
+            vf[i][cmpt] = rnd.position<label>(0, 100);
        }
    }

-    return tfld;
-}
-
-
-template<class Type>
-tmp<Field<Type>> randomField(label dim)
-{
-    Random rnd;
-    return randomField<Type>(rnd, dim);
+    return vf;
 }


@ -259,7 +251,7 @@ int main(int argc, char *argv[])
    {
        Info<< nl << "vectorField" << nl;

-        vectorField vf1(randomField<vector>(4));
+        vectorField vf1(randomVectorField(4));
        FixedList<scalarField, 3> cmpts(scalarField(vf1.size()));

        Info<< nl
--- a/applications/test/timeSelector/Test-timeSelector.C
+++ b/applications/test/timeSelector/Test-timeSelector.C
@ -63,6 +63,7 @@ int main(int argc, char *argv[])
    argList::addNote("Test timeSelector and TimePaths");

    timeSelector::addOptions(true, true);
+    argList::noLibs();
    argList::noFunctionObjects();

    argList::addOption("relative", "PATH", "Test relativePath");
--- a/applications/test/tmp/Test-tmp.C
+++ b/applications/test/tmp/Test-tmp.C
@ -19,9 +19,6 @@ Description
 \*---------------------------------------------------------------------------*/

 #include "primitiveFields.H"
-#include "autoPtr.H"
-#include "refPtr.H"
-#include "tmp.H"
 #include "Switch.H"

 using namespace Foam;
@ -129,28 +126,6 @@ int main()
        printInfo(tfld2);
    }

-    {
-        auto tptr1 = refPtr<labelField>::New(2, Zero);
-        auto aptr1 = autoPtr<labelField>::New(2, Zero);
-
-        // Deleted: tmp<labelField> tfld1(aptr1);
-        // tmp<labelField> tfld1(std::move(aptr1));
-        // tmp<labelField> tfld1(std::move(tptr1));
-        tmp<labelField> tfld1;
-        //tfld1.cref(tptr1);
-        //tfld1.cref(aptr1);
-
-        // refPtr<labelField> tfld1(std::move(tptr1));
-        // refPtr<labelField> tfld1(tptr1);
-
-        // tfld1 = std::move(aptr1);
-
-        // tfld1 = std::move(tptr1);
-        // Does not compile: tfld1.ref(tptr1);
-        // Deleted: tfld1.cref(tptr1);
-        // Deleted: tfld1.ref(aptr1);
-    }
-
    Info<< "\nEnd" << endl;

    return 0;
--- a/applications/test/volField/Test-volField.C
+++ b/applications/test/volField/Test-volField.C
@ -42,7 +42,7 @@ namespace Foam
    // - still needs some basic boundary conditions!!
    typedef GeometricField<uint8_t, fvPatchField, volMesh> volUint8Field;

-    defineTemplateTypeNameAndDebug(volUint8Field, 0);
+    defineTemplate2TypeNameAndDebug(volUint8Field, 0);

 } // End namespace Foam
 #endif
--- a/applications/utilities/finiteArea/checkFaMesh/printMeshSummary.H
+++ b/applications/utilities/finiteArea/checkFaMesh/printMeshSummary.H
@ -116,16 +116,12 @@ Description
    {
        const faPatch& p = patches[patchi];

-        // Report physical size (nEdges) not virtual size
-        Info<< "  " << "patch " << p.index()
-            << " (size: " << returnReduce(p.nEdges(), sumOp<label>())
-            << ") name: " << p.name()
-            << nl;
+         Info<< "  " << "patch " << p.index()
+             << " (size: " << returnReduce(p.size(), sumOp<label>())
+             << ") name: " << p.name()
+             << nl;
    }

-    Info<< "----------------" << nl
-        << "Used polyPatches: " << flatOutput(aMesh.whichPolyPatches()) << nl;
-

    // Geometry information
    Info<< nl;
--- a/applications/utilities/finiteArea/makeFaMesh/printMeshSummary.H
+++ b/applications/utilities/finiteArea/makeFaMesh/printMeshSummary.H
@ -5,7 +5,7 @@
    \\  /    A nd           | www.openfoam.com
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2021-2022 OpenCFD Ltd.
+    Copyright (C) 2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
@ -36,17 +36,12 @@ Description
    {
        const faPatch& p = patches[patchi];

-        // Report physical size (nEdges) not virtual size
-        Info<< "  " << "patch " << p.index()
-            << " (size: " << returnReduce(p.nEdges(), sumOp<label>())
-            << ") name: " << p.name()
-            << nl;
+         Info<< "  " << "patch " << p.index()
+             << " (size: " << returnReduce(p.size(), sumOp<label>())
+             << ") name: " << p.name()
+             << nl;
    }

-    Info<< "----------------" << nl
-        << "Used polyPatches: " << flatOutput(aMesh.whichPolyPatches()) << nl;
-
-
    // Geometry information
    Info<< nl;
    {
--- a/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C
+++ b/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C
@ -226,18 +226,14 @@ int main(int argc, char *argv[])
    // Add the boundary patches
    const polyBoundaryMesh& patches = mesh.boundaryMesh();

-    polyPatchList newPatches(patches.size());
+    List<polyPatch*> p(patches.size());

-    forAll(newPatches, patchi)
+    forAll(p, patchi)
    {
-        newPatches.set
-        (
-            patchi,
-            patches[patchi].clone(fMesh.boundaryMesh())
-        );
+        p[patchi] = patches[patchi].clone(fMesh.boundaryMesh()).ptr();
    }

-    fMesh.addFvPatches(newPatches);
+    fMesh.addFvPatches(p);


    // Refinement level
--- a/applications/utilities/mesh/advanced/snappyRefineMesh/snappyRefineMesh.C
+++ b/applications/utilities/mesh/advanced/snappyRefineMesh/snappyRefineMesh.C
@ -6,7 +6,7 @@
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
    Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2019 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -205,43 +205,34 @@ label addPatch(polyMesh& mesh, const word& patchName)
    {
        const polyBoundaryMesh& patches = mesh.boundaryMesh();

-        polyPatchList newPatches(patches.size() + 1);
-
-        label nPatches = 0;
+        List<polyPatch*> newPatches(patches.size() + 1);

        // Add empty patch as 0th entry (Note: only since subsetMesh wants this)
        patchi = 0;
-        {
-            newPatches.set
-            (
-                nPatches,
-                new emptyPolyPatch
-                (
-                    patchName,
-                    0,
-                    mesh.nInternalFaces(),
-                    nPatches,
-                    patches,
-                    emptyPolyPatch::typeName
-                )
-            );
-            ++nPatches;
-        }

-        for (const polyPatch& pp : patches)
-        {
-            newPatches.set
+        newPatches[patchi] =
+            new emptyPolyPatch
            (
-                nPatches,
+                Foam::word(patchName),
+                0,
+                mesh.nInternalFaces(),
+                patchi,
+                patches,
+                emptyPolyPatch::typeName
+            );
+
+        forAll(patches, i)
+        {
+            const polyPatch& pp = patches[i];
+
+            newPatches[i+1] =
                pp.clone
                (
                    patches,
-                    nPatches,
+                    i+1,
                    pp.size(),
                    pp.start()
-                )
-            );
-            ++nPatches;
+                ).ptr();
        }

        mesh.removeBoundary();
--- a/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C
+++ b/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C
@ -1678,7 +1678,7 @@ int main(int argc, char *argv[])
    label defaultPatchID = mesh.boundaryMesh().findPatchID(defaultFacesName);
    if (mesh.boundaryMesh()[defaultPatchID].size() == 0)
    {
-        polyPatchList newPatches((mesh.boundaryMesh().size() - 1));
+        List<polyPatch*> newPatchPtrList((mesh.boundaryMesh().size() - 1));
        label newPatchi = 0;
        forAll(mesh.boundaryMesh(), patchi)
        {
@ -1686,21 +1686,18 @@ int main(int argc, char *argv[])
            {
                const polyPatch& patch = mesh.boundaryMesh()[patchi];

-                newPatches.set
+                newPatchPtrList[newPatchi] = patch.clone
                (
+                    mesh.boundaryMesh(),
                    newPatchi,
-                    patch.clone
-                    (
-                        mesh.boundaryMesh(),
-                        newPatchi,
-                        patch.size(),
-                        patch.start()
-                    )
-                );
-                ++newPatchi;
+                    patch.size(),
+                    patch.start()
+                ).ptr();
+
+                newPatchi++;
            }
        }
-        repatcher.changePatches(newPatches);
+        repatcher.changePatches(newPatchPtrList);
    }

    // Set the precision of the points data to 10
--- a/applications/utilities/mesh/generation/blockMesh/mergePatchPairs.H
+++ b/applications/utilities/mesh/generation/blockMesh/mergePatchPairs.H
@ -1,56 +1,30 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
-------------------------------------------------------------------------------
-    Copyright (C) 2009 OpenFOAM Foundation
-    Copyright (C) 2017-2022 OpenCFD Ltd.
-------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
-
-Description
-    Handle merging of patch pairs
-
-\*---------------------------------------------------------------------------*/
-
+// Handle merging of patch pairs
 {
    wordPairList mergePatchPairs;

-    // Read in a list of merge patch pairs
+    // Read in a list of dictionaries for the merge patch pairs
    if
    (
        meshDict.readIfPresent("mergePatchPairs", mergePatchPairs)
     && mergePatchPairs.size()
    )
    {
-        Info<< "Merging " << mergePatchPairs.size() << " patch pairs" << nl;
+        Info<< "Creating merge patch pairs" << nl << endl;

-        // Cleanup
-        wordHashSet cleanupPatches(4*mergePatchPairs.size());
-        wordHashSet cleanupPointZones(2*mergePatchPairs.size());
-        wordHashSet cleanupFaceZones(2*mergePatchPairs.size());
-
-        Info<< "    Adding point and face zones" << endl;
+        Info<< "Adding point and face zones" << endl;
        {
-            const auto& pbm = mesh.boundaryMesh();
-
-            auto& pzs = mesh.pointZones(); pzs.clearAddressing();
-            auto& fzs = mesh.faceZones();  fzs.clearAddressing();
+            auto& pzs = mesh.pointZones();
+            pzs.clearAddressing();
+            auto& fzs = mesh.faceZones();
+            fzs.clearAddressing();

            forAll(mergePatchPairs, pairi)
            {
-                // Patch pairs
-                const polyPatch& patch0 = pbm[mergePatchPairs[pairi].first()];
-                const polyPatch& patch1 = pbm[mergePatchPairs[pairi].second()];
-
                const word mergeName
                (
                    mergePatchPairs[pairi].first()
                  + mergePatchPairs[pairi].second()
-                  + Foam::name(pairi)
+                  + name(pairi)
                );

                // An empty zone for cut points
@ -63,35 +37,40 @@ Description
                        pzs
                    )
                );
-                cleanupPointZones.insert(pzs.last().name());

-                // Coupling side 0 (master)
+                // Master patch
+                const word masterPatchName(mergePatchPairs[pairi].first());
+                const polyPatch& masterPatch =
+                    mesh.boundaryMesh()[masterPatchName];
+
                fzs.append
                (
                    new faceZone
                    (
-                        mergeName + "Side0Zone",
-                        identity(patch0.range()),
+                        mergeName + "MasterZone",
+                        identity(masterPatch.range()),
                        false, // none are flipped
                        fzs.size(),
                        fzs
                    )
                );
-                cleanupFaceZones.insert(fzs.last().name());

-                // Coupling side 1 (slave)
+                // Slave patch
+                const word slavePatchName(mergePatchPairs[pairi].second());
+                const polyPatch& slavePatch =
+                    mesh.boundaryMesh()[slavePatchName];
+
                fzs.append
                (
                    new faceZone
                    (
-                        mergeName + "Side1Zone",
-                        identity(patch1.range()),
+                        mergeName + "SlaveZone",
+                        identity(slavePatch.range()),
                        false, // none are flipped
                        fzs.size(),
                        fzs
                    )
                );
-                cleanupFaceZones.insert(fzs.last().name());

                // An empty zone for cut faces
                fzs.append
@ -103,38 +82,35 @@ Description
                        fzs
                    )
                );
-                cleanupFaceZones.insert(fzs.last().name());
-            }
+            }  // end of all merge pairs
        }


-        Info<< "    Merging with attachPolyTopoChanger" << endl;
+
+        Info<< "Creating attachPolyTopoChanger" << endl;
        attachPolyTopoChanger polyMeshAttacher(mesh);
-        polyMeshAttacher.resize(1);
+        polyMeshAttacher.setSize(mergePatchPairs.size());

        forAll(mergePatchPairs, pairi)
        {
-            cleanupPatches.insert(mergePatchPairs[pairi].first());
-            cleanupPatches.insert(mergePatchPairs[pairi].second());
-
            const word mergeName
            (
                mergePatchPairs[pairi].first()
              + mergePatchPairs[pairi].second()
-              + Foam::name(pairi)
+              + name(pairi)
            );

            // Add the sliding interface mesh modifier
            polyMeshAttacher.set
            (
-                0,
+                pairi,
                new slidingInterface
                (
-                    "couple" + Foam::name(pairi),
+                    "couple" + name(pairi),
                    pairi,
                    polyMeshAttacher,
-                    mergeName + "Side0Zone",
-                    mergeName + "Side1Zone",
+                    mergeName + "MasterZone",
+                    mergeName + "SlaveZone",
                    mergeName + "CutPointZone",
                    mergeName + "CutFaceZone",
                    mergePatchPairs[pairi].first(),
@ -144,135 +120,12 @@ Description
                    intersection::VISIBLE
                )
            );
-
-            polyMeshAttacher.attach(false);  // Do not yet remove empty patches
        }

-        // Re-do the boundary patches, removing empty merge patches
-        // but keeping any other empty patches
-        {
-            const polyBoundaryMesh& oldPatches = mesh.boundaryMesh();
-
-            polyPatchList newPatches(oldPatches.size());
-            label nNewPatches = 0;
-
-            wordHashSet removedPatches(cleanupPatches.capacity());
-
-            forAll(oldPatches, patchi)
-            {
-                const word& patchName = oldPatches[patchi].name();
-
-                if
-                (
-                    !cleanupPatches.found(patchName)
-                 || returnReduceOr(oldPatches[patchi].size())
-                )
-                {
-                    newPatches.set
-                    (
-                        nNewPatches,
-                        oldPatches[patchi].clone
-                        (
-                            mesh.boundaryMesh(),
-                            nNewPatches,
-                            oldPatches[patchi].size(),
-                            oldPatches[patchi].start()
-                        )
-                    );
-
-                    ++nNewPatches;
-                }
-                else
-                {
-                    removedPatches.insert(patchName);
-                }
-            }
-
-            newPatches.resize(nNewPatches);
-
-            mesh.removeBoundary();
-            mesh.addPatches(newPatches);
-
-            Info<< "Removed " << removedPatches.size()
-                << " empty merged patches:" << nl
-                << "    " << flatOutput(removedPatches.sortedToc()) << endl;
-        }
-
-        // Cleanup empty merged point zones
-        {
-            PtrList<pointZone>& zones = mesh.pointZones();
-            mesh.pointZones().clearAddressing();
-
-            wordHashSet removedZones(2*zones.size());
-
-            label nZones = 0;
-            forAll(zones, zonei)
-            {
-                if
-                (
-                    !cleanupPointZones.found(zones[zonei].name())
-                 || returnReduceOr(zones[zonei].size())
-                )
-                {
-                    zones.set(nZones, zones.release(zonei));
-                    zones[nZones].index() = nZones;  // re-index
-                    ++nZones;
-                }
-                else
-                {
-                    removedZones.insert(zones[zonei].name());
-                }
-            }
-            zones.resize(nZones);
-
-            if (removedZones.size())
-            {
-                Info<< "Removed " << removedZones.size()
-                    << " empty point zones:" << nl
-                    << "    " << flatOutput(removedZones.sortedToc()) << endl;
-            }
-        }
-
-        // Cleanup empty merged face zones
-        {
-            PtrList<faceZone>& zones = mesh.faceZones();
-            mesh.faceZones().clearAddressing();
-
-            wordHashSet removedZones(2*zones.size());
-
-            label nZones = 0;
-            forAll(zones, zonei)
-            {
-                if
-                (
-                    !cleanupFaceZones.found(zones[zonei].name())
-                 || returnReduceOr(zones[zonei].size())
-                )
-                {
-                    zones.set(nZones, zones.release(zonei));
-                    zones[nZones].index() = nZones;  // re-index
-                    ++nZones;
-                }
-                else
-                {
-                    removedZones.insert(zones[zonei].name());
-                }
-            }
-            zones.resize(nZones);
-
-            if (removedZones.size())
-            {
-                Info<< "Removed " << removedZones.size()
-                    << " empty merged face zones:" << nl
-                    << "    " << flatOutput(removedZones.sortedToc()) << endl;
-            }
-        }
+        polyMeshAttacher.attach(true);
    }
    else
    {
-        Info<< "No patch pairs to merge" << endl;
+        Info<< nl << "There are no merge patch pairs" << endl;
    }
 }
-
-
-// ************************************************************************* //
--- a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
+++ b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
@ -1397,20 +1397,26 @@ void extrudeGeometricProperties
        {
            Pout<< "Model     :" << faceCentres[facei] << endl
                << "regionMesh:" << regionMesh.faceCentres()[facei] << endl;
-            faceStr.writeLine
+            faceStr.write
            (
-                faceCentres[facei],
-                regionMesh.faceCentres()[facei]
+                linePointRef
+                (
+                    faceCentres[facei],
+                    regionMesh.faceCentres()[facei]
+                )
            );
        }
        forAll(cellCentres, celli)
        {
            Pout<< "Model     :" << cellCentres[celli] << endl
                << "regionMesh:" << regionMesh.cellCentres()[celli] << endl;
-            cellStr.writeLine
+            cellStr.write
            (
-                cellCentres[celli],
-                regionMesh.cellCentres()[celli]
+                linePointRef
+                (
+                    cellCentres[celli],
+                    regionMesh.cellCentres()[celli]
+                )
            );
        }
    }
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/PrintTable/PrintTable.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/PrintTable/PrintTable.C
@ -152,7 +152,7 @@ void Foam::PrintTable<KeyType, DataType>::print

        os  << endl;

-        const List<KeyType> sortedTable(combinedTable.sortedToc());
+        const List<KeyType>& sortedTable = combinedTable.sortedToc();

        forAll(sortedTable, keyI)
        {
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
@ -1687,7 +1687,7 @@ void Foam::conformalVoronoiMesh::move()
                    )
                )
                {
-                    multipleIntersections.writeLine(ptA, ptB);
+                    multipleIntersections.write(linePointRef(ptA, ptB));
                }
            }
        }
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
@ -83,7 +83,7 @@ SourceFiles
 namespace Foam
 {

-// Forward Declarations
+// Forward declaration of classes
 class initialPointsMethod;
 class relaxationModel;
 class faceAreaWeightModel;
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
@ -1433,15 +1433,18 @@ void Foam::conformalVoronoiMesh::indexDualVertices
 //                         && (mag(snapDir & norm[0]) > 0.5)
 //                        )
 //                        {
-//                            snapping1.writeLine
+//                            snapping1.write
 //                            (
-//                                dual,
-//                                nearestPointOnTet
+//                                linePointRef(dual, nearestPointOnTet)
 //                            );
-//                            snapping2.writeLine
+//
+//                            snapping2.write
 //                            (
-//                                nearestPointOnTet,
-//                                hitInfo.hitPoint()
+//                                linePointRef
+//                                (
+//                                    nearestPointOnTet,
+//                                    hitInfo.hitPoint()
+//                                )
 //                            );
 //
 //                            pts[cit->cellIndex()] = hitInfo.hitPoint();
@ -1761,10 +1764,9 @@ void Foam::conformalVoronoiMesh::createFacesOwnerNeighbourAndPatches

                    if ((*vcit)->real())
                    {
-                        featurePointDualsStr.writeLine
+                        featurePointDualsStr.write
                        (
-                            topoint(vit->point()),
-                            (*vcit)->dual()
+                            linePointRef(topoint(vit->point()), (*vcit)->dual())
                        );
                    }
                }
@ -1865,7 +1867,7 @@ void Foam::conformalVoronoiMesh::createFacesOwnerNeighbourAndPatches
                        << " " << vc2->dual()
                        << endl;

-                    startCellStr.writeLine(vc1->dual(), vc2->dual());
+                    startCellStr.write(linePointRef(vc1->dual(), vc2->dual()));

                    // Get patch by getting face between cells and the two
                    // points on the face that are not the feature vertex
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
@ -1395,7 +1395,10 @@ void Foam::conformalVoronoiMesh::writePointPairs

        if (ptPairs_.isPointPair(vA, vB))
        {
-            os.writeLine(topoint(vA->point()), topoint(vB->point()));
+            os.write
+            (
+                linePointRef(topoint(vA->point()), topoint(vB->point()))
+            );
        }
    }
 }
--- a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C
@ -6,7 +6,7 @@
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
    Copyright (C) 2012-2016 OpenFOAM Foundation
-    Copyright (C) 2016-2022 OpenCFD Ltd.
+    Copyright (C) 2016-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -73,7 +73,7 @@ scalar getMergeDistance
    Info<< "Merge tolerance : " << mergeTol << nl
        << "Write tolerance : " << writeTol << endl;

-    if (runTime.writeFormat() == IOstreamOption::ASCII && mergeTol < writeTol)
+    if (runTime.writeFormat() == IOstream::ASCII && mergeTol < writeTol)
    {
        FatalErrorInFunction
            << "Your current settings specify ASCII writing with "
--- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/foamyQuadMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/foamyQuadMesh.C
@ -6,7 +6,7 @@
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
    Copyright (C) 2013-2016 OpenFOAM Foundation
-    Copyright (C) 2021-2022 OpenCFD Ltd.
+    Copyright (C) 2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -167,32 +167,28 @@ int main(int argc, char *argv[])
    );

    Info<< "Constructing patches." << endl;
-    polyPatchList newPatches(poly2DMesh.patchNames().size());
-    label nPatches = 0;
+    List<polyPatch*> patches(poly2DMesh.patchNames().size());
+    label countPatches = 0;

-    forAll(newPatches, patchi)
+    forAll(patches, patchi)
    {
        if (poly2DMesh.patchSizes()[patchi] != 0)
        {
-            newPatches.set
+            patches[countPatches] = new polyPatch
            (
-                nPatches,
-                new polyPatch
-                (
-                    poly2DMesh.patchNames()[patchi],
-                    poly2DMesh.patchSizes()[patchi],
-                    poly2DMesh.patchStarts()[patchi],
-                    nPatches,
-                    pMesh.boundaryMesh(),
-                    word::null
-                )
+                poly2DMesh.patchNames()[patchi],
+                poly2DMesh.patchSizes()[patchi],
+                poly2DMesh.patchStarts()[patchi],
+                countPatches,
+                pMesh.boundaryMesh(),
+                word::null
            );

-            ++nPatches;
+            countPatches++;
        }
    }
-    newPatches.resize(nPatches);
-    pMesh.addPatches(newPatches);
+    patches.setSize(countPatches);
+    pMesh.addPatches(patches);

    if (extrude)
    {
--- a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
+++ b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
@ -616,7 +616,7 @@ scalar getMergeDistance
        << endl;

    // check writing tolerance
-    if (mesh.time().writeFormat() == IOstreamOption::ASCII && !dryRun)
+    if (mesh.time().writeFormat() == IOstream::ASCII && !dryRun)
    {
        const scalar writeTol = std::pow
        (
@ -1342,17 +1342,6 @@ int main(int argc, char *argv[])
    const snapParameters snapParams(snapDict, dryRun);


-    Info<< "Setting refinement level of surface to be consistent"
-        << " with curvature." << endl;
-    surfaces.setCurvatureMinLevelFields
-    (
-        refineParams.curvature(),
-        meshRefiner.meshCutter().level0EdgeLength()
-    );
-    Info<< "Checked curvature refinement in = "
-        << mesh.time().cpuTimeIncrement() << " s" << nl << endl;
-
-

    // Add all the cellZones and faceZones
    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--- a/applications/utilities/mesh/manipulation/autoPatch/autoPatch.C
+++ b/applications/utilities/mesh/manipulation/autoPatch/autoPatch.C
@ -191,7 +191,7 @@ int main(int argc, char *argv[])
    const PtrList<boundaryPatch>& patches = bMesh.patches();

    // Create new list of patches with old ones first
-    polyPatchList newPatches(patches.size());
+    List<polyPatch*> newPatchPtrList(patches.size());

    newPatchi = 0;

@ -200,41 +200,34 @@ int main(int argc, char *argv[])
    {
        const polyPatch& patch = mesh.boundaryMesh()[patchi];

-        newPatches.set
-        (
-            newPatchi,
+        newPatchPtrList[newPatchi] =
            patch.clone
            (
                mesh.boundaryMesh(),
                newPatchi,
                patch.size(),
                patch.start()
-            )
-        );
+            ).ptr();

-        ++newPatchi;
+        newPatchi++;
    }

    // Add new ones with empty size.
    for (label patchi = newPatchi; patchi < patches.size(); patchi++)
    {
-        const word& patchName = patches[patchi].name();
+        const boundaryPatch& bp = patches[patchi];

-        newPatches.set
+        newPatchPtrList[newPatchi] = polyPatch::New
        (
+            polyPatch::typeName,
+            bp.name(),
+            0,
+            mesh.nFaces(),
            newPatchi,
-            polyPatch::New
-            (
-                polyPatch::typeName,
-                patchName,
-                0,
-                mesh.nFaces(),
-                newPatchi,
-                mesh.boundaryMesh()
-            )
-        );
+            mesh.boundaryMesh()
+        ).ptr();

-        ++newPatchi;
+        newPatchi++;
    }

    if (!overwrite)
@ -245,7 +238,7 @@ int main(int argc, char *argv[])

    // Change patches
    repatchPolyTopoChanger polyMeshRepatcher(mesh);
-    polyMeshRepatcher.changePatches(newPatches);
+    polyMeshRepatcher.changePatches(newPatchPtrList);


    // Change face ordering
--- a/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
@ -40,7 +40,6 @@ License
 #include "vtkSurfaceWriter.H"
 #include "checkTools.H"
 #include "treeBoundBox.H"
-#include "syncTools.H"

 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

@ -49,113 +48,25 @@ void Foam::checkPatch
 (
    const bool allGeometry,
    const word& name,
-    const polyMesh& mesh,
    const PatchType& pp,
-    const labelList& meshFaces,
-    const labelList& meshEdges,
    pointSet& points
 )
 {
-    typedef typename PatchType::surfaceTopo TopoType;
-
-    const label globalSize = returnReduce(pp.size(), sumOp<label>());
-
    Info<< "    "
        << setw(20) << name
-        << setw(9) << globalSize
+        << setw(9) << returnReduce(pp.size(), sumOp<label>())
        << setw(9) << returnReduce(pp.nPoints(), sumOp<label>());

-    if (globalSize == 0)
-    {
-        Info<< setw(34) << "ok (empty)";
-    }
-    else if (Pstream::parRun())
-    {
-        // Parallel - use mesh edges
-        // - no check for point-pinch
-        // - no check for consistent orientation (if that is posible to
-        //   check?)
-
-        // (see addPatchCellLayer::globalEdgeFaces)
-        // From mesh edge to global face labels. Non-empty sublists only for
-        // pp edges.
-        labelListList globalEdgeFaces(mesh.nEdges());
-
-        const labelListList& edgeFaces = pp.edgeFaces();
-
-        // Global numbering
-        const globalIndex globalFaces(mesh.nFaces());
-
-        forAll(edgeFaces, edgei)
-        {
-            label meshEdgei = meshEdges[edgei];
-            const labelList& eFaces = edgeFaces[edgei];
-
-            // Store face and processor as unique tag.
-            labelList& globalEFaces = globalEdgeFaces[meshEdgei];
-            globalEFaces.setSize(eFaces.size());
-            forAll(eFaces, i)
-            {
-                globalEFaces[i] = globalFaces.toGlobal(meshFaces[eFaces[i]]);
-            }
-            //Pout<< "At edge:" << meshEdgei
-            //    << " ctr:" << mesh.edges()[meshEdgei].centre(mesh.points())
-            //    << " have eFaces:" << globalEdgeFaces[meshEdgei]
-            //    << endl;
-        }
-
-        //DebugVar(globalEdgeFaces);
-
-
-        // Synchronise across coupled edges.
-        syncTools::syncEdgeList
-        (
-            mesh,
-            globalEdgeFaces,
-            ListOps::uniqueEqOp<label>(),
-            labelList()             // null value
-        );
-
-        //DebugVar(globalEdgeFaces);
-        
-        label labelTyp = TopoType::MANIFOLD;
-        forAll(meshEdges, edgei)
-        {
-            const label meshEdgei = meshEdges[edgei];
-            const labelList& globalEFaces = globalEdgeFaces[meshEdgei];
-            if (globalEFaces.size() == 1)
-            {
-                //points.insert(mesh.edges()[meshEdgei]);
-                labelTyp = max(labelTyp, TopoType::OPEN);
-            }
-            else if (globalEFaces.size() == 0 || globalEFaces.size() > 2)
-            {
-                points.insert(mesh.edges()[meshEdgei]);
-                labelTyp = max(labelTyp, TopoType::ILLEGAL);
-            }
-        }
-        reduce(labelTyp, maxOp<label>());
-
-        if (labelTyp == TopoType::MANIFOLD)
-        {
-            Info<< setw(34) << "ok (closed singly connected)";
-        }
-        else if (labelTyp == TopoType::OPEN)
-        {
-            Info<< setw(34)
-                << "ok (non-closed singly connected)";
-        }
-        else
-        {
-            Info<< setw(34)
-                << "multiply connected (shared edge)";
-        }
-    }
-    else
+    if (!Pstream::parRun())
    {
+        typedef typename PatchType::surfaceTopo TopoType;
        TopoType pTyp = pp.surfaceType();

-        if (pTyp == TopoType::MANIFOLD)
+        if (pp.empty())
+        {
+            Info<< setw(34) << "ok (empty)";
+        }
+        else if (pTyp == TopoType::MANIFOLD)
        {
            if (pp.checkPointManifold(true, &points))
            {
@ -638,8 +549,15 @@ Foam::label Foam::checkTopology
    );

    {
-        Info<< "\nChecking patch topology for multiply connected"
+        if (!Pstream::parRun())
+        {
+            Info<< "\nChecking patch topology for multiply connected"
                << " surfaces..." << endl;
+        }
+        else
+        {
+            Info<< "\nChecking basic patch addressing..." << endl;
+        }

        const polyBoundaryMesh& patches = mesh.boundaryMesh();

@ -648,8 +566,11 @@ Foam::label Foam::checkTopology
        Info<< "    "
            << setw(20) << "Patch"
            << setw(9) << "Faces"
-            << setw(9) << "Points"
-            << "Surface topology";
+            << setw(9) << "Points";
+        if (!Pstream::parRun())
+        {
+            Info<< setw(34) << "Surface topology";
+        }
        if (allGeometry)
        {
            Info<< " Bounding box";
@ -662,16 +583,7 @@ Foam::label Foam::checkTopology

            if (!isA<processorPolyPatch>(pp))
            {
-                checkPatch
-                (
-                    allGeometry,
-                    pp.name(),
-                    mesh,
-                    pp,
-                    identity(pp.size(), pp.start()),
-                    pp.meshEdges(),
-                    points
-                );
+                checkPatch(allGeometry, pp.name(), pp, points);
                Info<< endl;
            }
        }
@ -680,8 +592,15 @@ Foam::label Foam::checkTopology
    }

    {
-        Info<< "\nChecking faceZone topology for multiply connected"
-            << " surfaces..." << endl;
+        if (!Pstream::parRun())
+        {
+            Info<< "\nChecking faceZone topology for multiply connected"
+                << " surfaces..." << endl;
+        }
+        else
+        {
+            Info<< "\nChecking basic faceZone addressing..." << endl;
+        }

        Pout.setf(ios_base::left);

@ -692,8 +611,12 @@ Foam::label Foam::checkTopology
            Info<< "    "
                << setw(20) << "FaceZone"
                << setw(9) << "Faces"
-                << setw(9) << "Points"
-                << setw(34) << "Surface topology";
+                << setw(9) << "Points";
+
+            if (!Pstream::parRun())
+            {
+                Info<< setw(34) << "Surface topology";
+            }
            if (allGeometry)
            {
                Info<< " Bounding box";
@ -702,16 +625,7 @@ Foam::label Foam::checkTopology

            for (const faceZone& fz : faceZones)
            {
-                checkPatch
-                (
-                    allGeometry,
-                    fz.name(),
-                    mesh,
-                    fz(),           // patch
-                    fz,             // mesh face labels
-                    fz.meshEdges(), // mesh edge labels
-                    points
-                );
+                checkPatch(allGeometry, fz.name(), fz(), points);
                Info<< endl;
            }
        }
--- a/applications/utilities/mesh/manipulation/checkMesh/checkTopology.H
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkTopology.H
@ -1,4 +1,4 @@
-#include "labelList.H"
+#include "label.H"
 #include "autoPtr.H"

 namespace Foam
@ -14,10 +14,7 @@ namespace Foam
    (
        const bool allGeometry,
        const word& name,
-        const polyMesh& mesh,
        const PatchType& pp,
-        const labelList& meshFaces,
-        const labelList& meshEdges,
        pointSet& points
    );

--- a/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.C
+++ b/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.C
@ -6,7 +6,7 @@
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
    Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2016-2022 OpenCFD Ltd.
+    Copyright (C) 2016 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -136,55 +136,46 @@ void Foam::mergePolyMesh::sortProcessorPatches()

    const polyBoundaryMesh& oldPatches = boundaryMesh();

-    polyPatchList newPatches(oldPatches.size());
+    DynamicList<polyPatch*> newPatches(oldPatches.size());

    labelList oldToSorted(oldPatches.size());

-    label nPatches = 0;
-
    forAll(oldPatches, patchi)
    {
        const polyPatch& pp = oldPatches[patchi];

        if (!isA<processorPolyPatch>(pp))
        {
-            newPatches.set
+            oldToSorted[patchi] = newPatches.size();
+            newPatches.append
            (
-                nPatches,
-                pp.clone
-                (
-                    oldPatches,
-                    nPatches,
-                    0,
-                    nInternalFaces()
-                )
-            );
-
-            oldToSorted[patchi] = nPatches;
-            ++nPatches;
-        }
-    }
-
-    forAll(oldPatches, patchi)
-    {
-        const polyPatch& pp = oldPatches[patchi];
-
-        if (isA<processorPolyPatch>(pp))
-        {
-            newPatches.set
-            (
-                nPatches,
                pp.clone
                (
                    oldPatches,
                    oldToSorted[patchi],
                    0,
                    nInternalFaces()
-                )
+                ).ptr()
            );
+        }
+    }
+    forAll(oldPatches, patchi)
+    {
+        const polyPatch& pp = oldPatches[patchi];

-            oldToSorted[patchi] = nPatches;
-            ++nPatches;
+        if (isA<processorPolyPatch>(pp))
+        {
+            oldToSorted[patchi] = newPatches.size();
+            newPatches.append
+            (
+                pp.clone
+                (
+                    oldPatches,
+                    oldToSorted[patchi],
+                    0,
+                    nInternalFaces()
+                ).ptr()
+            );
        }
    }

@ -470,7 +461,7 @@ void Foam::mergePolyMesh::merge()
    {
        Info<< "Copying old patches" << endl;

-        polyPatchList newPatches(patchNames_.size());
+        List<polyPatch*> newPatches(patchNames_.size());

        const polyBoundaryMesh& oldPatches = boundaryMesh();

@ -479,11 +470,7 @@ void Foam::mergePolyMesh::merge()

        for (patchi = 0; patchi < oldPatches.size(); patchi++)
        {
-            newPatches.set
-            (
-                patchi,
-                oldPatches[patchi].clone(oldPatches)
-            );
+            newPatches[patchi] = oldPatches[patchi].clone(oldPatches).ptr();
        }

        Info<< "Adding new patches. " << endl;
@ -500,18 +487,15 @@ void Foam::mergePolyMesh::merge()
            dict.set("nFaces", 0);
            dict.set("startFace", endOfLastPatch);

-            newPatches.set
+            newPatches[patchi] =
            (
-                patchi,
+                polyPatch::New
                (
-                    polyPatch::New
-                    (
-                        patchNames_[patchi],
-                        dict,
-                        patchi,
-                        oldPatches
-                    )
-                )
+                    patchNames_[patchi],
+                    dict,
+                    patchi,
+                    oldPatches
+                ).ptr()
            );
        }

--- a/applications/utilities/mesh/manipulation/mirrorMesh/mirrorFvMesh.C
+++ b/applications/utilities/mesh/manipulation/mirrorMesh/mirrorFvMesh.C
@ -6,7 +6,7 @@
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
    Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2017-2022 OpenCFD Ltd.
+    Copyright (C) 2017-2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -404,24 +404,20 @@ Foam::mirrorFvMesh::mirrorFvMesh
    fvMesh& pMesh = mirrorMeshPtr_();

    // Add the boundary patches
-    polyPatchList newPatches(newPatchSizes.size());
+    List<polyPatch*> p(newPatchSizes.size());

-    forAll(newPatches, patchi)
+    forAll(p, patchi)
    {
-        newPatches.set
+        p[patchi] = boundaryMesh()[patchi].clone
        (
+            pMesh.boundaryMesh(),
            patchi,
-            boundaryMesh()[patchi].clone
-            (
-                pMesh.boundaryMesh(),
-                patchi,
-                newPatchSizes[patchi],
-                newPatchStarts[patchi]
-            )
-        );
+            newPatchSizes[patchi],
+            newPatchStarts[patchi]
+        ).ptr();
    }

-    pMesh.addPatches(newPatches);
+    pMesh.addPatches(p);
 }


--- a/applications/utilities/mesh/manipulation/renumberMesh/Make/options
+++ b/applications/utilities/mesh/manipulation/renumberMesh/Make/options
@ -3,7 +3,7 @@
 */

 EXE_INC = \
-    $(COMP_FLAGS) \
+    ${COMP_FLAGS} \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/meshTools/lnInclude \
    -I$(LIB_SRC)/dynamicMesh/lnInclude \
--- a/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
+++ b/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
@ -6,7 +6,7 @@
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
    Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2017-2022 OpenCFD Ltd.
+    Copyright (C) 2017-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -564,7 +564,7 @@ int main(int argc, char *argv[])

            mesh.faceZones()
            (
-                mergePatchName + "Side0Zone",
+                mergePatchName + "MasterZone",
                true // verbose
            ).resetAddressing(std::move(faceIds), false);

@ -574,7 +574,7 @@ int main(int argc, char *argv[])

            mesh.faceZones()
            (
-                mergePatchName + "Side1Zone",
+                mergePatchName + "SlaveZone",
                true // verbose
            ).resetAddressing(std::move(faceIds), false);

@ -595,8 +595,8 @@ int main(int argc, char *argv[])
                    "couple" + Foam::name(actioni),
                    0,
                    stitcher,
-                    mergePatchName + "Side0Zone",
-                    mergePatchName + "Side1Zone",
+                    mergePatchName + "MasterZone",
+                    mergePatchName + "SlaveZone",
                    mergePatchName + "CutPointZone",
                    cutZoneName,
                    masterPatchName,
--- a/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
+++ b/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
@ -62,8 +62,8 @@ Usage
    -rotate-z angle
        Rotate (degrees) about z-axis.

-     or -yawPitchRoll : (yaw pitch roll) degrees
-     or -rollPitchYaw : (roll pitch yaw) degrees
+     or -yawPitchRoll (yawdegrees pitchdegrees rolldegrees)
+     or -rollPitchYaw (rolldegrees pitchdegrees yawdegrees)

    -scale scalar|vector
        Scale the points by the given scalar or vector on output.
@ -268,18 +268,15 @@ int main(int argc, char *argv[])
    );
    argList::addBoolOption
    (
-        "auto-centre",
-        "Use bounding box centre as centre for rotations"
+        "auto-origin",
+        "Use bounding box centre as origin for rotations"
    );
    argList::addOption
    (
-        "centre",
+        "origin",
        "point",
-        "Use specified <point> as centre for rotations"
+        "Use specified <point> as origin for rotations"
    );
-    argList::addOptionCompat("auto-centre", {"auto-origin", 2206});
-    argList::addOptionCompat("centre", {"origin", 2206});
-
    argList::addOption
    (
        "rotate",
@ -440,18 +437,18 @@ int main(int argc, char *argv[])
            points += v;
        }

-        vector rotationCentre;
-        bool useRotationCentre = args.readIfPresent("centre", rotationCentre);
-        if (args.found("auto-centre") && !useRotationCentre)
+        vector origin;
+        bool useOrigin = args.readIfPresent("origin", origin);
+        if (args.found("auto-origin") && !useOrigin)
        {
-            useRotationCentre = true;
-            rotationCentre = boundBox(points).centre();
+            useOrigin = true;
+            origin = boundBox(points).centre();
        }

-        if (useRotationCentre)
+        if (useOrigin)
        {
-            Info<< "Set centre of rotation to " << rotationCentre << endl;
-            points -= rotationCentre;
+            Info<< "Set origin for rotations to " << origin << endl;
+            points -= origin;
        }


@ -548,15 +545,15 @@ int main(int argc, char *argv[])
            }
        }

-        if (useRotationCentre)
-        {
-            Info<< "Unset centre of rotation from " << rotationCentre << endl;
-            points += rotationCentre;
-        }
-
        // Output scaling
        applyScaling(points, getScalingOpt("scale", args));

+        if (useOrigin)
+        {
+            Info<< "Unset origin for rotations from " << origin << endl;
+            points += origin;
+        }
+

        // Set the precision of the points data to 10
        IOstream::defaultPrecision(max(10u, IOstream::defaultPrecision()));
--- a/applications/utilities/miscellaneous/OSspecific/addr2line/addr2line.C
+++ b/applications/utilities/miscellaneous/OSspecific/addr2line/addr2line.C
@ -43,7 +43,7 @@ Description
 static void usage();
 static void version();
 static std::string getLine(const std::string&, const std::string&);
-static std::string pipeOpen(const std::string& cmd, const int lineNum = 0);
+static std::string pOpen(const std::string&, int line=0);


 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -132,50 +132,51 @@ void version()
 }


-// Read up to and including lineNum from the piped command
-// Return the final line read
-std::string pipeOpen(const std::string& cmd, int lineNum)
+std::string pOpen(const std::string& cmd, int line)
 {
-    std::string str;
+    std::string res;

-    FILE* handle = popen(cmd.c_str(), "r");
-    if (!handle) return str;
+    FILE* cmdPipe = popen(cmd.c_str(), "r");
+    if (!cmdPipe) return res;

    char* buf = nullptr;
-    size_t len = 0;
-    ssize_t nread;

-    // Read lineNum number of lines
-    for
-    (
-        int cnt = 0;
-        cnt <= lineNum && (nread = ::getline(&buf, &len, handle)) >= 0;
-        ++cnt
-    )
+    // Read line number of lines
+    for (int cnt = 0; cnt <= line; ++cnt)
    {
-        if (cnt == lineNum)
-        {
-            // Retain the last line, trimming trailing newline
-            str.assign(buf);
+        size_t linecap = 0;
+        ssize_t linelen = ::getline(&buf, &linecap, cmdPipe);

-            if (str.size())
+        if (linelen < 0)
+        {
+            break;
+        }
+
+        if (cnt == line)
+        {
+            res = std::string(buf);
+
+            // Trim trailing newline
+            if (res.size())
            {
-                str.resize(str.size()-1);
+                res.resize(res.size()-1);
            }
+            break;
        }
    }

-    free(buf);
-    pclose(handle);
+    if (buf) free(buf);

-    return str;
+    pclose(cmdPipe);
+
+    return res;
 }


 std::string getLine(const std::string& filename, const std::string& addr)
 {
    std::string line =
-        pipeOpen
+        pOpen
        (
            "echo 'image lookup -va " + addr
          + "'"
--- a/applications/utilities/miscellaneous/foamFormatConvert/foamFormatConvert.C
+++ b/applications/utilities/miscellaneous/foamFormatConvert/foamFormatConvert.C
@ -6,7 +6,7 @@
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
    Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2016-2022 OpenCFD Ltd.
+    Copyright (C) 2016-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -160,7 +160,7 @@ bool writeZones
        // Force writing as ASCII
        writeOk = meshObject.regIOobject::writeObject
        (
-            IOstreamOption(IOstreamOption::ASCII, compression),
+            IOstreamOption(IOstream::ASCII, compression),
            true
        );
    }
@ -355,7 +355,7 @@ int main(int argc, char *argv[])
            runTime
        );

-        if (runTime.writeFormat() == IOstreamOption::ASCII)
+        if (runTime.writeFormat() == IOstream::ASCII)
        {
            // Only do zones when converting from binary to ascii
            // The other way gives problems since working on dictionary level.
--- a/applications/utilities/miscellaneous/foamHasLibrary/foamHasLibrary.C
+++ b/applications/utilities/miscellaneous/foamHasLibrary/foamHasLibrary.C
@ -5,7 +5,7 @@
    \\  /    A nd           | www.openfoam.com
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2020-2022 OpenCFD Ltd.
+    Copyright (C) 2020-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -65,8 +65,8 @@ int main(int argc, char *argv[])
    profiling::disable(); // No profiling output
    argList::noBanner();
    argList::noParallel();
-    argList::noFunctionObjects();
    argList::removeOption("case");
+    argList::removeOption("noFunctionObjects");
    argList::addBoolOption
    (
        "or",
--- a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
+++ b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
@ -1014,9 +1014,7 @@ int main(int argc, char *argv[])
                                Time::controlDictName,
                                args.rootPath(),
                                args.caseName()
-                              / ("processor" + Foam::name(proci)),
-                                args.allowFunctionObjects(),
-                                args.allowLibs()
+                              / ("processor" + Foam::name(proci))
                            )
                        );
                    }
--- a/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C
+++ b/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C
@ -244,9 +244,7 @@ int main(int argc, char *argv[])
            (
                Time::controlDictName,
                args.rootPath(),
-                args.caseName()/("processor" + Foam::name(proci)),
-                args.allowFunctionObjects(),
-                args.allowLibs()
+                args.caseName()/("processor" + Foam::name(proci))
            )
        );
    }
--- a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
+++ b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
@ -663,11 +663,7 @@ int main(int argc, char *argv[])
        Info<< "Merge tolerance : " << mergeTol << nl
            << "Write tolerance : " << writeTol << endl;

-        if
-        (
-            runTime.writeFormat() == IOstreamOption::ASCII
-         && mergeTol < writeTol
-        )
+        if (runTime.writeFormat() == IOstream::ASCII && mergeTol < writeTol)
        {
            FatalErrorInFunction
                << "Your current settings specify ASCII writing with "
@ -731,9 +727,7 @@ int main(int argc, char *argv[])
            (
                Time::controlDictName,
                args.rootPath(),
-                args.caseName()/("processor" + Foam::name(proci)),
-                args.allowFunctionObjects(),
-                args.allowLibs()
+                args.caseName()/("processor" + Foam::name(proci))
            )
        );
    }
@ -1186,7 +1180,7 @@ int main(int argc, char *argv[])
                        false
                    );

-                    masterMeshPtr.cref(fvMeshes[0]);
+                    masterMeshPtr = fvMeshes[0];
                }


--- a/applications/utilities/parallelProcessing/redistributePar/passivePositionParticle.H
+++ b/applications/utilities/parallelProcessing/redistributePar/passivePositionParticle.H
@ -5,7 +5,7 @@
    \\  /    A nd           | www.openfoam.com
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2017-2022 OpenCFD Ltd.
+    Copyright (C) 2017-2019 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -159,7 +159,7 @@ public:
            p.origProc = ppi.origProc();
            p.origId = ppi.origId();

-            if (os.format() == IOstreamOption::ASCII)
+            if (os.format() == IOstream::ASCII)
            {
                os  << p.position
                    << token::SPACE << p.celli
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
@ -168,6 +168,7 @@ int main(int argc, char *argv[])

    // Less frequently used - reduce some clutter
    argList::setAdvanced("decomposeParDict");
+    argList::setAdvanced("noFunctionObjects");

    argList::addVerboseOption("Additional verbosity");

--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/writeDimFields.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/writeDimFields.H
@ -65,7 +65,7 @@ label writeDimFields
 {
    typedef VolumeInternalField<Type> FieldType;

-    const auto& mesh = refCast<const fvMesh>(ensMesh.mesh());
+    const fvMesh& mesh = dynamicCast<const fvMesh>(ensMesh.mesh());

    label count = 0;

--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/writeVolFields.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/writeVolFields.H
@ -88,7 +88,7 @@ label writeVolFields
 {
    typedef VolumeField<Type> FieldType;

-    const auto& mesh = refCast<const fvMesh>(ensMesh.mesh());
+    const fvMesh& mesh = dynamicCast<const fvMesh>(ensMesh.mesh());

    label count = 0;

--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
@ -232,13 +232,13 @@ vtk::outputOptions getOutputOptions(const argList& args)

        if (!args.found("ascii"))
        {
-            if (sizeof(float) != 4 || sizeof(label) != 4)
+            if (sizeof(floatScalar) != 4 || sizeof(label) != 4)
            {
                opts.ascii(true);

                WarningInFunction
                    << "Using ASCII rather than legacy binary VTK format since "
-                    << "float and/or label are not 4 bytes in size."
+                    << "floatScalar and/or label are not 4 bytes in size."
                    << nl << endl;
            }
            else
@ -268,6 +268,7 @@ int main(int argc, char *argv[])

    // Less frequently used - reduce some clutter
    argList::setAdvanced("decomposeParDict");
+    argList::setAdvanced("noFunctionObjects");

    argList::addVerboseOption("Additional verbosity");

--- a/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C
+++ b/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C
@ -87,6 +87,7 @@ int main(int argc, char *argv[])

    // Less frequently used - reduce some clutter
    argList::setAdvanced("decomposeParDict");
+    argList::setAdvanced("noFunctionObjects");

    argList::addOption
    (
--- a/applications/utilities/postProcessing/miscellaneous/profilingSummary/profilingSummary.C
+++ b/applications/utilities/postProcessing/miscellaneous/profilingSummary/profilingSummary.C
@ -5,7 +5,7 @@
    \\  /    A nd           | www.openfoam.com
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2017-2022 OpenCFD Ltd.
+    Copyright (C) 2017-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -100,9 +100,7 @@ int main(int argc, char *argv[])
            (
                Time::controlDictName,
                args.rootPath(),
-                args.caseName()/("processor" + Foam::name(proci)),
-                args.allowFunctionObjects(),
-                args.allowLibs()
+                args.caseName()/("processor" + Foam::name(proci))
            )
        );
    }
@ -392,7 +390,7 @@ int main(int argc, char *argv[])

            summary.writeHeader(os);
            summary.writeData(os);
-            IOobject::writeEndDivider(os);
+            summary.writeEndDivider(os);

            Info<< "Wrote to " << outputName << nl << endl;
        }
--- a/applications/utilities/preProcessing/changeDictionary/changeDictionary.C
+++ b/applications/utilities/preProcessing/changeDictionary/changeDictionary.C
@ -662,8 +662,8 @@ int main(int argc, char *argv[])
                // Read dictionary
                // Note: disable class type checking so we can load field
                Info<< "Loading dictionary " << fieldName << endl;
-                const word oldTypeName = localIOdictionary::typeName;
-                const_cast<word&>(localIOdictionary::typeName) = word::null;
+                const word oldTypeName = IOdictionary::typeName;
+                const_cast<word&>(IOdictionary::typeName) = word::null;

                IOobject fieldHeader
                (
@ -675,15 +675,11 @@ int main(int argc, char *argv[])
                    false
                );

-                if (fieldHeader.typeHeaderOk<localIOdictionary>(false))
+                if (fieldHeader.typeHeaderOk<IOdictionary>(false))
                {
-                    //IOdictionary fieldDict(fieldHeader);
-                    //- dictionaries to-be-changed are either boundary
-                    //  or field dictionary. Both are processor-local.
-                    localIOdictionary fieldDict(fieldHeader);
+                    IOdictionary fieldDict(fieldHeader);

-                    const_cast<word&>(localIOdictionary::typeName) =
-                        oldTypeName;
+                    const_cast<word&>(IOdictionary::typeName) = oldTypeName;

                    // Fake type back to what was in field
                    const_cast<word&>(fieldDict.type()) =
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Andreas Margetis	07664c0de8	TUT: added two unsteady adjoint optimisation tutorials showcasing the use of compressedFullStorage and binomialCheckPointing	2022-07-15 16:43:12 +03:00
Andreas Margetis	32c8fb57b7	ENH: introduced unsteady adjoint functionality - The unsteady adjoint equations are integrated backwards in time. Since each adjoint time-step requires the primal solution of that time-step to be known, schemes for managing the storage/retrieval of the entire flow series are necessary. These are implemented through the primalStorage class and its derived ones. The latter manipulate a new class of fields, called compressedGeometricFields, which provide hooks for compressing/decompressing a field during the time integration of the primal/adjoint equations. The method used for compressing/decompressing is run-time selectable. - The current commit provides the shortGeometricField implementation which avoids the storage of patchFields that can be retrieved from the internalField (e.g. coupled, zeroGradient, symmetry, etc) , to cut on the storage requirements. More elaborate compression approaches will be included in the future, during the exaFoam project. - Two primalStorage options are included: compressedFullStorage and binomialCheckPointing. - compressedFullStorage stores the entire flow time-series, potentially by compressing each time-step (only the above-mentioned short approach is available for the moment). - binomialCheckPointing is based on the homonymous algorithm found in \verbatim Wang, Q., Moin, P., & Iaccarino, G.. Minimal Repetition Dynamic Checkpointing Algorithm for Unsteady Adjoint Calculation (2009). SIAM Journal on Scientific Computing, 31(4), 2549-2567. 10.1137/080727890, \endverbatim which stores the solution of the flow equations in a predefined number of time-steps, named checkpoints. During the backwards-in-time integration of the adjoint equations, if the primal solution at a certain time-step is not available, it is retrieved by re-computing the primal flow field starting from the closest checkpoint. Checkpoints are optimally distributed throughout the time-series to invoke the least number of flow recomputations during the backwards-in-time solution of the adjoint equations. Binomial checkpointing is the current state of the art though its re-computation cost frequently amounts for an extra solution of the flow equations in medium-to-large cases. - The adjoint to the PISO and PIMPLE solvers, along with their solverControl variants, are additionally included. - Objective functions are integrated in time, through appropriate entries in the dictionaries defining them. Authored by Andreas Margetis and reviewed by Vaggelis Papoutsis, with earlier contributions from Dr. Ioannis Kavvadias.	2022-07-15 16:43:10 +03:00
Andreas Margetis	4ee7dd50ee	ENH: optionally read oldTimes in two GeometricField constructors These are used by the adjoint code and are necessary for unsteady adjoint simulations. Both additions are implemented through optional arguments with default values, to maintain backwards compatibility for the rest of the code base.	2022-07-15 16:43:07 +03:00
Andreas Margetis	162f5f29ec	ENH: modifications in Time to support unsteady adjoint Since the unsteady adjoint equations are integrated backwards in time, the -- operator and the reverseEnd and reverseLoop methods were added to control the flow of time and the ending criteria.	2022-07-15 16:43:06 +03:00