ENH: InterfaceCompositionModels: add new thermo types for kineticGasEvaporation

More consistent use of combineReduce, simpler and/or reductions

See merge request Development/openfoam!566

META-INFO/api-info

@@ -1,2 +1,2 @@
 api=2206
-patch=0
+patch=220907

applications/solvers/acoustic/acousticFoam/Make/options

@@ -11,4 +11,5 @@ EXE_LIBS = \
     -lfvOptions \
     -lmeshTools \
     -lsampling \
-    -lregionFaModels
+    -lregionFaModels \
+    -lfiniteArea

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 \

applications/solvers/compressible/rhoPimpleFoam/Make/options

@@ -26,4 +26,5 @@ EXE_LIBS = \
     -ltopoChangerFvMesh \
     -lsampling \
     -latmosphericModels \
-    -lregionFaModels
+    -lregionFaModels \
+    -lfiniteArea

applications/solvers/compressible/rhoSimpleFoam/Make/options

@@ -21,4 +21,5 @@ EXE_LIBS = \
     -lcompressibleTurbulenceModels \
     -lthermoTools \
     -latmosphericModels \
-    -lregionFaModels
+    -lregionFaModels \
+    -lfiniteArea

applications/solvers/heatTransfer/buoyantPimpleFoam/Make/options

@@ -28,4 +28,5 @@ EXE_LIBS = \
     -ldynamicMesh \
     -ldynamicFvMesh \
     -ltopoChangerFvMesh \
-    -lregionFaModels
+    -lregionFaModels \
+    -lfiniteArea

applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options

@@ -22,4 +22,5 @@ EXE_LIBS = \
     -lcompressibleTurbulenceModels \
     -lthermoTools \
     -latmosphericModels \
-    -lregionFaModels
+    -lregionFaModels \
+    -lfiniteArea

applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options

@@ -40,4 +40,5 @@ EXE_LIBS = \
     -lthermoTools \
     -lradiationModels \
     -lregionModels \
-    -lregionFaModels
+    -lregionFaModels \
+    -lfiniteArea

applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options

@@ -36,5 +36,5 @@ EXE_LIBS = \
     -lfaOptions \
     -lregionModels \
     -lsampling \
-    -lregionFaModels
-
+    -lregionFaModels \
+    -lfiniteArea

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

@@ -35,7 +35,7 @@
                 (
                     solidRegions[i],
                     thermos[i],
-                    coordinateSystem::typeName_()
+                    coordinateSystem::typeName
                 )
             );
 

applications/solvers/heatTransfer/solidFoam/createFields.H

@@ -15,7 +15,7 @@ if (!thermo.isotropic())
     (
         mesh,
         thermo,
-        coordinateSystem::typeName_()
+        coordinateSystem::typeName
     );
 
     tmp<volVectorField> tkappaByCp = thermo.Kappa()/thermo.Cp();

applications/solvers/incompressible/pimpleFoam/Make/options

@@ -22,4 +22,5 @@ EXE_LIBS = \
     -ldynamicFvMesh \
     -ltopoChangerFvMesh \
     -latmosphericModels \
-    -lregionFaModels
+    -lregionFaModels \
+    -lfiniteArea

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

applications/solvers/multiphase/MPPICInterFoam/Make/options

@@ -42,4 +42,5 @@ EXE_LIBS = \
     -lregionModels \
     -lregionFaModels \
     -lsurfaceFilmModels \
+    -lfiniteArea \
     -lcompressibleTwoPhaseMixtureTurbulenceModels

applications/solvers/multiphase/icoReactingMultiphaseInterFoam/laserDTRM/laserDTRM.C

@@ -157,12 +157,7 @@ void Foam::radiation::laserDTRM::initialiseReflection()
             );
         }
 
-        if (reflections_.size())
-        {
-            reflectionSwitch_ = true;
-        }
-
-        reflectionSwitch_ = returnReduce(reflectionSwitch_, orOp<bool>());
+        reflectionSwitch_ = returnReduceOr(reflections_.size());
     }
 }
 
@@ -299,14 +294,12 @@ void Foam::radiation::laserDTRM::initialise()
                     DTRMCloud_.addParticle(pPtr);
                 }
 
-                if (returnReduce(cellI, maxOp<label>()) == -1)
+                if (nMissed < 10 && returnReduceAnd(cellI < 0))
                 {
-                    if (++nMissed <= 10)
-                    {
-                        WarningInFunction
-                            << "Cannot find owner cell for focalPoint at "
-                            << p0 << endl;
-                    }
+                    ++nMissed;
+                    WarningInFunction
+                        << "Cannot find owner cell for focalPoint at "
+                        << p0 << endl;
                 }
             }
         }

applications/test/DirLister/DirLister.C

@@ -28,11 +28,6 @@ License
 #include "DirLister.H"
 #include <dirent.h>
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-static const Foam::word extgz("gz");
-
-
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
 bool Foam::DirLister::const_iterator::open(const fileName& dir)
@@ -110,9 +105,9 @@ Foam::word Foam::DirLister::next(DIR* dirPtr) const
 
         if (ok)
         {
-            if (fType == fileName::FILE && stripgz_ && name.hasExt(extgz))
+            if (fType == fileName::FILE && stripgz_ && name.has_ext("gz"))
             {
-                name = name.lessExt();
+                name.remove_ext();
             }
 
             if (!name.empty() && accept(name))

applications/test/DynamicList2/Test-DynamicList2.C

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2021 OpenCFD Ltd.
+    Copyright (C) 2021-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -104,7 +104,7 @@ void readList
 {
     OTstream os;
     os << input;
-    ITstream is("input", os.tokens());
+    ITstream is(os.tokens());
 
     is >> output;
 }
@@ -118,7 +118,7 @@ void readList
 {
     OTstream os;
     os << input;
-    ITstream is("input", os.tokens());
+    ITstream is(os.tokens());
 
     is >> output;
 }

applications/test/FieldFields1/Make/files

@@ -0,0 +1,3 @@
+Test-FieldFields1.C
+
+EXE = $(FOAM_USER_APPBIN)/Test-FieldFields1

applications/test/FieldFields1/Test-FieldFields1.C

@@ -0,0 +1,117 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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;
+}
+
+
+// ************************************************************************* //

applications/test/FieldFields2/Make/files

@@ -0,0 +1,3 @@
+Test-FieldFields2.C
+
+EXE = $(FOAM_USER_APPBIN)/Test-FieldFields2

applications/test/FieldFields2/Make/options

@@ -0,0 +1,2 @@
+/* EXE_INC = */
+/* EXE_LIBS = */

applications/test/FieldFields2/Test-FieldFields2.C

@@ -24,7 +24,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Application
-    Test-tensorFieldFields1
+    Test-FieldFields2
 
 \*---------------------------------------------------------------------------*/
 
@@ -73,21 +73,29 @@ void allocComponents
 }
 
 
-vectorField randomVectorField(label size)
+template<class Type>
+tmp<Field<Type>> randomField(Random& rnd, label dim)
 {
-    Random rnd;
+    auto tfld = tmp<Field<Type>>::New(dim);
+    auto& fld = tfld.ref();
 
-    vectorField vf(size);
-
-    forAll(vf, i)
+    for (Type& val : fld)
     {
-        for (direction cmpt=0; cmpt < vector::nComponents; ++cmpt)
+        for (direction cmpt=0; cmpt < pTraits<Type>::nComponents; ++cmpt)
         {
-            vf[i][cmpt] = rnd.position<label>(0, 100);
+            setComponent(val, cmpt) = rnd.position<label>(0, 100);
         }
     }
 
-    return vf;
+    return tfld;
+}
+
+
+template<class Type>
+tmp<Field<Type>> randomField(label dim)
+{
+    Random rnd;
+    return randomField<Type>(rnd, dim);
 }
 
 
@@ -191,7 +199,7 @@ int main(int argc, char *argv[])
         printFieldField(sf1);
 
         Info<< nl;
-        for (direction cmpt = 0; cmpt < vector::nComponents; ++cmpt)
+        for (direction cmpt = 0; cmpt < pTraits<vector>::nComponents; ++cmpt)
         {
             unzipRow(sf1, cmpt, slice[0]);
 
@@ -253,8 +261,9 @@ int main(int argc, char *argv[])
     {
         Info<< nl << "vectorField" << nl;
 
+        Random rnd;
         FieldField<Field, vector> vf1(1);
-        vf1.set(0, new vectorField(randomVectorField(4)));
+        vf1.set(0, randomField<vector>(rnd, 4));
 
         FixedList<FieldField<Field, scalar>, 3> cmpts;
         allocComponents(cmpts, 4);

applications/test/GAMGAgglomeration/Test-GAMGAgglomeration.C

@@ -113,7 +113,6 @@ int main(int argc, char *argv[])
         label coarseSize = max(addr)+1;
 
         Info<< "Level : " << level << endl
-            << returnReduce(addr.size(), sumOp<label>()) << endl
             << "    current size      : "
             << returnReduce(addr.size(), sumOp<label>()) << endl
             << "    agglomerated size : "

applications/test/HashPtrTable/Test-HashPtrTable.C

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
-    Copyright (C) 2017-2021 OpenCFD Ltd.
+    Copyright (C) 2017-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -31,7 +31,10 @@ Description
 #include <memory>
 #include <iostream>
 #include "autoPtr.H"
-#include "HashPtrTable.H"
+#include "refPtr.H"
+#include "tmp.H"
+#include "PtrMap.H"
+#include "primitiveFields.H"
 
 using namespace Foam;
 
@@ -250,6 +253,42 @@ 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;
 }
 

applications/test/Hashing1/Make/options

@@ -1,3 +1,3 @@
-EXE_INC = ${c++LESSWARN}
+EXE_INC = $(c++LESSWARN)
 
 /* EXE_LIBS = */

applications/test/Hashing2/Make/options

@@ -1,3 +1,3 @@
-EXE_INC = ${c++LESSWARN}
+EXE_INC = $(c++LESSWARN)
 
 /* EXE_LIBS = */

applications/test/HashingSpeed/Make/options

@@ -1,3 +1,3 @@
-EXE_INC = ${c++LESSWARN}
+EXE_INC = $(c++LESSWARN)
 
 /* EXE_LIBS = */

applications/test/IOField/Test-IOField.C

@@ -90,7 +90,7 @@ void writeAndRead
     const IOobject& io,
     const label sz,
     const word& writeType,
-    const IOobject::readOption rOpt,
+    IOobjectOption::readOption rOpt,
     const word& readType
 )
 {
@@ -208,7 +208,8 @@ int main(int argc, char *argv[])
         runTime.timeName(),
         mesh,
         IOobject::NO_READ,
-        IOobject::NO_WRITE
+        IOobject::NO_WRITE,
+        IOobject::NO_REGISTER
     );
 
     {
@@ -243,9 +244,7 @@ int main(int argc, char *argv[])
             args.executable(),
             "constant",
             runTime,
-            IOobject::NO_READ,
-            IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER  // implicit convert to IOobjectOption
         );
 
         labelList ints(identity(200));

applications/test/IndirectList/Test-IndirectList.C

@@ -182,7 +182,7 @@ int main(int argc, char *argv[])
 
         // MPI barrier
         bool barrier = true;
-        Pstream::scatter(barrier);
+        Pstream::broadcast(barrier);
     }
 
 

applications/test/OCountStream/Test-OCountStream.C

@@ -83,9 +83,9 @@ int main(int argc, char *argv[])
     {
         IOstreamOption streamOpt;
 
-        if (outputName.hasExt("gz"))
+        if (outputName.has_ext("gz"))
         {
-            outputName.removeExt();
+            outputName.remove_ext();
             streamOpt.compression(IOstreamOption::COMPRESSED);
         }
 

applications/test/Polynomial/Test-Polynomial.C

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020-2022 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("input", std::move(os.tokens()));
+        ITstream is(std::move(os.tokens()));
         is >> polyfunc;
     }
 

applications/test/Tuple2/Test-Tuple2.C

@@ -138,8 +138,8 @@ int main()
             maxFirstEqOp<label>()(maxIndexed, item);
         }
 
-        Pstream::combineAllGather(minIndexed, minFirstEqOp<label>());
-        Pstream::combineAllGather(maxIndexed, maxFirstEqOp<label>());
+        Pstream::combineReduce(minIndexed, minFirstEqOp<label>());
+        Pstream::combineReduce(maxIndexed, maxFirstEqOp<label>());
 
         Info<< "Min indexed: " << minIndexed << nl
             << "Max indexed: " << maxIndexed << nl;
@@ -156,8 +156,8 @@ int main()
             maxIndexed = maxFirstOp<label>()(maxIndexed, item);
         }
 
-        Pstream::combineAllGather(minIndexed, minFirstEqOp<label>());
-        Pstream::combineAllGather(maxIndexed, maxFirstEqOp<label>());
+        Pstream::combineReduce(minIndexed, minFirstEqOp<label>());
+        Pstream::combineReduce(maxIndexed, maxFirstEqOp<label>());
 
         Info<< "Min indexed: " << minIndexed << nl
             << "Max indexed: " << maxIndexed << nl;

applications/test/autoPtr/Test-autoPtr.C

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018-2020 OpenCFD Ltd.
+    Copyright (C) 2018-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -27,7 +27,6 @@ License
 
 // #define Foam_autoPtr_deprecate_setMethod
 
-#include <memory>
 #include "autoPtr.H"
 #include "labelList.H"
 #include "ListOps.H"
@@ -77,6 +76,14 @@ autoPtr<T> testNullReturn2()
 }
 
 
+template<class T>
+struct DerivedList : public List<T>
+{
+    // Inherit constructors
+    using List<T>::List;
+};
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 //  Main program:
 
@@ -254,6 +261,16 @@ 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;
 }

applications/test/boundBox/Make/options

@@ -1,7 +1,2 @@
-EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude
-
-EXE_LIBS = \
-    -lfiniteVolume \
-    -lmeshTools
+/* EXE_INC = */
+/* EXE_LIBS = */

applications/test/boundBox/Test-boundBox.C

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2016-2018 OpenCFD Ltd.
+    Copyright (C) 2016-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -31,7 +31,8 @@ Description
 #include "argList.H"
 #include "Time.H"
 #include "polyMesh.H"
-#include "boundBox.H"
+#include "line.H"
+#include "Random.H"
 #include "treeBoundBox.H"
 #include "cellModel.H"
 #include "bitSet.H"
@@ -84,7 +85,20 @@ int main(int argc, char *argv[])
     else
     {
         bb = cube(0, 1);
-        Info<<"starting box: " << bb << endl;
+        Info<< "starting box: " << bb << endl;
+
+        Info<< "corner: " << bb.hexCorner<0>() << nl
+            << "corner: " << bb.hexCorner<7>() << nl
+            << "corner: " << bb.hexCorner<6>() << endl;
+
+        linePoints ln1(bb.max(), bb.centre());
+        Info<< "line: " << ln1 << " box: " << ln1.box() << endl;
+
+        Info<< "box: " << boundBox(ln1.box()) << endl;
+
+        Info<< "corner: " << bb.hexCorner<0>() << nl
+            << "corner: " << bb.hexCorner<7>() << nl
+            << "corner: " << bb.hexCorner<6>() << endl;
 
         point pt(Zero);
         bb.add(pt);
@@ -147,6 +161,25 @@ int main(int argc, char *argv[])
         Info<< "box is now => " << box1 << endl;
     }
 
+    List<boundBox> boxes(12);
+    {
+        Random rndGen(12345);
+        for (auto& bb : boxes)
+        {
+            bb = cube
+            (
+                rndGen.position<scalar>(-10, 10),
+                rndGen.position<scalar>(0, 5)
+            );
+        }
+
+        Info<< "boxes: " << boxes << endl;
+
+        Foam::sort(boxes);
+
+        Info<< "sorted: " << boxes << endl;
+    }
+
     return 0;
 }
 

applications/test/coordinateSystem/Test-coordinateSystem.C

@@ -59,11 +59,11 @@ void basicTests(const coordinateSystem& cs)
 {
     cs.writeEntry(cs.name(), Info);
 
-    if (const auto* cartptr = isA<coordSystem::cartesian>(cs))
+    if ((const auto* cartptr = isA<coordSystem::cartesian>(cs)) != nullptr)
     {
-        if (!cartptr->active())
+        if (!cartptr->valid())
         {
-            Info<< "inactive cartesian = " << (*cartptr)
+            Info<< "invalid cartesian = " << (*cartptr)
                 << " with: " << (*cartptr).R() << nl;
         }
     }
@@ -106,7 +106,7 @@ void doTest(const dictionary& dict)
 
     try
     {
-        auto cs1ptr = coordinateSystem::New(dict, "");
+        auto cs1ptr = coordinateSystem::New(dict, word::null);
         coordinateSystem& cs1 = *cs1ptr;
         cs1.rename(dict.dictName());
 

applications/test/coordinateSystem/testCase1/constant/coordinateSystems

@@ -51,11 +51,8 @@ cs4
 {
     type    cylindrical;
     origin  (0 3 5);
-    rotation
-    {
-        type    euler;
-        angles  (90 0 0);
-    }
+    rotation euler;
+    angles  (90 0 0);
 }
 
 cyl
@@ -75,10 +72,7 @@ cyl
 ident
 {
     origin  (0 0 0);
-    rotation
-    {
-        type    none;
-    }
+    rotation none;
 }
 
 )

applications/test/coordinateSystem/testCsys1

@@ -26,7 +26,7 @@ rot_x90
 rot_x90_axesRotation
 {
     origin  (0 0 0);
-    coordinateRotation
+    rotation
     {
         type    axesRotation;
         e1      (1 0 0);
@@ -37,7 +37,7 @@ rot_x90_axesRotation
 rot_x90_axisAngle
 {
     origin  (0 0 0);
-    coordinateRotation
+    rotation
     {
         type    axisAngle;
         axis    (1 0 0);        // non-unit also OK
@@ -48,7 +48,7 @@ rot_x90_axisAngle
 rot_x90_euler
 {
     origin  (0 0 0);
-    coordinateRotation
+    rotation
     {
         type    euler;
         angles  (0 90 0);      // z-x'-z''
@@ -61,7 +61,7 @@ rot_x90_euler
 rot_z45_axesRotation
 {
     origin  (0 0 0);
-    coordinateRotation
+    rotation
     {
         type    axesRotation;
         e1      (1 1 0);
@@ -72,7 +72,7 @@ rot_z45_axesRotation
 rot_z45_axisAngle
 {
     origin  (0 0 0);
-    coordinateRotation
+    rotation
     {
         type    axisAngle;
         axis    (0 0 10);       // non-unit also OK
@@ -83,7 +83,7 @@ rot_z45_axisAngle
 rot_z45_euler
 {
     origin  (0 0 0);
-    coordinateRotation
+    rotation
     {
         type    euler;
         angles  (45 0 0);      // z-x'-z''
@@ -93,7 +93,7 @@ rot_z45_euler
 rot_z45_starcd
 {
     origin  (0 0 0);
-    coordinateRotation
+    rotation
     {
         type    starcd;
         angles  (45 0 0);      // z-x'-y''
@@ -106,7 +106,7 @@ rot_z45_starcd
 rot_zm45_axesRotation
 {
     origin  (0 0 0);
-    coordinateRotation
+    rotation
     {
         type    axesRotation;
         e1      (1 -1 0);
@@ -117,7 +117,7 @@ rot_zm45_axesRotation
 rot_zm45_axisAngle
 {
     origin  (0 0 0);
-    coordinateRotation
+    rotation
     {
         type    axisAngle;
         axis    (0 0 10);       // non-unit also OK
@@ -128,7 +128,7 @@ rot_zm45_axisAngle
 rot_zm45_euler
 {
     origin  (0 0 0);
-    coordinateRotation
+    rotation
     {
         type    euler;
         angles  (-45 0 0);      // z-x'-z''
@@ -141,7 +141,7 @@ rot_zm45_euler
 null_axesRotation
 {
     origin  (0 0 0);
-    coordinateRotation
+    rotation
     {
         type    axesRotation;
         e1      (1 0 0);
@@ -152,7 +152,7 @@ null_axesRotation
 null_axisAngle0
 {
     origin  (0 0 0);
-    coordinateRotation
+    rotation
     {
         type    axisAngle;
         axis    (0 0 0);       // non-unit also OK
@@ -163,7 +163,7 @@ null_axisAngle0
 null_axisAngle1
 {
     origin  (0 0 0);
-    coordinateRotation
+    rotation
     {
         type    axisAngle;
         axis    (1 1 1);       // non-unit also OK
@@ -174,7 +174,7 @@ null_axisAngle1
 null_euler
 {
     origin  (0 0 0);
-    coordinateRotation
+    rotation
     {
         type    euler;
         angles  (0 0 0);      // z-x'-z''

applications/test/decomposedBlockData/Test-decomposedBlockData.C

@@ -60,7 +60,7 @@ int main(int argc, char *argv[])
     Info<< "Reading " << file << nl << endl;
     decomposedBlockData data
     (
-        Pstream::worldComm,
+        UPstream::worldComm,
         IOobject
         (
             file,
@@ -79,7 +79,6 @@ int main(int argc, char *argv[])
     (
         objPath,
         IOstreamOption::BINARY,
-        IOstreamOption::currentVersion,
         runTime.writeCompression()
     );
     if (!os.good())

applications/test/dimField/Test-dimField.C

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -65,8 +65,7 @@ int main(int argc, char *argv[])
                 "tensor",
                 runTime.timeName(),
                 mesh,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
+                { IOobject::READ_IF_PRESENT, IOobject::NO_REGISTER }
             ),
             mesh,
             dimensioned<tensor>(dimless, tensor(1,2,3,4,5,6,7,8,9))
@@ -75,6 +74,47 @@ int main(int argc, char *argv[])
         Info().beginBlock("transformed")
             << tensorfld.T() << nl;
         Info().endBlock();
+
+        {
+            auto tfld =
+                DimensionedField<scalar, volMesh>::New
+                (
+                    tensorfld,
+                    "scalar",
+                    dimensioned<scalar>(14)
+                );
+
+            Info().beginBlock(tfld().type())
+                << tfld << nl;
+            Info().endBlock();
+        }
+
+        {
+            auto tfld =
+                volScalarField::New
+                (
+                    "scalar",
+                    tensorfld.mesh(),
+                    dimensioned<scalar>(5)
+                );
+
+            Info().beginBlock(tfld().type())
+                << tfld() << nl;
+            Info().endBlock();
+
+            // From dissimilar types
+            auto tfld2 =
+                volVectorField::New
+                (
+                    tfld(),
+                    "vector",
+                    dimensioned<vector>(Zero)
+                );
+
+            Info().beginBlock(tfld2().type())
+                << tfld2() << nl;
+            Info().endBlock();
+        }
     }
 
     #ifdef TEST_UINT8_FIELD

applications/test/dynamicLibrary/Test-dynamicLibrary.C

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2020-2021 OpenCFD Ltd.
+    Copyright (C) 2020-2022 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");
 

applications/test/exprEntry/Test-exprEntry.C

@@ -120,7 +120,8 @@ int main(int argc, char *argv[])
                     try
                     {
                         // Should not trigger any errors
-                        expressions::exprString expr(str, dict, false);
+                        auto expr = expressions::exprString::toExpr(str, dict);
+
                         Info<< "expr: " << expr << nl;
                     }
                     catch (const Foam::error& err)

applications/test/faceHashing/Make/options

@@ -1,3 +1,3 @@
-EXE_INC = ${c++LESSWARN}
+EXE_INC = $(c++LESSWARN)
 
 /* EXE_LIBS = */

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 \

applications/test/fileName/Test-fileName.C

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2016-2021 OpenCFD Ltd.
+    Copyright (C) 2016-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -48,6 +48,14 @@ Description
 
 using namespace Foam;
 
+// Create named file with some dummy content
+void touchFileContent(const fileName& file)
+{
+    std::ofstream os(file);
+    os << "file=<" << file << ">" << nl;
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 unsigned testClean(std::initializer_list<Pair<std::string>> tests)
@@ -260,7 +268,7 @@ int main(int argc, char *argv[])
             "hello1",
             "hello2",
             "hello3",
-            "hello4.hmm"
+            "hello4.ext"
         };
 
         Info<< file1 << nl;
@@ -270,7 +278,7 @@ int main(int argc, char *argv[])
         {
             file1,
             "some",
-            "more/things.hmm"
+            "more/things.ext"
         };
 
         Info<< file2 << nl;
@@ -281,7 +289,7 @@ int main(int argc, char *argv[])
         {
             std::string("ffO"),
             "some",
-            "more/things.hmm"
+            "more/things.ext"
         };
         Info<< file3 << nl;
 
@@ -295,7 +303,7 @@ int main(int argc, char *argv[])
         {
             "some",
             file3,
-            "more/things.hmm",
+            "more/things.ext",
             file1
         };
         Info<< "All ==> " << file4 << nl;
@@ -328,26 +336,26 @@ int main(int argc, char *argv[])
         fileName input1("path.to/media/image.png");
 
         Info<<"File : " << input0 << " ext: "
-            << Switch(input0.hasExt())
+            << Switch(input0.has_ext())
             <<  " = " << input0.ext() << nl;
         Info<<"File : " << input1 << " ext: "
-            << Switch(input1.hasExt())
+            << Switch(input1.has_ext())
             <<  " = " << input1.ext() << nl;
         Info<<"File : " << endWithDot << " ext: "
-            << Switch(endWithDot.hasExt())
+            << Switch(endWithDot.has_ext())
             <<  " = " << endWithDot.ext() << " <-- perhaps return false?" << nl;
         Info<<"File : " << endWithSlash << " ext: "
-            << Switch(endWithSlash.hasExt())
+            << Switch(endWithSlash.has_ext())
             <<  " = " << endWithSlash.ext() << nl;
 
 
-        Info<<"Remove extension " << (input0.removeExt());
+        Info<<"Remove extension " << (input0.remove_ext());
         Info<< "  now: " << input0 << nl;
 
         Info<<"Remove extension " << (input1.removeExt());
         Info<< "  now: " << input1 << nl;
 
-        Info<<"Remove extension " << (endWithSlash.removeExt());
+        Info<<"Remove extension " << (endWithSlash.remove_ext());
         Info<< "  now: " << endWithSlash << nl;
 
         wordList exts{ "jpg", "png", "txt", word::null };
@@ -359,14 +367,14 @@ int main(int argc, char *argv[])
         Info<< nl;
 
 
-        Info<<"Test hasExt(word)" << nl
+        Info<<"Test has_ext(word)" << nl
             <<"~~~~~~~~~~~~~~~~~" << nl;
         Info<<"Has extension(s):" << nl
             << "input: " << input1 << nl;
         for (const word& e : exts)
         {
             Info<<"  '" << e << "'  -> "
-                << Switch(input1.hasExt(e)) << nl;
+                << Switch(input1.has_ext(e)) << nl;
         }
         Info<< nl;
 
@@ -375,12 +383,12 @@ int main(int argc, char *argv[])
         for (const word& e : exts)
         {
             Info<<"  '" << e << "'  -> "
-                << Switch(endWithDot.hasExt(e)) << nl;
+                << Switch(endWithDot.has_ext(e)) << nl;
         }
         Info<< nl;
 
 
-        Info<<"Test hasExt(wordRe)" << nl
+        Info<<"Test has_ext(wordRe)" << nl
             <<"~~~~~~~~~~~~~~~~~~~" << nl;
 
         // A regex with a zero length matcher doesn't work at all:
@@ -393,25 +401,25 @@ int main(int argc, char *argv[])
         Info<<"Has extension(s):" << nl
             << "input: " << endWithDot << nl;
         Info<<"    " << matcher0 << "  -> "
-            << Switch(endWithDot.hasExt(matcher0)) << nl;
+            << Switch(endWithDot.has_ext(matcher0)) << nl;
         Info<<"    " << matcher1 << "  -> "
-            << Switch(endWithDot.hasExt(matcher1)) << nl;
+            << Switch(endWithDot.has_ext(matcher1)) << nl;
         Info<<"    " << matcher2 << "  -> "
-            << Switch(endWithDot.hasExt(matcher2)) << nl;
+            << Switch(endWithDot.has_ext(matcher2)) << nl;
 
         Info<< "input: " << input1 << nl;
         Info<<"    " << matcher0 << "  -> "
-            << Switch(input1.hasExt(matcher0)) << nl;
+            << Switch(input1.has_ext(matcher0)) << nl;
         Info<<"    " << matcher1 << "  -> "
-            << Switch(input1.hasExt(matcher1)) << nl;
+            << Switch(input1.has_ext(matcher1)) << nl;
         Info<<"    " << matcher2 << "  -> "
-            << Switch(input1.hasExt(matcher2)) << nl;
+            << Switch(input1.has_ext(matcher2)) << nl;
         Info<< nl;
 
         Info<<"Remove extension(s):" << nl << "input: " << input1 << nl;
         while (!input1.empty())
         {
-            if (input1.removeExt())
+            if (input1.remove_ext())
             {
                 Info<< "   -> " << input1 << nl;
             }
@@ -587,14 +595,54 @@ int main(int argc, char *argv[])
     if (args.found("system"))
     {
         const fileName dirA("dirA");
+        const fileName dirB("dirB");
+        const fileName dirC("dirC");
+        const fileName dirD("dirD");
         const fileName lnA("lnA");
         const fileName lnB("lnB");
-        const fileName dirB("dirB");
 
-        Foam::rmDir(dirA);
+        // Purge anything existing
+        Foam::rmDir(dirA, true);
+        Foam::rmDir(dirB, true);
+        Foam::rmDir(dirC, true);
+        Foam::rmDir(dirD, true);
         Foam::rm(lnA);
         Foam::rm(lnB);
-        Foam::rmDir(dirB);
+
+        {
+            fileName name(dirA/dirB/dirC/"abc");
+            Foam::mkDir(name.path());
+            touchFileContent(name);           // Create real file
+
+            Foam::mkDir(dirB/dirB/dirB/dirB);
+            Foam::ln("test", dirB/"linkB");   // Create dead link
+
+            Foam::mkDir(dirC);
+            Foam::ln("../dirD", dirC/"linkC");  // Create real link
+
+            Foam::mkDir(dirD);
+
+            for (const fileName& d : { dirA, dirB, dirC, dirD })
+            {
+                Info<< "Directory: " << d << " = "
+                    << readDir(d, fileName::UNDEFINED, false, false) << nl;
+
+                if (Foam::rmDir(d, false, true))
+                {
+                    Info<< "   Removed empty dir" << nl;
+                }
+                else
+                {
+                    Info<< "   Could not remove empty dir" << nl;
+                }
+            }
+
+            // Force removal before continuing
+            Foam::rmDir(dirA, true);
+            Foam::rmDir(dirB, true);
+            Foam::rmDir(dirC, true);
+            Foam::rmDir(dirD, true);
+        }
 
         Info<< nl << "=========================" << nl
             << "Test some copying and deletion" << endl;
@@ -618,9 +666,7 @@ int main(int argc, char *argv[])
             );
 
             Info<<"    create: " << file << endl;
-
-            std::ofstream os(file);
-            os << "file=<" << file << ">" << nl;
+            touchFileContent(file);
         }
 
         const int oldDebug = POSIX::debug;
@@ -708,7 +754,7 @@ int main(int argc, char *argv[])
         "hello1",
         "hello2",
         "hello3",
-        "hello4.hmm"
+        "hello4.ext"
     };
 
     fileName pathName(wrdList);
@@ -718,14 +764,28 @@ int main(int argc, char *argv[])
         << "pathName.name()     = >" << pathName.name() << "<\n"
         << "pathName.path()     = "  << pathName.path() << nl
         << "pathName.ext()      = >" << pathName.ext() << "<\n"
-        << "pathName.nameLessExt= >" << pathName.nameLessExt() << "<\n";
+        << "pathName.stem       = >" << pathName.stem() << "<\n";
 
     Info<< "pathName.components() = " << pathName.components() << nl
         << "pathName.component(2) = " << pathName.component(2) << nl
         << endl;
 
-    Info<< "hasPath = " << Switch(pathName.hasPath()) << nl;
-    pathName.removePath();
+    pathName.replace_name("newName.ext");
+    Info<< "new name = " << pathName << nl;
+    Info<< "has ext      = " << Switch::name(pathName.has_ext()) << nl;
+    Info<< "has ext('')  = " << Switch::name(pathName.has_ext("")) << nl;
+    Info<< "has ext(foo) = " << Switch::name(pathName.has_ext("foo")) << nl;
+    Info<< "has ext(ext) = " << Switch::name(pathName.has_ext("ext")) << nl;
+
+    pathName.replace_ext("png");
+    Info<< "new ext = " << pathName << nl;
+
+    pathName.replace_ext("");  // Same as remove_ext
+    Info<< "new ext = " << pathName << nl;
+
+    Info<< "has path = " << Switch::name(pathName.has_path()) << nl;
+    pathName.remove_path();
+    pathName.removePath();  // second type should be a no-op
     Info<< "removed path = " << pathName << nl;
 
     Info<< nl << nl;

applications/test/findSphereFeatureEdges-octree/Test-findSphereFeatureEdges-octree.C

@@ -64,13 +64,8 @@ int main(int argc, char *argv[])
 
     // Slightly extended bb. Slightly off-centred just so on symmetric
     // geometry there are less face/edge aligned items.
-    treeBoundBox bb
-    (
-        efem.points()
-    );
-
-    bb.min() -= point::uniform(ROOTVSMALL);
-    bb.max() += point::uniform(ROOTVSMALL);
+    treeBoundBox bb(efem.points());
+    bb.grow(ROOTVSMALL);
 
     labelList allEdges(identity(efem.edges().size()));
 

applications/test/fstreamPointer/Test-fstreamPointer.C

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2020-2021 OpenCFD Ltd.
+    Copyright (C) 2020-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
@@ -61,10 +61,10 @@ int main(int argc, char *argv[])
         InfoErr<< "output: " << outputName;
 
         IOstreamOption::compressionType comp(IOstreamOption::UNCOMPRESSED);
-        if (outputName.hasExt("gz"))
+        if (outputName.has_ext("gz"))
         {
             comp = IOstreamOption::COMPRESSED;
-            outputName.removeExt();
+            outputName.remove_ext();
 
             InfoErr<< " [compress]";
         }

applications/test/globalIndex/Test-globalIndex.C

@@ -204,7 +204,7 @@ int main(int argc, char *argv[])
     labelPair inOut;
     pointField allCcs(globalNumbering.gather(mesh.cellCentres()));
     inOut[0] = allCcs.size();
-    Pstream::scatter(allCcs);
+    Pstream::broadcast(allCcs);
     inOut[1] = allCcs.size();
     Pout<< "    " << inOut << endl;
 

applications/test/labelRanges/Test-labelRanges.C

@@ -41,8 +41,8 @@ void printInfo(const labelRange& range)
         << "last    " << range.last() << nl
         << "min     " << range.min() << nl
         << "max     " << range.max() << nl
-        << "after   " << range.after() << nl
-        << "begin end " << *range.cbegin() << ' ' << *range.cend() << nl;
+        << "end     " << range.end_value() << nl
+        << "begin/end " << *range.cbegin() << ' ' << *range.cend() << nl;
 
     // Info<< "rbegin rend " << *range.rbegin() << ' ' << *range.rend() << nl;
 }
@@ -56,7 +56,7 @@ int main(int argc, char *argv[])
     argList::noParallel();
     argList::noFunctionObjects();
     argList::addArgument("start size .. startN sizeN");
-    argList::addVerbose("enable labelRange::debug");
+    argList::addVerboseOption("enable labelRange::debug");
     argList::addNote
     (
         "The default is to add ranges, use 'add' and 'del' to toggle\n\n"

applications/test/minMax1/Test-minMax1.C

@@ -44,7 +44,7 @@ using namespace Foam;
 template<class T>
 Ostream& printInfo(const MinMax<T>& range)
 {
-    Info<< range << " valid=" << range.valid() << " span=" << range.span();
+    Info<< range << " good=" << range.good() << " span=" << range.span();
 
     return Info;
 }
@@ -234,11 +234,7 @@ int main(int argc, char *argv[])
 
         Pout<< "hashed: " << hashed << nl;
 
-        Pstream::mapCombineGather
-        (
-            hashed,
-            plusEqOp<scalarMinMax>()
-        );
+        Pstream::mapCombineReduce(hashed, plusEqOp<scalarMinMax>());
 
         Info<< "reduced: " << hashed << nl;
 

applications/test/minMax2/Test-minMax2.C

@@ -44,7 +44,7 @@ using namespace Foam;
 template<class T>
 Ostream& printInfo(const MinMax<T>& range)
 {
-    Info<< range << " valid=" << range.valid();
+    Info<< range << " good=" << range.good();
 
     return Info;
 }

applications/test/openmp/Make/options

@@ -1,4 +1,4 @@
-EXE_INC = ${COMP_OPENMP} /* -UUSE_OMP */
+EXE_INC = $(COMP_OPENMP)
 
 /* Mostly do not need to explicitly link openmp libraries */
-/* EXE_LIBS = ${LINK_OPENMP} */
+/* EXE_LIBS = $(LINK_OPENMP) */

applications/test/openmp/Test-openmp.C

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2017 OpenCFD Ltd.
+    Copyright (C) 2017-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -41,12 +41,6 @@ Description
 
 int main(int argc, char *argv[])
 {
-#if USE_OMP
-    std::cout << "USE_OMP defined (" << USE_OMP << ")\n";
-#else
-    std::cout << "USE_OMP undefined\n";
-#endif
-
 #if _OPENMP
     std::cout << "_OPENMP = " << _OPENMP << "\n\n";
 

applications/test/parallel-chunks/Test-parallel-chunks.C

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

applications/test/parallel-communicators/Test-parallel-communicators.C

@@ -167,7 +167,7 @@ int main(int argc, char *argv[])
         (
             localValue,
             sumOp<scalar>(),
-            Pstream::msgType(),
+            UPstream::msgType(),
             comm
         );
         Pout<< "sum             :" << sum << endl;

applications/test/parallel-nonBlocking/Test-parallel-nonBlocking.C

@@ -125,13 +125,13 @@ int main(int argc, char *argv[])
     scalar data1 = 1.0;
     label request1 = -1;
     {
-        Foam::reduce(data1, sumOp<scalar>(), Pstream::msgType(), request1);
+        Foam::reduce(data1, sumOp<scalar>(), UPstream::msgType(), request1);
     }
 
     scalar data2 = 0.1;
     label request2 = -1;
     {
-        Foam::reduce(data2, sumOp<scalar>(), Pstream::msgType(), request2);
+        Foam::reduce(data2, sumOp<scalar>(), UPstream::msgType(), request2);
     }
 
 

applications/test/primitivePatch/Test-PrimitivePatch.C

@@ -232,6 +232,7 @@ int main(int argc, char *argv[])
         const labelListList& edgeFaces = pp.edgeFaces();
         const labelListList& faceEdges = pp.faceEdges();
 
+        Pout<< "box: " << pp.box() << endl;
 
         checkFaceEdges(localFaces, edges, faceEdges);
 

applications/test/rawIOField/Make/files

@@ -0,0 +1,3 @@
+Test-rawIOField.C
+
+EXE = $(FOAM_USER_APPBIN)/Test-rawIOField

applications/test/rawIOField/Make/options

@@ -0,0 +1,9 @@
+EXE_INC = \
+    -I$(LIB_SRC)/fileFormats/lnInclude \
+    -I$(LIB_SRC)/surfMesh/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude
+
+EXE_LIBS = \
+    -lfileFormats \
+    -lsurfMesh \
+    -lmeshTools

applications/test/rawIOField/Test-rawIOField.C

@@ -0,0 +1,168 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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-rawIOField
+
+Description
+    Reading rawIOField from disk
+
+\*---------------------------------------------------------------------------*/
+
+#include "argList.H"
+#include "Time.H"
+#include "Switch.H"
+#include "primitiveFields.H"
+#include "pointField.H"
+#include "rawIOField.H"
+#include "exprTraits.H"
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+using namespace Foam;
+
+#undef  USE_ROOT_CASE
+//#define USE_ROOT_CASE
+
+
+template<class Type>
+tmp<Field<Type>> readRawField
+(
+    const IOobject& io,
+    IOobjectOption::readOption withAverage
+)
+{
+    rawIOField<Type> raw(io, withAverage);
+
+    Info<< "File: " << io.objectPath() << nl
+        << "Read: " << raw.size()
+        << ' ' << pTraits<Type>::typeName << " entries" << nl
+        << "Average: " << Switch::name(raw.hasAverage())
+        << " = " << raw.average() << endl;
+
+    return tmp<Field<Type>>::New(std::move(static_cast<Field<Type>&>(raw)));
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+int main(int argc, char *argv[])
+{
+    argList::addNote
+    (
+        "Test behaviour of rawIOField reading (writing?)"
+    );
+
+    argList::noCheckProcessorDirectories();
+
+    argList::addBoolOption("scalar", "Read scalar field");
+    argList::addBoolOption("vector", "Read vector field");
+    argList::addBoolOption("point", "Read point field");
+    argList::addBoolOption("average", "Require averaged value entry");
+    argList::addBoolOption("try-average", "Optional averaged value entry");
+
+    argList::addArgument("fileName");
+
+    #ifdef USE_ROOT_CASE
+        #include "setRootCase.H"
+        #include "createTime.H"
+    #else
+    // Without root case, or time
+    argList args(argc, argv);
+    #endif
+
+    fileName inputName = args.get<fileName>(1);
+
+    IOobjectOption::readOption withAverage = IOobjectOption::NO_READ;
+
+    if (args.found("average"))
+    {
+        withAverage = IOobjectOption::MUST_READ;
+    }
+    else if (args.found("try-average"))
+    {
+        withAverage = IOobjectOption::READ_IF_PRESENT;
+    }
+
+    Info<< "Using case: " << argList::envGlobalPath() << nl
+        << "Read file:  " << inputName << nl
+        << "with average: " << int(withAverage) << nl
+        << endl;
+
+
+    refPtr<Time> timePtr;
+
+    #ifdef USE_ROOT_CASE
+    timePtr.cref(runTime);
+    #endif
+
+    // Fallback (eg, no runTime)
+    if (!timePtr.good())
+    {
+        timePtr.reset(Time::New(argList::envGlobalPath()));
+    }
+
+
+    const auto& tm = timePtr();
+
+    fileName resolvedName(inputName);
+    resolvedName.toAbsolute();
+
+    IOobject io
+    (
+        resolvedName,   // absolute path
+        tm,
+        IOobject::MUST_READ,
+        IOobject::NO_WRITE,
+        IOobject::NO_REGISTER,
+        true            // is global object (currently not used)
+    );
+
+
+    if (args.found("scalar"))
+    {
+        auto tfield = readRawField<scalar>(io, withAverage);
+    }
+    else if (args.found("point"))
+    {
+        auto tfield = readRawField<point>(io, withAverage);
+    }
+    else if (args.found("vector"))
+    {
+        auto tfield = readRawField<vector>(io, withAverage);
+    }
+    else
+    {
+        Info<< "no data type specified!\n";
+    }
+
+    Info<< nl << "End\n" << endl;
+
+    return 0;
+}
+
+
+// ************************************************************************* //

applications/test/refPtr/Test-refPtr.C

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2020-2021 OpenCFD Ltd.
+    Copyright (C) 2020-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
@@ -19,6 +19,9 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "primitiveFields.H"
+#include "autoPtr.H"
+#include "refPtr.H"
+#include "tmp.H"
 #include "Switch.H"
 
 using namespace Foam;
@@ -29,6 +32,36 @@ 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)
 {
@@ -37,15 +70,24 @@ void printInfo(const refPtr<T>& item, const bool verbose = false)
         << " addr: " << Foam::name(item.get())
         << " movable:" << Switch(item.movable());
 
-    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;
+    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>>();
 
     if (verbose && item)
     {
@@ -101,6 +143,62 @@ 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;

applications/test/scalarOps/Test-scalarOps.C

@@ -126,6 +126,9 @@ int main(int argc, char *argv[])
     testDivide<vector>(vectors);
 
 
+    //(void) compareOp<vector>()(vector::zero, vector::one);
+
+
     Info<< "\nEnd\n" << endl;
 
     return 0;

applications/test/sizeof/Test-sizeof.C

@@ -135,6 +135,7 @@ int main(int argc, char *argv[])
         cout<<"string:" << sizeof(Foam::string) << nl;
     }
 
+    cout<<"IOobjectOption:" << sizeof(Foam::IOobjectOption) << nl;
     cout<<"IOobject:" << sizeof(Foam::IOobject) << nl;
     cout<<"IOstream:" << sizeof(Foam::IOstream) << nl;
     cout<<"PstreamBuffers:" << sizeof(Foam::PstreamBuffers) << nl;

applications/test/surfaceReading/Test-surfaceReading.C

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018-2021 OpenCFD Ltd.
+    Copyright (C) 2018-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -91,15 +91,15 @@ int main(int argc, char *argv[])
 
     const auto importName = args.get<fileName>(1);
 
-    word ext;
-    if (!args.readIfPresent("ext", ext))
-    {
-        ext = importName.ext();
-        if (ext == "gz")
-        {
-            ext = importName.lessExt().ext();
-        }
-    }
+    word ext =
+    (
+        importName.has_ext("gz")
+      ? importName.stem().ext()
+      : importName.ext()
+    );
+
+    // Allow override of extension
+    args.readIfPresent("ext", ext);
 
     args.readIfPresent("stl-parser", fileFormats::STLReader::parserType);
 

applications/test/tensorFieldFields1/Make/files

@@ -1,3 +0,0 @@
-Test-tensorFieldFields1.C
-
-EXE = $(FOAM_USER_APPBIN)/Test-tensorFieldFields1

applications/test/tensorFields1/Test-tensorFields1.C

@@ -34,21 +34,29 @@ Application
 
 using namespace Foam;
 
-vectorField randomVectorField(label size)
+template<class Type>
+tmp<Field<Type>> randomField(Random& rnd, label dim)
 {
-    Random rnd;
+    auto tfld = tmp<Field<Type>>::New(dim);
+    auto& fld = tfld.ref();
 
-    vectorField vf(size);
-
-    forAll(vf, i)
+    for (Type& val : fld)
     {
-        for (direction cmpt=0; cmpt < vector::nComponents; ++cmpt)
+        for (direction cmpt=0; cmpt < pTraits<Type>::nComponents; ++cmpt)
         {
-            vf[i][cmpt] = rnd.position<label>(0, 100);
+            setComponent(val, cmpt) = rnd.position<label>(0, 100);
         }
     }
 
-    return vf;
+    return tfld;
+}
+
+
+template<class Type>
+tmp<Field<Type>> randomField(label dim)
+{
+    Random rnd;
+    return randomField<Type>(rnd, dim);
 }
 
 
@@ -251,7 +259,7 @@ int main(int argc, char *argv[])
     {
         Info<< nl << "vectorField" << nl;
 
-        vectorField vf1(randomVectorField(4));
+        vectorField vf1(randomField<vector>(4));
         FixedList<scalarField, 3> cmpts(scalarField(vf1.size()));
 
         Info<< nl

applications/test/timeSelector/Test-timeSelector.C

@@ -63,7 +63,6 @@ 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");

applications/test/tmp/Test-tmp.C

@@ -19,6 +19,9 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "primitiveFields.H"
+#include "autoPtr.H"
+#include "refPtr.H"
+#include "tmp.H"
 #include "Switch.H"
 
 using namespace Foam;
@@ -126,6 +129,28 @@ 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;

applications/test/vector/Test-vector.C

@@ -33,6 +33,7 @@ Description
 
 #include "vectorField.H"
 #include "IOstreams.H"
+#include "Random.H"
 #include <algorithm>
 #include <random>
 
@@ -74,8 +75,12 @@ void doTest(vector& vec1, vector& vec2)
     printInfo(vec1);
     printInfo(vec2);
 
-    Info<< "min of " << vec1 << " and " << vec2 << " = "
-        << min(vec1, vec2) << nl << nl;
+    Info<< "vector: " << vec1 << nl
+        << "vector: " << vec2 << nl
+        << "   min: " << min(vec1, vec2) << nl
+        << "  dist: " << vec1.dist(vec2) << ' ' << mag(vec1 - vec2) << nl
+        << "dist^2: " << vec1.distSqr(vec2) << ' ' << magSqr(vec1 - vec2) << nl
+        << nl;
 }
 
 
@@ -146,6 +151,46 @@ int main(int argc, char *argv[])
 
         std::shuffle(vec2.begin(), vec2.end(), std::default_random_engine());
         Info<< "shuffled: " << vec2 << nl;
+
+        // Vectors with some identical components
+        List<vector> vectors
+        ({
+            {1.1, 2.2, 3.3 },
+            {2.2, 3.3, 4.4 },
+            {-1.1, 2.2, 3.3 },
+            {-2.2, 3.3, 4.4 },
+
+            {-1.1, -2.2, 3.3 },
+            {-2.2, -3.3, 4.4 },
+
+            {-1.1, -2.2, -3.3 },
+            {-2.2, -3.3, -4.4 },
+            {-3.3, 2.1, 12 },
+            {3.145, 1.6, 2 },
+
+            {0, 0, 0}
+        });
+
+        shuffle(vectors);
+
+        Info<< "initial vectors: ";
+        vectors.writeList(Info, 1) << nl;
+
+        Foam::sort(vectors);
+        Info<< "regular sort:";
+        vectors.writeList(Info, 1) << nl;
+
+        std::sort(vectors.begin(), vectors.end(), vector::less_xyz);
+        Info<< "sorted xyz:";
+        vectors.writeList(Info, 1) << nl;
+
+        std::sort(vectors.begin(), vectors.end(), vector::less_yzx);
+        Info<< "sorted yzx:";
+        vectors.writeList(Info, 1) << nl;
+
+        std::sort(vectors.begin(), vectors.end(), vector::less_zxy);
+        Info<< "sorted zxy:";
+        vectors.writeList(Info, 1) << nl;
     }
 
     // Basic tests for fields

applications/utilities/finiteArea/checkFaMesh/printMeshSummary.H

@@ -116,12 +116,16 @@ Description
     {
         const faPatch& p = patches[patchi];
 
-         Info<< "  " << "patch " << p.index()
-             << " (size: " << returnReduce(p.size(), sumOp<label>())
-             << ") name: " << p.name()
-             << nl;
+        // Report physical size (nEdges) not virtual size
+        Info<< "  " << "patch " << p.index()
+            << " (size: " << returnReduce(p.nEdges(), sumOp<label>())
+            << ") name: " << p.name()
+            << nl;
     }
 
+    Info<< "----------------" << nl
+        << "Used polyPatches: " << flatOutput(aMesh.whichPolyPatches()) << nl;
+
 
     // Geometry information
     Info<< nl;

applications/utilities/finiteArea/makeFaMesh/printMeshSummary.H

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2021 OpenCFD Ltd.
+    Copyright (C) 2021-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
@@ -36,12 +36,17 @@ Description
     {
         const faPatch& p = patches[patchi];
 
-         Info<< "  " << "patch " << p.index()
-             << " (size: " << returnReduce(p.size(), sumOp<label>())
-             << ") name: " << p.name()
-             << nl;
+        // Report physical size (nEdges) not virtual size
+        Info<< "  " << "patch " << p.index()
+            << " (size: " << returnReduce(p.nEdges(), sumOp<label>())
+            << ") name: " << p.name()
+            << nl;
     }
 
+    Info<< "----------------" << nl
+        << "Used polyPatches: " << flatOutput(aMesh.whichPolyPatches()) << nl;
+
+
     // Geometry information
     Info<< nl;
     {

applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C

@@ -585,7 +585,7 @@ void createBaffles
 // Wrapper around find patch. Also makes sure same patch in parallel.
 label findPatch(const polyBoundaryMesh& patches, const word& patchName)
 {
-    label patchi = patches.findPatchID(patchName);
+    const label patchi = patches.findPatchID(patchName);
 
     if (patchi == -1)
     {
@@ -597,16 +597,15 @@ label findPatch(const polyBoundaryMesh& patches, const word& patchName)
 
     // Check same patch for all procs
     {
-        label newPatch = patchi;
-        reduce(newPatch, minOp<label>());
+        const label newPatchi = returnReduce(patchi, minOp<label>());
 
-        if (newPatch != patchi)
+        if (newPatchi != patchi)
         {
             FatalErrorInFunction
                 << "Patch " << patchName
                 << " should have the same patch index on all processors." << nl
                 << "On my processor it has index " << patchi
-                << " ; on some other processor it has index " << newPatch
+                << " ; on some other processor it has index " << newPatchi
                 << exit(FatalError);
         }
     }

applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C

@@ -226,14 +226,18 @@ int main(int argc, char *argv[])
     // Add the boundary patches
     const polyBoundaryMesh& patches = mesh.boundaryMesh();
 
-    List<polyPatch*> p(patches.size());
+    polyPatchList newPatches(patches.size());
 
-    forAll(p, patchi)
+    forAll(newPatches, patchi)
     {
-        p[patchi] = patches[patchi].clone(fMesh.boundaryMesh()).ptr();
+        newPatches.set
+        (
+            patchi,
+            patches[patchi].clone(fMesh.boundaryMesh())
+        );
     }
 
-    fMesh.addFvPatches(p);
+    fMesh.addFvPatches(newPatches);
 
 
     // Refinement level

applications/utilities/mesh/advanced/selectCells/selectCells.C

@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -396,12 +397,11 @@ int main(int argc, char *argv[])
     meshSearch queryMesh(mesh);
 
     // Check all 'outside' points
-    forAll(outsidePts, outsideI)
+    for (const point& outsidePoint : outsidePts)
     {
-        const point& outsidePoint = outsidePts[outsideI];
+        const label celli = queryMesh.findCell(outsidePoint, -1, false);
 
-        label celli = queryMesh.findCell(outsidePoint, -1, false);
-        if (returnReduce(celli, maxOp<label>()) == -1)
+        if (returnReduceAnd(celli < 0))
         {
             FatalErrorInFunction
                 << "outsidePoint " << outsidePoint

applications/utilities/mesh/advanced/snappyRefineMesh/snappyRefineMesh.C

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2018-2019 OpenCFD Ltd.
+    Copyright (C) 2018-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -205,34 +205,43 @@ label addPatch(polyMesh& mesh, const word& patchName)
     {
         const polyBoundaryMesh& patches = mesh.boundaryMesh();
 
-        List<polyPatch*> newPatches(patches.size() + 1);
+        polyPatchList newPatches(patches.size() + 1);
+
+        label nPatches = 0;
 
         // Add empty patch as 0th entry (Note: only since subsetMesh wants this)
         patchi = 0;
-
-        newPatches[patchi] =
-            new emptyPolyPatch
-            (
-                Foam::word(patchName),
-                0,
-                mesh.nInternalFaces(),
-                patchi,
-                patches,
-                emptyPolyPatch::typeName
-            );
-
-        forAll(patches, i)
         {
-            const polyPatch& pp = patches[i];
+            newPatches.set
+            (
+                nPatches,
+                new emptyPolyPatch
+                (
+                    patchName,
+                    0,
+                    mesh.nInternalFaces(),
+                    nPatches,
+                    patches,
+                    emptyPolyPatch::typeName
+                )
+            );
+            ++nPatches;
+        }
 
-            newPatches[i+1] =
+        for (const polyPatch& pp : patches)
+        {
+            newPatches.set
+            (
+                nPatches,
                 pp.clone
                 (
                     patches,
-                    i+1,
+                    nPatches,
                     pp.size(),
                     pp.start()
-                ).ptr();
+                )
+            );
+            ++nPatches;
         }
 
         mesh.removeBoundary();

applications/utilities/mesh/conversion/ccm/ccmToFoam/ccmToFoam.C

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2016-2021 OpenCFD Ltd.
+    Copyright (C) 2016-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -175,7 +175,7 @@ int main(int argc, char *argv[])
         // strip erroneous extension (.ccm, .ccmg, .ccmp)
         if (ext == "ccm" || ext == "ccmg" || ext == "ccmp")
         {
-            exportName = exportName.lessExt();
+            exportName.remove_ext();
         }
     }
     else if (args.found("export"))

applications/utilities/mesh/conversion/ccm/foamToCcm/foamToCcm.C

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2016 OpenCFD Ltd.
+    Copyright (C) 2016-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -137,7 +137,7 @@ int main(int argc, char *argv[])
         // strip erroneous extension (.ccm, .ccmg, .ccmp)
         if (ext == "ccm" || ext == "ccmg" || ext == "ccmp")
         {
-            exportName = exportName.lessExt();
+            exportName.remove_ext();
         }
     }
     else if (args.found("case"))

applications/utilities/mesh/conversion/ensightToFoam/Make/files

@@ -0,0 +1,4 @@
+ensightMeshReader.C
+ensightToFoam.C
+
+EXE = $(FOAM_APPBIN)/ensightToFoam

applications/utilities/mesh/conversion/ensightToFoam/Make/options

@@ -0,0 +1,11 @@
+EXE_INC = \
+    -I$(LIB_SRC)/fileFormats/lnInclude \
+    -I$(LIB_SRC)/surfMesh/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/conversion/lnInclude
+
+EXE_LIBS = \
+    -lfileFormats \
+    -lsurfMesh \
+    -lmeshTools \
+    -lconversion

applications/utilities/mesh/conversion/ensightToFoam/ensightMeshReader.H

@@ -0,0 +1,194 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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/>.
+
+Class
+    Foam::fileFormats::ensightMeshReader
+
+Description
+
+Notes
+
+SourceFiles
+    ensightMeshReader.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef Foam_ensightMeshReader_H
+#define Foam_ensightMeshReader_H
+
+#include "meshReader.H"
+//#include "ensightReadFile.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward Declarations
+class ensightReadFile;
+
+namespace fileFormats
+{
+
+/*---------------------------------------------------------------------------*\
+                Class fileFormats::ensightMeshReader Declaration
+\*---------------------------------------------------------------------------*/
+
+class ensightMeshReader
+:
+    public meshReader
+{
+    // Private Data
+
+        //- Merge distance
+        const scalar mergeTol_;
+
+        //- Check and correct handedness
+        const bool setHandedness_;
+
+
+protected:
+
+    // Protected Data
+
+        //- mesh point to original node_id
+        labelList nodeIds_;
+
+        //- mesh cell to original element_id
+        labelList elementIds_;
+
+
+    // Protected Member Functions
+
+        //- Rotate face so lowest vertex is first
+        const face& rotateFace
+        (
+            const face& f,
+            face& rotatedFace
+        ) const;
+
+        //- Read set of vertices. Optional mapping
+        void readVerts
+        (
+            ensightReadFile& is,
+            const label nVerts,
+            const Map<label>& nodeIdToPoints,
+            DynamicList<label>& verts
+        ) const;
+
+        //- Read set of element/node IDs
+        void readIDs
+        (
+            ensightReadFile& is,
+            const bool doRead,
+            const label nShapes,
+            labelList& foamToElem,
+            Map<label>& elemToFoam
+        ) const;
+
+        //- Swap handedness of hex if needed
+        void setHandedness
+        (
+            const cellModel& model,
+            DynamicList<label>& verts,
+            const pointField& points
+        ) const;
+
+        //- Read a single part until eof (return true) or until start of next
+        //  part (return false)
+        bool readGoldPart
+        (
+            ensightReadFile& is,
+            const bool read_node_ids,
+            const bool read_elem_ids,
+
+            pointField& points,
+            labelList& pointToNodeIds,
+            Map<label>& nodeIdToPoints,
+
+            // 3D-elems : cells (cell-to-faces)
+            faceListList& cellFaces,
+            labelList& cellToElemIds,
+            Map<label>& elemIdToCells,
+
+            // 2D-elems : faces
+            faceList& faces,
+            labelList& faceToElemIDs,
+            Map<label>& elemIdToFaces
+        ) const;
+
+        //- Read the mesh from the file(s)
+        virtual bool readGeometry(const scalar scaleFactor = 1.0);
+
+
+public:
+
+    //- Runtime type information
+    TypeName("ensightMeshReader");
+
+
+    // Constructors
+
+        //- Construct from case name
+        ensightMeshReader
+        (
+            const fileName& geomFile,
+            const objectRegistry& registry,
+            const scalar mergeTol = SMALL,
+            const scalar scaleFactor = 1.0,
+            const bool setHandedness = true
+        );
+
+
+    //- Destructor
+    virtual ~ensightMeshReader() = default;
+
+
+    // Access
+
+        //- Original node id (if supplied) or -1
+        const labelList& nodeIds() const noexcept
+        {
+            return nodeIds_;
+        }
+
+        //- Original element id (if supplied) or -1
+        const labelList& elementIds() const noexcept
+        {
+            return elementIds_;
+        }
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace fileFormats
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

applications/utilities/mesh/conversion/ensightToFoam/ensightToFoam.C

@@ -0,0 +1,118 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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
+    ensightToFoam
+
+Group
+    grpMeshConversionUtilities
+
+Description
+    Convert an Ensight Gold mesh into OpenFOAM format.
+
+Usage
+    \b ensightToFoam [OPTION] \<ensightGeometryFile\>
+
+    Options:
+      - \par -mergeTol \<factor\>
+        Specify an alternative merging tolerance as a fraction of
+        the bounding box of the points.
+
+      - \par -scale \<factor\>
+        Specify an optional geometry scaling factor.
+
+      - \par -keepHandedness
+        Do not automatically flip negative volume cells
+
+See also
+    Foam::meshReader and Foam::fileFormats::STARCDMeshReader
+
+\*---------------------------------------------------------------------------*/
+
+#include "argList.H"
+#include "Time.H"
+#include "ensightMeshReader.H"
+
+using namespace Foam;
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+int main(int argc, char *argv[])
+{
+    argList::addNote
+    (
+        "Convert Ensight mesh to OpenFOAM"
+    );
+
+    argList::noParallel();
+    argList::addArgument(".geo file", "The file containing the geometry");
+    argList::addOption
+    (
+        "mergeTol",
+        "factor",
+        "Merge tolerance as a fraction of bounding box - 0 to disable merging"
+    );
+    argList::addOption
+    (
+        "scale",
+        "factor",
+        "Geometry scaling factor - default is 1"
+    );
+    argList::addBoolOption
+    (
+        "keepHandedness",
+        "Do not automatically flip inverted cells"
+        " (default is to do a geometric test)"
+    );
+
+    argList args(argc, argv);
+    Time runTime(args.rootPath(), args.caseName());
+
+    // Increase the precision of the points data
+    IOstream::defaultPrecision(max(10u, IOstream::defaultPrecision()));
+
+    const fileName geomFile(args.get<fileName>(1));
+
+    {
+        fileFormats::ensightMeshReader reader
+        (
+            geomFile,
+            runTime,
+            args.getOrDefault<scalar>("mergeTol", 1e-10),
+            args.getOrDefault<scalar>("scale", 1.0),
+            args.found("keepHandedness")
+        );
+
+        autoPtr<polyMesh> mesh = reader.mesh(runTime);
+        mesh().setInstance(runTime.constant());
+        mesh().write();
+    }
+
+    Info<< "\nEnd\n" << endl;
+
+    return 0;
+}
+
+// ************************************************************************* //

applications/utilities/mesh/conversion/foamToSurface/foamToSurface.C

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2020-2021 OpenCFD Ltd.
+    Copyright (C) 2020-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -87,8 +87,8 @@ int main(int argc, char *argv[])
     const scalar scaleFactor = args.getOrDefault<scalar>("scale", 0);
     const bool doTriangulate = args.found("tri");
 
-    fileName exportBase = exportName.lessExt();
-    word exportExt = exportName.ext();
+    const fileName exportBase = exportName.lessExt();
+    const word exportExt = exportName.ext();
 
     if (!meshedSurface::canWriteType(exportExt, true))
     {

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)
     {
-        List<polyPatch*> newPatchPtrList((mesh.boundaryMesh().size() - 1));
+        polyPatchList newPatches((mesh.boundaryMesh().size() - 1));
         label newPatchi = 0;
         forAll(mesh.boundaryMesh(), patchi)
         {
@@ -1686,18 +1686,21 @@ int main(int argc, char *argv[])
             {
                 const polyPatch& patch = mesh.boundaryMesh()[patchi];
 
-                newPatchPtrList[newPatchi] = patch.clone
+                newPatches.set
                 (
-                    mesh.boundaryMesh(),
                     newPatchi,
-                    patch.size(),
-                    patch.start()
-                ).ptr();
-
-                newPatchi++;
+                    patch.clone
+                    (
+                        mesh.boundaryMesh(),
+                        newPatchi,
+                        patch.size(),
+                        patch.start()
+                    )
+                );
+                ++newPatchi;
             }
         }
-        repatcher.changePatches(newPatchPtrList);
+        repatcher.changePatches(newPatches);
     }
 
     // Set the precision of the points data to 10

applications/utilities/mesh/generation/blockMesh/mergePatchPairs.H

@@ -1,30 +1,56 @@
-// Handle merging of patch pairs
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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
+
+\*---------------------------------------------------------------------------*/
+
 {
     wordPairList mergePatchPairs;
 
-    // Read in a list of dictionaries for the merge patch pairs
+    // Read in a list of merge patch pairs
     if
     (
         meshDict.readIfPresent("mergePatchPairs", mergePatchPairs)
      && mergePatchPairs.size()
     )
     {
-        Info<< "Creating merge patch pairs" << nl << endl;
+        Info<< "Merging " << mergePatchPairs.size() << " patch pairs" << nl;
 
-        Info<< "Adding point and face zones" << endl;
+        // Cleanup
+        wordHashSet cleanupPatches(4*mergePatchPairs.size());
+        wordHashSet cleanupPointZones(2*mergePatchPairs.size());
+        wordHashSet cleanupFaceZones(2*mergePatchPairs.size());
+
+        Info<< "    Adding point and face zones" << endl;
         {
-            auto& pzs = mesh.pointZones();
-            pzs.clearAddressing();
-            auto& fzs = mesh.faceZones();
-            fzs.clearAddressing();
+            const auto& pbm = mesh.boundaryMesh();
+
+            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()
-                  + name(pairi)
+                  + Foam::name(pairi)
                 );
 
                 // An empty zone for cut points
@@ -37,40 +63,35 @@
                         pzs
                     )
                 );
+                cleanupPointZones.insert(pzs.last().name());
 
-                // Master patch
-                const word masterPatchName(mergePatchPairs[pairi].first());
-                const polyPatch& masterPatch =
-                    mesh.boundaryMesh()[masterPatchName];
-
+                // Coupling side 0 (master)
                 fzs.append
                 (
                     new faceZone
                     (
-                        mergeName + "MasterZone",
-                        identity(masterPatch.range()),
+                        mergeName + "Side0Zone",
+                        identity(patch0.range()),
                         false, // none are flipped
                         fzs.size(),
                         fzs
                     )
                 );
+                cleanupFaceZones.insert(fzs.last().name());
 
-                // Slave patch
-                const word slavePatchName(mergePatchPairs[pairi].second());
-                const polyPatch& slavePatch =
-                    mesh.boundaryMesh()[slavePatchName];
-
+                // Coupling side 1 (slave)
                 fzs.append
                 (
                     new faceZone
                     (
-                        mergeName + "SlaveZone",
-                        identity(slavePatch.range()),
+                        mergeName + "Side1Zone",
+                        identity(patch1.range()),
                         false, // none are flipped
                         fzs.size(),
                         fzs
                     )
                 );
+                cleanupFaceZones.insert(fzs.last().name());
 
                 // An empty zone for cut faces
                 fzs.append
@@ -82,35 +103,38 @@
                         fzs
                     )
                 );
-            }  // end of all merge pairs
+                cleanupFaceZones.insert(fzs.last().name());
+            }
         }
 
 
-
-        Info<< "Creating attachPolyTopoChanger" << endl;
+        Info<< "    Merging with attachPolyTopoChanger" << endl;
         attachPolyTopoChanger polyMeshAttacher(mesh);
-        polyMeshAttacher.setSize(mergePatchPairs.size());
+        polyMeshAttacher.resize(1);
 
         forAll(mergePatchPairs, pairi)
         {
+            cleanupPatches.insert(mergePatchPairs[pairi].first());
+            cleanupPatches.insert(mergePatchPairs[pairi].second());
+
             const word mergeName
             (
                 mergePatchPairs[pairi].first()
               + mergePatchPairs[pairi].second()
-              + name(pairi)
+              + Foam::name(pairi)
             );
 
             // Add the sliding interface mesh modifier
             polyMeshAttacher.set
             (
-                pairi,
+                0,
                 new slidingInterface
                 (
-                    "couple" + name(pairi),
+                    "couple" + Foam::name(pairi),
                     pairi,
                     polyMeshAttacher,
-                    mergeName + "MasterZone",
-                    mergeName + "SlaveZone",
+                    mergeName + "Side0Zone",
+                    mergeName + "Side1Zone",
                     mergeName + "CutPointZone",
                     mergeName + "CutFaceZone",
                     mergePatchPairs[pairi].first(),
@@ -120,12 +144,135 @@
                     intersection::VISIBLE
                 )
             );
+
+            polyMeshAttacher.attach(false);  // Do not yet remove empty patches
         }
 
-        polyMeshAttacher.attach(true);
+        // 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;
+            }
+        }
     }
     else
     {
-        Info<< nl << "There are no merge patch pairs" << endl;
+        Info<< "No patch pairs to merge" << endl;
     }
 }
+
+
+// ************************************************************************* //

applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C

@@ -538,8 +538,11 @@ int main(int argc, char *argv[])
 
         // Add any patches.
 
-        label nAdded = nPatches - mesh.boundaryMesh().size();
-        reduce(nAdded, sumOp<label>());
+        const label nAdded = returnReduce
+        (
+            nPatches - mesh.boundaryMesh().size(),
+            sumOp<label>()
+        );
 
         Info<< "Adding overall " << nAdded << " processor patches." << endl;
 
@@ -946,9 +949,8 @@ int main(int argc, char *argv[])
 
         // Put all modifications into meshMod
         bool anyChange = collapser.setRefinement(allPointInfo, meshMod);
-        reduce(anyChange, orOp<bool>());
 
-        if (anyChange)
+        if (returnReduceOr(anyChange))
         {
             // Construct new mesh from polyTopoChange.
             autoPtr<mapPolyMesh> map = meshMod.changeMesh(mesh, false);
@@ -1118,8 +1120,7 @@ int main(int argc, char *argv[])
     processorMeshes::removeFiles(mesh);
 
     // Need writing cellSet
-    label nAdded = returnReduce(addedCellsSet.size(), sumOp<label>());
-    if (nAdded > 0)
+    if (returnReduceOr(addedCellsSet.size()))
     {
         cellSet addedCells(mesh, "addedCells", addedCellsSet);
         Info<< "Writing added cells to cellSet " << addedCells.name()

applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C

@@ -345,7 +345,7 @@ void deleteEmptyPatches(fvMesh& mesh)
             else
             {
                 // Common patch.
-                if (returnReduce(patches[patchi].empty(), andOp<bool>()))
+                if (returnReduceAnd(patches[patchi].empty()))
                 {
                     Pout<< "Deleting patch " << patchi
                         << " name:" << patches[patchi].name()
@@ -661,8 +661,8 @@ void countExtrudePatches
     }
     // Synchronise decision. Actual numbers are not important, just make
     // sure that they're > 0 on all processors.
-    Pstream::listCombineAllGather(zoneSidePatch, plusEqOp<label>());
-    Pstream::listCombineAllGather(zoneZonePatch, plusEqOp<label>());
+    Pstream::listCombineReduce(zoneSidePatch, plusEqOp<label>());
+    Pstream::listCombineReduce(zoneZonePatch, plusEqOp<label>());
 }
 
 
@@ -1848,7 +1848,7 @@ int main(int argc, char *argv[])
     const primitiveFacePatch extrudePatch(std::move(zoneFaces), mesh.points());
 
 
-    Pstream::listCombineAllGather(isInternal, orEqOp<bool>());
+    Pstream::listCombineReduce(isInternal, orEqOp<bool>());
 
     // Check zone either all internal or all external faces
     checkZoneInside(mesh, zoneNames, zoneID, extrudeMeshFaces, isInternal);
@@ -2309,7 +2309,7 @@ int main(int argc, char *argv[])
         }
 
         // Reduce
-        Pstream::mapCombineAllGather(globalSum, plusEqOp<point>());
+        Pstream::mapCombineReduce(globalSum, plusEqOp<point>());
 
         forAll(localToGlobalRegion, localRegionI)
         {

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C

@@ -588,9 +588,8 @@ Foam::label Foam::DistributedDelaunayMesh<Triangulation>::referVertices
     reduce(preInsertionSize, sumOp<label>());
     reduce(postInsertionSize, sumOp<label>());
 
-    label nTotalToInsert = referredVertices.size();
-
-    reduce(nTotalToInsert, sumOp<label>());
+    label nTotalToInsert =
+        returnReduce(referredVertices.size(), sumOp<label>());
 
     if (preInsertionSize + nTotalToInsert != postInsertionSize)
     {

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C

@@ -167,14 +167,7 @@ void Foam::backgroundMeshDecomposition::initialRefinement()
             {
                 if (volumeStatus[celli] == volumeType::UNKNOWN)
                 {
-                    treeBoundBox cellBb
-                    (
-                        mesh_.cells()[celli].points
-                        (
-                            mesh_.faces(),
-                            mesh_.points()
-                        )
-                    );
+                    treeBoundBox cellBb(mesh_.cells()[celli].box(mesh_));
 
                     if (geometry.overlaps(cellBb))
                     {
@@ -224,7 +217,7 @@ void Foam::backgroundMeshDecomposition::initialRefinement()
                     );
                 }
 
-                if (returnReduce(newCellsToRefine.size(), sumOp<label>()) == 0)
+                if (returnReduceAnd(newCellsToRefine.empty()))
                 {
                     break;
                 }
@@ -286,14 +279,7 @@ void Foam::backgroundMeshDecomposition::initialRefinement()
             {
                 if (volumeStatus[celli] == volumeType::UNKNOWN)
                 {
-                    treeBoundBox cellBb
-                    (
-                        mesh_.cells()[celli].points
-                        (
-                            mesh_.faces(),
-                            mesh_.points()
-                        )
-                    );
+                    treeBoundBox cellBb(mesh_.cells()[celli].box(mesh_));
 
                     if (geometry.overlaps(cellBb))
                     {
@@ -512,14 +498,7 @@ bool Foam::backgroundMeshDecomposition::refineCell
 
 //    const conformationSurfaces& geometry = geometryToConformTo_;
 
-    treeBoundBox cellBb
-    (
-        mesh_.cells()[celli].points
-        (
-            mesh_.faces(),
-            mesh_.points()
-        )
-    );
+    treeBoundBox cellBb(mesh_.cells()[celli].box(mesh_));
 
     weightEstimate = 1.0;
 
@@ -899,7 +878,7 @@ Foam::backgroundMeshDecomposition::distribute
             }
         }
 
-        if (returnReduce(cellsToRefine.size(), sumOp<label>()) == 0)
+        if (returnReduceAnd(cellsToRefine.empty()))
         {
             break;
         }

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl.H

@@ -153,7 +153,7 @@ public:
                 return name_;
             }
 
-            const Switch& forceInitialPointInsertion() const
+            Switch forceInitialPointInsertion() const noexcept
             {
                 return forceInitialPointInsertion_;
             }

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/controlMeshRefinement/controlMeshRefinement.C

@@ -92,9 +92,7 @@ bool Foam::controlMeshRefinement::detectEdge
             magSqr(a - b) < tolSqr
         )
         {
-            pointFound.setPoint(midPoint);
-            pointFound.setHit();
-
+            pointFound.hitPoint(midPoint);
             return true;
         }
 
@@ -264,7 +262,7 @@ void Foam::controlMeshRefinement::initialMeshPopulation
         const cellSizeAndAlignmentControl& controlFunction =
             controlFunctions[fI];
 
-        const Switch& forceInsertion =
+        const Switch forceInsertion =
             controlFunction.forceInitialPointInsertion();
 
         Info<< "Inserting points from " << controlFunction.name()
@@ -450,7 +448,7 @@ void Foam::controlMeshRefinement::initialMeshPopulation
         const cellSizeAndAlignmentControl& controlFunction =
             controlFunctions[fI];
 
-        const Switch& forceInsertion =
+        const Switch forceInsertion =
             controlFunction.forceInitialPointInsertion();
 
         Info<< "Inserting points from " << controlFunction.name()