BUG: integratedNonUniformTable: correct offsets (fixes #2614)

- with geometryOrder=1, calculate the edge normals from the adjacent
  faces (area-weighted, inverse distance squared) and also
  use that for the Le() calculation.

  Includes the contributions from processor edge neighbours, so it
  should be consistent on both sides.

  This new method (consider as 'beta') contrasts with the current
  standard method that first calculates area-weighted point normals
  and uses the average of them for the edge normal.

  Enable for testing either with a controlDict OptimisationSwitch entry
  "fa:geometryOrder", or on the command-line:

      solverName -opt-switch=fa:geometryOrder=1

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/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/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/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/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/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/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/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/openmp/Make/options

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

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/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/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/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/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/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/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/foamyMesh/foamyQuadMesh/foamyQuadMesh.C

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2013-2016 OpenFOAM Foundation
-    Copyright (C) 2021 OpenCFD Ltd.
+    Copyright (C) 2021-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -167,28 +167,32 @@ int main(int argc, char *argv[])
     );
 
     Info<< "Constructing patches." << endl;
-    List<polyPatch*> patches(poly2DMesh.patchNames().size());
-    label countPatches = 0;
+    polyPatchList newPatches(poly2DMesh.patchNames().size());
+    label nPatches = 0;
 
-    forAll(patches, patchi)
+    forAll(newPatches, patchi)
     {
         if (poly2DMesh.patchSizes()[patchi] != 0)
         {
-            patches[countPatches] = new polyPatch
+            newPatches.set
             (
-                poly2DMesh.patchNames()[patchi],
-                poly2DMesh.patchSizes()[patchi],
-                poly2DMesh.patchStarts()[patchi],
-                countPatches,
-                pMesh.boundaryMesh(),
-                word::null
+                nPatches,
+                new polyPatch
+                (
+                    poly2DMesh.patchNames()[patchi],
+                    poly2DMesh.patchSizes()[patchi],
+                    poly2DMesh.patchStarts()[patchi],
+                    nPatches,
+                    pMesh.boundaryMesh(),
+                    word::null
+                )
             );
 
-            countPatches++;
+            ++nPatches;
         }
     }
-    patches.setSize(countPatches);
-    pMesh.addPatches(patches);
+    newPatches.resize(nPatches);
+    pMesh.addPatches(newPatches);
 
     if (extrude)
     {

applications/utilities/mesh/manipulation/autoPatch/autoPatch.C

@@ -191,7 +191,7 @@ int main(int argc, char *argv[])
     const PtrList<boundaryPatch>& patches = bMesh.patches();
 
     // Create new list of patches with old ones first
-    List<polyPatch*> newPatchPtrList(patches.size());
+    polyPatchList newPatches(patches.size());
 
     newPatchi = 0;
 
@@ -200,34 +200,41 @@ int main(int argc, char *argv[])
     {
         const polyPatch& patch = mesh.boundaryMesh()[patchi];
 
-        newPatchPtrList[newPatchi] =
+        newPatches.set
+        (
+            newPatchi,
             patch.clone
             (
                 mesh.boundaryMesh(),
                 newPatchi,
                 patch.size(),
                 patch.start()
-            ).ptr();
+            )
+        );
 
-        newPatchi++;
+        ++newPatchi;
     }
 
     // Add new ones with empty size.
     for (label patchi = newPatchi; patchi < patches.size(); patchi++)
     {
-        const boundaryPatch& bp = patches[patchi];
+        const word& patchName = patches[patchi].name();
 
-        newPatchPtrList[newPatchi] = polyPatch::New
+        newPatches.set
         (
-            polyPatch::typeName,
-            bp.name(),
-            0,
-            mesh.nFaces(),
             newPatchi,
-            mesh.boundaryMesh()
-        ).ptr();
+            polyPatch::New
+            (
+                polyPatch::typeName,
+                patchName,
+                0,
+                mesh.nFaces(),
+                newPatchi,
+                mesh.boundaryMesh()
+            )
+        );
 
-        newPatchi++;
+        ++newPatchi;
     }
 
     if (!overwrite)
@@ -238,7 +245,7 @@ int main(int argc, char *argv[])
 
     // Change patches
     repatchPolyTopoChanger polyMeshRepatcher(mesh);
-    polyMeshRepatcher.changePatches(newPatchPtrList);
+    polyMeshRepatcher.changePatches(newPatches);
 
 
     // Change face ordering

applications/utilities/mesh/manipulation/checkMesh/checkTopology.C

@@ -40,6 +40,7 @@ License
 #include "vtkSurfaceWriter.H"
 #include "checkTools.H"
 #include "treeBoundBox.H"
+#include "syncTools.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -48,25 +49,113 @@ void Foam::checkPatch
 (
     const bool allGeometry,
     const word& name,
+    const polyMesh& mesh,
     const PatchType& pp,
+    const labelList& meshFaces,
+    const labelList& meshEdges,
     pointSet& points
 )
 {
+    typedef typename PatchType::surfaceTopo TopoType;
+
+    const label globalSize = returnReduce(pp.size(), sumOp<label>());
+
     Info<< "    "
         << setw(20) << name
-        << setw(9) << returnReduce(pp.size(), sumOp<label>())
+        << setw(9) << globalSize
         << setw(9) << returnReduce(pp.nPoints(), sumOp<label>());
 
-    if (!Pstream::parRun())
+    if (globalSize == 0)
+    {
+        Info<< setw(34) << "ok (empty)";
+    }
+    else if (Pstream::parRun())
+    {
+        // Parallel - use mesh edges
+        // - no check for point-pinch
+        // - no check for consistent orientation (if that is posible to
+        //   check?)
+
+        // (see addPatchCellLayer::globalEdgeFaces)
+        // From mesh edge to global face labels. Non-empty sublists only for
+        // pp edges.
+        labelListList globalEdgeFaces(mesh.nEdges());
+
+        const labelListList& edgeFaces = pp.edgeFaces();
+
+        // Global numbering
+        const globalIndex globalFaces(mesh.nFaces());
+
+        forAll(edgeFaces, edgei)
+        {
+            label meshEdgei = meshEdges[edgei];
+            const labelList& eFaces = edgeFaces[edgei];
+
+            // Store face and processor as unique tag.
+            labelList& globalEFaces = globalEdgeFaces[meshEdgei];
+            globalEFaces.setSize(eFaces.size());
+            forAll(eFaces, i)
+            {
+                globalEFaces[i] = globalFaces.toGlobal(meshFaces[eFaces[i]]);
+            }
+            //Pout<< "At edge:" << meshEdgei
+            //    << " ctr:" << mesh.edges()[meshEdgei].centre(mesh.points())
+            //    << " have eFaces:" << globalEdgeFaces[meshEdgei]
+            //    << endl;
+        }
+
+        //DebugVar(globalEdgeFaces);
+
+
+        // Synchronise across coupled edges.
+        syncTools::syncEdgeList
+        (
+            mesh,
+            globalEdgeFaces,
+            ListOps::uniqueEqOp<label>(),
+            labelList()             // null value
+        );
+
+        //DebugVar(globalEdgeFaces);
+        
+        label labelTyp = TopoType::MANIFOLD;
+        forAll(meshEdges, edgei)
+        {
+            const label meshEdgei = meshEdges[edgei];
+            const labelList& globalEFaces = globalEdgeFaces[meshEdgei];
+            if (globalEFaces.size() == 1)
+            {
+                //points.insert(mesh.edges()[meshEdgei]);
+                labelTyp = max(labelTyp, TopoType::OPEN);
+            }
+            else if (globalEFaces.size() == 0 || globalEFaces.size() > 2)
+            {
+                points.insert(mesh.edges()[meshEdgei]);
+                labelTyp = max(labelTyp, TopoType::ILLEGAL);
+            }
+        }
+        reduce(labelTyp, maxOp<label>());
+
+        if (labelTyp == TopoType::MANIFOLD)
+        {
+            Info<< setw(34) << "ok (closed singly connected)";
+        }
+        else if (labelTyp == TopoType::OPEN)
+        {
+            Info<< setw(34)
+                << "ok (non-closed singly connected)";
+        }
+        else
+        {
+            Info<< setw(34)
+                << "multiply connected (shared edge)";
+        }
+    }
+    else
     {
-        typedef typename PatchType::surfaceTopo TopoType;
         TopoType pTyp = pp.surfaceType();
 
-        if (pp.empty())
-        {
-            Info<< setw(34) << "ok (empty)";
-        }
-        else if (pTyp == TopoType::MANIFOLD)
+        if (pTyp == TopoType::MANIFOLD)
         {
             if (pp.checkPointManifold(true, &points))
             {
@@ -549,15 +638,8 @@ Foam::label Foam::checkTopology
     );
 
     {
-        if (!Pstream::parRun())
-        {
-            Info<< "\nChecking patch topology for multiply connected"
+        Info<< "\nChecking patch topology for multiply connected"
                 << " surfaces..." << endl;
-        }
-        else
-        {
-            Info<< "\nChecking basic patch addressing..." << endl;
-        }
 
         const polyBoundaryMesh& patches = mesh.boundaryMesh();
 
@@ -566,11 +648,8 @@ Foam::label Foam::checkTopology
         Info<< "    "
             << setw(20) << "Patch"
             << setw(9) << "Faces"
-            << setw(9) << "Points";
-        if (!Pstream::parRun())
-        {
-            Info<< setw(34) << "Surface topology";
-        }
+            << setw(9) << "Points"
+            << "Surface topology";
         if (allGeometry)
         {
             Info<< " Bounding box";
@@ -583,7 +662,16 @@ Foam::label Foam::checkTopology
 
             if (!isA<processorPolyPatch>(pp))
             {
-                checkPatch(allGeometry, pp.name(), pp, points);
+                checkPatch
+                (
+                    allGeometry,
+                    pp.name(),
+                    mesh,
+                    pp,
+                    identity(pp.size(), pp.start()),
+                    pp.meshEdges(),
+                    points
+                );
                 Info<< endl;
             }
         }
@@ -592,15 +680,8 @@ Foam::label Foam::checkTopology
     }
 
     {
-        if (!Pstream::parRun())
-        {
-            Info<< "\nChecking faceZone topology for multiply connected"
-                << " surfaces..." << endl;
-        }
-        else
-        {
-            Info<< "\nChecking basic faceZone addressing..." << endl;
-        }
+        Info<< "\nChecking faceZone topology for multiply connected"
+            << " surfaces..." << endl;
 
         Pout.setf(ios_base::left);
 
@@ -611,12 +692,8 @@ Foam::label Foam::checkTopology
             Info<< "    "
                 << setw(20) << "FaceZone"
                 << setw(9) << "Faces"
-                << setw(9) << "Points";
-
-            if (!Pstream::parRun())
-            {
-                Info<< setw(34) << "Surface topology";
-            }
+                << setw(9) << "Points"
+                << setw(34) << "Surface topology";
             if (allGeometry)
             {
                 Info<< " Bounding box";
@@ -625,7 +702,16 @@ Foam::label Foam::checkTopology
 
             for (const faceZone& fz : faceZones)
             {
-                checkPatch(allGeometry, fz.name(), fz(), points);
+                checkPatch
+                (
+                    allGeometry,
+                    fz.name(),
+                    mesh,
+                    fz(),           // patch
+                    fz,             // mesh face labels
+                    fz.meshEdges(), // mesh edge labels
+                    points
+                );
                 Info<< endl;
             }
         }

applications/utilities/mesh/manipulation/checkMesh/checkTopology.H

@@ -1,4 +1,4 @@
-#include "label.H"
+#include "labelList.H"
 #include "autoPtr.H"
 
 namespace Foam
@@ -14,7 +14,10 @@ namespace Foam
     (
         const bool allGeometry,
         const word& name,
+        const polyMesh& mesh,
         const PatchType& pp,
+        const labelList& meshFaces,
+        const labelList& meshEdges,
         pointSet& points
     );
 

applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.C

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2016 OpenCFD Ltd.
+    Copyright (C) 2016-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -136,46 +136,55 @@ void Foam::mergePolyMesh::sortProcessorPatches()
 
     const polyBoundaryMesh& oldPatches = boundaryMesh();
 
-    DynamicList<polyPatch*> newPatches(oldPatches.size());
+    polyPatchList newPatches(oldPatches.size());
 
     labelList oldToSorted(oldPatches.size());
 
+    label nPatches = 0;
+
     forAll(oldPatches, patchi)
     {
         const polyPatch& pp = oldPatches[patchi];
 
         if (!isA<processorPolyPatch>(pp))
         {
-            oldToSorted[patchi] = newPatches.size();
-            newPatches.append
+            newPatches.set
             (
+                nPatches,
                 pp.clone
                 (
                     oldPatches,
-                    oldToSorted[patchi],
+                    nPatches,
                     0,
                     nInternalFaces()
-                ).ptr()
+                )
             );
+
+            oldToSorted[patchi] = nPatches;
+            ++nPatches;
         }
     }
+
     forAll(oldPatches, patchi)
     {
         const polyPatch& pp = oldPatches[patchi];
 
         if (isA<processorPolyPatch>(pp))
         {
-            oldToSorted[patchi] = newPatches.size();
-            newPatches.append
+            newPatches.set
             (
+                nPatches,
                 pp.clone
                 (
                     oldPatches,
                     oldToSorted[patchi],
                     0,
                     nInternalFaces()
-                ).ptr()
+                )
             );
+
+            oldToSorted[patchi] = nPatches;
+            ++nPatches;
         }
     }
 
@@ -461,7 +470,7 @@ void Foam::mergePolyMesh::merge()
     {
         Info<< "Copying old patches" << endl;
 
-        List<polyPatch*> newPatches(patchNames_.size());
+        polyPatchList newPatches(patchNames_.size());
 
         const polyBoundaryMesh& oldPatches = boundaryMesh();
 
@@ -470,7 +479,11 @@ void Foam::mergePolyMesh::merge()
 
         for (patchi = 0; patchi < oldPatches.size(); patchi++)
         {
-            newPatches[patchi] = oldPatches[patchi].clone(oldPatches).ptr();
+            newPatches.set
+            (
+                patchi,
+                oldPatches[patchi].clone(oldPatches)
+            );
         }
 
         Info<< "Adding new patches. " << endl;
@@ -487,15 +500,18 @@ void Foam::mergePolyMesh::merge()
             dict.set("nFaces", 0);
             dict.set("startFace", endOfLastPatch);
 
-            newPatches[patchi] =
+            newPatches.set
             (
-                polyPatch::New
+                patchi,
                 (
-                    patchNames_[patchi],
-                    dict,
-                    patchi,
-                    oldPatches
-                ).ptr()
+                    polyPatch::New
+                    (
+                        patchNames_[patchi],
+                        dict,
+                        patchi,
+                        oldPatches
+                    )
+                )
             );
         }
 

applications/utilities/mesh/manipulation/mirrorMesh/mirrorFvMesh.C

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2017-2018 OpenCFD Ltd.
+    Copyright (C) 2017-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -404,20 +404,24 @@ Foam::mirrorFvMesh::mirrorFvMesh
     fvMesh& pMesh = mirrorMeshPtr_();
 
     // Add the boundary patches
-    List<polyPatch*> p(newPatchSizes.size());
+    polyPatchList newPatches(newPatchSizes.size());
 
-    forAll(p, patchi)
+    forAll(newPatches, patchi)
     {
-        p[patchi] = boundaryMesh()[patchi].clone
+        newPatches.set
         (
-            pMesh.boundaryMesh(),
             patchi,
-            newPatchSizes[patchi],
-            newPatchStarts[patchi]
-        ).ptr();
+            boundaryMesh()[patchi].clone
+            (
+                pMesh.boundaryMesh(),
+                patchi,
+                newPatchSizes[patchi],
+                newPatchStarts[patchi]
+            )
+        );
     }
 
-    pMesh.addPatches(p);
+    pMesh.addPatches(newPatches);
 }
 
 

applications/utilities/mesh/manipulation/renumberMesh/Make/options

@@ -3,7 +3,7 @@
  */
 
 EXE_INC = \
-    ${COMP_FLAGS} \
+    $(COMP_FLAGS) \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \

applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2017-2020 OpenCFD Ltd.
+    Copyright (C) 2017-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -564,7 +564,7 @@ int main(int argc, char *argv[])
 
             mesh.faceZones()
             (
-                mergePatchName + "MasterZone",
+                mergePatchName + "Side0Zone",
                 true // verbose
             ).resetAddressing(std::move(faceIds), false);
 
@@ -574,7 +574,7 @@ int main(int argc, char *argv[])
 
             mesh.faceZones()
             (
-                mergePatchName + "SlaveZone",
+                mergePatchName + "Side1Zone",
                 true // verbose
             ).resetAddressing(std::move(faceIds), false);
 
@@ -595,8 +595,8 @@ int main(int argc, char *argv[])
                     "couple" + Foam::name(actioni),
                     0,
                     stitcher,
-                    mergePatchName + "MasterZone",
-                    mergePatchName + "SlaveZone",
+                    mergePatchName + "Side0Zone",
+                    mergePatchName + "Side1Zone",
                     mergePatchName + "CutPointZone",
                     cutZoneName,
                     masterPatchName,

applications/utilities/mesh/manipulation/transformPoints/transformPoints.C

@@ -62,8 +62,8 @@ Usage
     -rotate-z angle
         Rotate (degrees) about z-axis.
 
-     or -yawPitchRoll (yawdegrees pitchdegrees rolldegrees)
-     or -rollPitchYaw (rolldegrees pitchdegrees yawdegrees)
+     or -yawPitchRoll : (yaw pitch roll) degrees
+     or -rollPitchYaw : (roll pitch yaw) degrees
 
     -scale scalar|vector
         Scale the points by the given scalar or vector on output.
@@ -268,15 +268,18 @@ int main(int argc, char *argv[])
     );
     argList::addBoolOption
     (
-        "auto-origin",
-        "Use bounding box centre as origin for rotations"
+        "auto-centre",
+        "Use bounding box centre as centre for rotations"
     );
     argList::addOption
     (
-        "origin",
+        "centre",
         "point",
-        "Use specified <point> as origin for rotations"
+        "Use specified <point> as centre for rotations"
     );
+    argList::addOptionCompat("auto-centre", {"auto-origin", 2206});
+    argList::addOptionCompat("centre", {"origin", 2206});
+
     argList::addOption
     (
         "rotate",
@@ -437,18 +440,18 @@ int main(int argc, char *argv[])
             points += v;
         }
 
-        vector origin;
-        bool useOrigin = args.readIfPresent("origin", origin);
-        if (args.found("auto-origin") && !useOrigin)
+        vector rotationCentre;
+        bool useRotationCentre = args.readIfPresent("centre", rotationCentre);
+        if (args.found("auto-centre") && !useRotationCentre)
         {
-            useOrigin = true;
-            origin = boundBox(points).centre();
+            useRotationCentre = true;
+            rotationCentre = boundBox(points).centre();
         }
 
-        if (useOrigin)
+        if (useRotationCentre)
         {
-            Info<< "Set origin for rotations to " << origin << endl;
-            points -= origin;
+            Info<< "Set centre of rotation to " << rotationCentre << endl;
+            points -= rotationCentre;
         }
 
 
@@ -545,15 +548,15 @@ int main(int argc, char *argv[])
             }
         }
 
+        if (useRotationCentre)
+        {
+            Info<< "Unset centre of rotation from " << rotationCentre << endl;
+            points += rotationCentre;
+        }
+
         // Output scaling
         applyScaling(points, getScalingOpt("scale", args));
 
-        if (useOrigin)
-        {
-            Info<< "Unset origin for rotations from " << origin << endl;
-            points += origin;
-        }
-
 
         // Set the precision of the points data to 10
         IOstream::defaultPrecision(max(10u, IOstream::defaultPrecision()));

applications/utilities/miscellaneous/foamHasLibrary/foamHasLibrary.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.
@@ -65,8 +65,8 @@ int main(int argc, char *argv[])
     profiling::disable(); // No profiling output
     argList::noBanner();
     argList::noParallel();
+    argList::noFunctionObjects();
     argList::removeOption("case");
-    argList::removeOption("noFunctionObjects");
     argList::addBoolOption
     (
         "or",

applications/utilities/parallelProcessing/decomposePar/decomposePar.C

@@ -1014,7 +1014,9 @@ int main(int argc, char *argv[])
                                 Time::controlDictName,
                                 args.rootPath(),
                                 args.caseName()
-                              / ("processor" + Foam::name(proci))
+                              / ("processor" + Foam::name(proci)),
+                                args.allowFunctionObjects(),
+                                args.allowLibs()
                             )
                         );
                     }

applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C

@@ -244,7 +244,9 @@ int main(int argc, char *argv[])
             (
                 Time::controlDictName,
                 args.rootPath(),
-                args.caseName()/("processor" + Foam::name(proci))
+                args.caseName()/("processor" + Foam::name(proci)),
+                args.allowFunctionObjects(),
+                args.allowLibs()
             )
         );
     }

applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C

@@ -731,7 +731,9 @@ int main(int argc, char *argv[])
             (
                 Time::controlDictName,
                 args.rootPath(),
-                args.caseName()/("processor" + Foam::name(proci))
+                args.caseName()/("processor" + Foam::name(proci)),
+                args.allowFunctionObjects(),
+                args.allowLibs()
             )
         );
     }
@@ -1184,7 +1186,7 @@ int main(int argc, char *argv[])
                         false
                     );
 
-                    masterMeshPtr = fvMeshes[0];
+                    masterMeshPtr.cref(fvMeshes[0]);
                 }
 
 

applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C

@@ -168,7 +168,6 @@ int main(int argc, char *argv[])
 
     // Less frequently used - reduce some clutter
     argList::setAdvanced("decomposeParDict");
-    argList::setAdvanced("noFunctionObjects");
 
     argList::addVerboseOption("Additional verbosity");
 

applications/utilities/postProcessing/dataConversion/foamToEnsight/writeDimFields.H

@@ -65,7 +65,7 @@ label writeDimFields
 {
     typedef VolumeInternalField<Type> FieldType;
 
-    const fvMesh& mesh = dynamicCast<const fvMesh>(ensMesh.mesh());
+    const auto& mesh = refCast<const fvMesh>(ensMesh.mesh());
 
     label count = 0;
 

applications/utilities/postProcessing/dataConversion/foamToEnsight/writeVolFields.H

@@ -88,7 +88,7 @@ label writeVolFields
 {
     typedef VolumeField<Type> FieldType;
 
-    const fvMesh& mesh = dynamicCast<const fvMesh>(ensMesh.mesh());
+    const auto& mesh = refCast<const fvMesh>(ensMesh.mesh());
 
     label count = 0;
 

applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C

@@ -268,7 +268,6 @@ int main(int argc, char *argv[])
 
     // Less frequently used - reduce some clutter
     argList::setAdvanced("decomposeParDict");
-    argList::setAdvanced("noFunctionObjects");
 
     argList::addVerboseOption("Additional verbosity");
 

applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C

@@ -87,7 +87,6 @@ int main(int argc, char *argv[])
 
     // Less frequently used - reduce some clutter
     argList::setAdvanced("decomposeParDict");
-    argList::setAdvanced("noFunctionObjects");
 
     argList::addOption
     (

applications/utilities/postProcessing/miscellaneous/profilingSummary/profilingSummary.C

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

applications/utilities/preProcessing/mapFieldsPar/MapVolFields.H

@@ -43,7 +43,8 @@ void evaluateConstraintTypes(GeometricField<Type, fvPatchField, volMesh>& fld)
 {
     auto& fldBf = fld.boundaryFieldRef();
 
-    const UPstream::commsTypes commsType(UPstream::defaultCommsType);
+    const UPstream::commsTypes commsType = UPstream::defaultCommsType;
+    const label startOfRequests = UPstream::nRequests();
 
     if
     (
@@ -51,8 +52,6 @@ void evaluateConstraintTypes(GeometricField<Type, fvPatchField, volMesh>& fld)
      || commsType == UPstream::commsTypes::nonBlocking
     )
     {
-        const label startOfRequests = UPstream::nRequests();
-
         forAll(fldBf, patchi)
         {
             fvPatchField<Type>& tgtField = fldBf[patchi];
@@ -68,11 +67,7 @@ void evaluateConstraintTypes(GeometricField<Type, fvPatchField, volMesh>& fld)
         }
 
         // Wait for outstanding requests
-        if
-        (
-            UPstream::parRun()
-         && commsType == UPstream::commsTypes::nonBlocking
-        )
+        if (commsType == UPstream::commsTypes::nonBlocking)
         {
             UPstream::waitRequests(startOfRequests);
         }

applications/utilities/preProcessing/setExprBoundaryFields/setExprBoundaryFields.C

@@ -56,6 +56,7 @@ using namespace Foam;
 
 int main(int argc, char *argv[])
 {
+    // Normally without functionObjects, with -withFunctionObjects to enable
     argList::noFunctionObjects(true);
 
     // No -constant, no special treatment for 0/

applications/utilities/preProcessing/setExprFields/setExprFields.C

@@ -494,6 +494,7 @@ void evaluate
 
 int main(int argc, char *argv[])
 {
+    // Normally without functionObjects, with -withFunctionObjects to enable
     argList::noFunctionObjects(true);
 
     // No -constant, no special treatment for 0/
@@ -741,7 +742,7 @@ int main(int argc, char *argv[])
             );
         }
 
-        if (args.found("withFunctionObjects"))
+        if (args.allowFunctionObjects())
         {
             runTime.functionObjects().start();
         }

applications/utilities/preProcessing/setFields/Make/options

@@ -1,8 +1,10 @@
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/finiteArea/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude
 
 EXE_LIBS = \
     -lfiniteVolume \
+    -lfiniteArea \
     -lmeshTools \
     -lgenericPatchFields

applications/utilities/preProcessing/setFields/setFields.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.
@@ -37,214 +38,311 @@ Description
 #include "argList.H"
 #include "Time.H"
 #include "fvMesh.H"
+#include "faMesh.H"
 #include "topoSetSource.H"
 #include "cellSet.H"
 #include "faceSet.H"
 #include "volFields.H"
+#include "areaFields.H"
 
 using namespace Foam;
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+//- Simple tuple of field type and name (read from stream)
+class fieldDescription
+{
+    word type_;
+    word name_;
+
+public:
+
+    const word& type() const noexcept { return type_; }
+    const word& name() const noexcept { return name_; }
+
+    explicit fieldDescription(Istream& is)
+    {
+        is >> type_;
+        is >> name_;
+
+        // Eg, read as "volScalarFieldValue", but change to "volScalarField"
+        if (type_.ends_with("Value"))
+        {
+            type_.erase(type_.size()-5);
+        }
+    }
+};
+
+
+// Consume unused field information
+template<class Type>
+bool consumeUnusedType(const fieldDescription& fieldDesc, Istream& is)
+{
+    typedef GeometricField<Type, faPatchField, areaMesh> fieldType1;
+    typedef GeometricField<Type, fvPatchField, volMesh>  fieldType2;
+    //? typedef GeometricField<Type, faePatchField, areaMesh> fieldType3;
+    //? typedef GeometricField<Type, fvsPatchField, volMesh>  fieldType4;
+
+    if
+    (
+        fieldDesc.type() == fieldType1::typeName
+     || fieldDesc.type() == fieldType2::typeName
+    )
+    {
+        (void) pTraits<Type>(is);
+        return true;
+    }
+
+    return false;
+}
+
+
+// Consume unused field information
+static bool consumeUnused(const fieldDescription& fieldDesc, Istream& is)
+{
+    return
+    (
+        consumeUnusedType<scalar>(fieldDesc, is)
+     || consumeUnusedType<vector>(fieldDesc, is)
+     || consumeUnusedType<sphericalTensor>(fieldDesc, is)
+     || consumeUnusedType<symmTensor>(fieldDesc, is)
+     || consumeUnusedType<tensor>(fieldDesc, is)
+    );
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// Setting volume fields
 template<class Type>
 bool setCellFieldType
 (
-    const word& fieldTypeDesc,
+    const fieldDescription& fieldDesc,
     const fvMesh& mesh,
     const labelList& selectedCells,
-    Istream& fieldValueStream
+    Istream& is
 )
 {
     typedef GeometricField<Type, fvPatchField, volMesh> fieldType;
 
-    if (fieldTypeDesc != fieldType::typeName + "Value")
+    if (fieldDesc.type() != fieldType::typeName)
     {
         return false;
     }
 
-    word fieldName(fieldValueStream);
+    // Get value from stream
+    const Type fieldValue = pTraits<Type>(is);
+
 
     // Check the current time directory
     IOobject fieldHeader
     (
-        fieldName,
-        mesh.time().timeName(),
-        mesh,
+        fieldDesc.name(),
+        mesh.thisDb().time().timeName(),
+        mesh.thisDb(),
         IOobject::MUST_READ
     );
 
-    // Check the "constant" directory
-    if (!fieldHeader.typeHeaderOk<fieldType>(true))
+    bool found = fieldHeader.typeHeaderOk<fieldType>(true);
+
+    if (!found)
     {
+        // Fallback to "constant" directory
         fieldHeader = IOobject
         (
-            fieldName,
-            mesh.time().constant(),
-            mesh,
+            fieldDesc.name(),
+            mesh.thisDb().time().constant(),
+            mesh.thisDb(),
             IOobject::MUST_READ
         );
+        found = fieldHeader.typeHeaderOk<fieldType>(true);
     }
 
-    // Check field exists
-    if (fieldHeader.typeHeaderOk<fieldType>(true))
+    // Field exists
+    if (found)
     {
-        Info<< "    Setting internal values of "
+        Info<< "    - set internal values of "
             << fieldHeader.headerClassName()
-            << " " << fieldName << endl;
+            << ": " << fieldDesc.name()
+            << " = " << fieldValue << endl;
 
         fieldType field(fieldHeader, mesh, false);
 
-        const Type value = pTraits<Type>(fieldValueStream);
-
-        if (selectedCells.size() == field.size())
+        if (isNull(selectedCells) || selectedCells.size() == field.size())
         {
-            field.primitiveFieldRef() = value;
+            field.primitiveFieldRef() = fieldValue;
         }
         else
         {
-            forAll(selectedCells, celli)
+            for (const label celli : selectedCells)
             {
-                field[selectedCells[celli]] = value;
+                field[celli] = fieldValue;
             }
         }
 
-        typename GeometricField<Type, fvPatchField, volMesh>::
-            Boundary& fieldBf = field.boundaryFieldRef();
-
-        forAll(field.boundaryField(), patchi)
+        // Make boundary fields consistent - treat like zeroGradient
+        for (auto& pfld : field.boundaryFieldRef())
         {
-            fieldBf[patchi] = fieldBf[patchi].patchInternalField();
+            pfld = pfld.patchInternalField();
         }
 
         if (!field.write())
         {
             FatalErrorInFunction
-              << "Failed writing field " << fieldName << endl;
+                << "Failed writing field " << field.name() << endl;
         }
     }
     else
     {
-        WarningInFunction
-          << "Field " << fieldName << " not found" << endl;
-
-        // Consume value
-        (void)pTraits<Type>(fieldValueStream);
+        Warning
+            << "Field " << fieldDesc.name() << " not found" << endl;
     }
 
     return true;
 }
 
 
-class setCellField
-{
-
-public:
-
-    setCellField()
-    {}
-
-    autoPtr<setCellField> clone() const
-    {
-        return autoPtr<setCellField>::New();
-    }
-
-    class iNew
-    {
-        const fvMesh& mesh_;
-        const labelList& selectedCells_;
-
-    public:
-
-        iNew(const fvMesh& mesh, const labelList& selectedCells)
-        :
-            mesh_(mesh),
-            selectedCells_(selectedCells)
-        {}
-
-        iNew(const fvMesh& mesh, labelList&& selectedCells)
-        :
-            mesh_(mesh),
-            selectedCells_(std::move(selectedCells))
-        {}
-
-        autoPtr<setCellField> operator()(Istream& fieldValues) const
-        {
-            word fieldType(fieldValues);
-
-            if
-            (
-               !(
-                    setCellFieldType<scalar>
-                        (fieldType, mesh_, selectedCells_, fieldValues)
-                 || setCellFieldType<vector>
-                        (fieldType, mesh_, selectedCells_, fieldValues)
-                 || setCellFieldType<sphericalTensor>
-                        (fieldType, mesh_, selectedCells_, fieldValues)
-                 || setCellFieldType<symmTensor>
-                        (fieldType, mesh_, selectedCells_, fieldValues)
-                 || setCellFieldType<tensor>
-                        (fieldType, mesh_, selectedCells_, fieldValues)
-                )
-            )
-            {
-                WarningInFunction
-                    << "field type " << fieldType << " not currently supported"
-                    << endl;
-            }
-
-            return autoPtr<setCellField>::New();
-        }
-    };
-};
-
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+// Setting finite-area face fields
 template<class Type>
-bool setFaceFieldType
+bool setAreaFieldType
 (
-    const word& fieldTypeDesc,
-    const fvMesh& mesh,
+    const fieldDescription& fieldDesc,
+    const faMesh& mesh,
     const labelList& selectedFaces,
-    Istream& fieldValueStream
+    Istream& is
 )
 {
-    typedef GeometricField<Type, fvPatchField, volMesh> fieldType;
+    typedef GeometricField<Type, faPatchField, areaMesh> fieldType;
 
-    if (fieldTypeDesc != fieldType::typeName + "Value")
+    if (fieldDesc.type() != fieldType::typeName)
     {
         return false;
     }
 
-    word fieldName(fieldValueStream);
+    // Get value from stream
+    const Type fieldValue = pTraits<Type>(is);
+
 
     // Check the current time directory
     IOobject fieldHeader
     (
-        fieldName,
-        mesh.time().timeName(),
-        mesh,
+        fieldDesc.name(),
+        mesh.thisDb().time().timeName(),
+        mesh.thisDb(),
         IOobject::MUST_READ
     );
 
-    // Check the "constant" directory
-    if (!fieldHeader.typeHeaderOk<fieldType>(true))
+    bool found = fieldHeader.typeHeaderOk<fieldType>(true);
+
+    if (!found)
     {
+        // Fallback to "constant" directory
         fieldHeader = IOobject
         (
-            fieldName,
-            mesh.time().constant(),
-            mesh,
+            fieldDesc.name(),
+            mesh.thisDb().time().constant(),
+            mesh.thisDb(),
             IOobject::MUST_READ
         );
+        found = fieldHeader.typeHeaderOk<fieldType>(true);
     }
 
-    // Check field exists
-    if (fieldHeader.typeHeaderOk<fieldType>(true))
+    // Field exists
+    if (found)
     {
-        Info<< "    Setting patchField values of "
+        Info<< "    - set internal values of "
             << fieldHeader.headerClassName()
-            << " " << fieldName << endl;
+            << ": " << fieldDesc.name()
+            << " = " << fieldValue << endl;
 
         fieldType field(fieldHeader, mesh);
 
-        const Type value = pTraits<Type>(fieldValueStream);
+        if (isNull(selectedFaces) || selectedFaces.size() == field.size())
+        {
+            field.primitiveFieldRef() = fieldValue;
+        }
+        else
+        {
+            for (const label facei : selectedFaces)
+            {
+                field[facei] = fieldValue;
+            }
+        }
+
+        if (!field.write())
+        {
+            FatalErrorInFunction
+                << "Failed writing field " << field.name() << endl;
+        }
+    }
+    else
+    {
+        Warning
+            << "Field " << fieldDesc.name() << " not found" << endl;
+    }
+
+    return true;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// Setting volume boundary fields
+template<class Type>
+bool setFaceFieldType
+(
+    const fieldDescription& fieldDesc,
+    const fvMesh& mesh,
+    const labelList& selectedFaces,
+    Istream& is
+)
+{
+    typedef GeometricField<Type, fvPatchField, volMesh> fieldType;
+
+    if (fieldDesc.type() != fieldType::typeName)
+    {
+        return false;
+    }
+
+    // Get value from stream
+    const Type fieldValue = pTraits<Type>(is);
+
+
+    // Check the current time directory
+    IOobject fieldHeader
+    (
+        fieldDesc.name(),
+        mesh.thisDb().time().timeName(),
+        mesh.thisDb(),
+        IOobject::MUST_READ
+    );
+
+    bool found = fieldHeader.typeHeaderOk<fieldType>(true);
+
+    if (!found)
+    {
+        // Fallback to "constant" directory
+        fieldHeader = IOobject
+        (
+            fieldDesc.name(),
+            mesh.thisDb().time().constant(),
+            mesh.thisDb(),
+            IOobject::MUST_READ
+        );
+        found = fieldHeader.typeHeaderOk<fieldType>(true);
+    }
+
+    // Field exists
+    if (found)
+    {
+        Info<< "    - set boundary values of "
+            << fieldHeader.headerClassName()
+            << ": " << fieldDesc.name()
+            << " = " << fieldValue << endl;
+
+        fieldType field(fieldHeader, mesh);
 
         // Create flat list of selected faces and their value.
         Field<Type> allBoundaryValues(mesh.nBoundaryFaces());
@@ -260,34 +358,47 @@ bool setFaceFieldType
         }
 
         // Override
-        bool hasWarned = false;
+        unsigned hasWarned = 0;
         labelList nChanged
         (
             returnReduce(field.boundaryField().size(), maxOp<label>()),
-            0
+            Zero
         );
-        forAll(selectedFaces, i)
+
+        for (const label facei : selectedFaces)
         {
-            label facei = selectedFaces[i];
-            if (mesh.isInternalFace(facei))
+            const label bFacei = facei-mesh.nInternalFaces();
+
+            if (bFacei < 0)
             {
-                if (!hasWarned)
+                if (!(hasWarned & 1))
                 {
-                    hasWarned = true;
+                    hasWarned |= 1;
                     WarningInFunction
                         << "Ignoring internal face " << facei
                         << ". Suppressing further warnings." << endl;
                 }
             }
+            else if (bFacei >= mesh.nBoundaryFaces())
+            {
+                if (!(hasWarned & 2))
+                {
+                    hasWarned |= 2;
+                    WarningInFunction
+                        << "Ignoring out-of-range face " << facei
+                        << ". Suppressing further warnings." << endl;
+                }
+            }
             else
             {
-                label bFacei = facei-mesh.nInternalFaces();
-                allBoundaryValues[bFacei] = value;
-                nChanged[mesh.boundaryMesh().patchID()[bFacei]]++;
+                label patchi = mesh.boundaryMesh().patchID()[bFacei];
+
+                allBoundaryValues[bFacei] = fieldValue;
+                ++nChanged[patchi];
             }
         }
 
-        Pstream::listCombineAllGather(nChanged, plusEqOp<label>());
+        Pstream::listCombineReduce(nChanged, plusEqOp<label>());
 
         auto& fieldBf = field.boundaryFieldRef();
 
@@ -299,6 +410,7 @@ bool setFaceFieldType
                 Info<< "    On patch "
                     << field.boundaryField()[patchi].patch().name()
                     << " set " << nChanged[patchi] << " values" << endl;
+
                 fieldBf[patchi] == SubField<Type>
                 (
                     allBoundaryValues,
@@ -312,85 +424,222 @@ bool setFaceFieldType
         if (!field.write())
         {
             FatalErrorInFunction
-                << "Failed writing field " << field.name() << exit(FatalError);
+                << "Failed writing field " << field.name() << endl;
         }
     }
     else
     {
-        WarningInFunction
-          << "Field " << fieldName << " not found" << endl;
-
-        // Consume value
-        (void)pTraits<Type>(fieldValueStream);
+        Warning
+            << "Field " << fieldDesc.name() << " not found" << endl;
     }
 
     return true;
 }
 
 
-class setFaceField
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// Dispatcher for setting volume fields
+struct setCellField
 {
+    autoPtr<setCellField> clone() const { return nullptr; }  // placeholder
 
-public:
-
-    setFaceField()
-    {}
-
-    autoPtr<setFaceField> clone() const
+    static bool apply
+    (
+        const fieldDescription& fieldDesc,
+        const fvMesh& m,
+        const labelList& selectedCells,
+        Istream& is
+    )
     {
-        return autoPtr<setFaceField>::New();
+        return
+        (
+            setCellFieldType<scalar>(fieldDesc, m, selectedCells, is)
+         || setCellFieldType<vector>(fieldDesc, m, selectedCells, is)
+         || setCellFieldType<sphericalTensor>(fieldDesc, m, selectedCells, is)
+         || setCellFieldType<symmTensor>(fieldDesc, m, selectedCells, is)
+         || setCellFieldType<tensor>(fieldDesc, m, selectedCells, is)
+        );
     }
 
     class iNew
     {
         const fvMesh& mesh_;
-        const labelList& selectedFaces_;
+        const labelList& selected_;
+
+    public:
+
+        iNew(const fvMesh& mesh, const labelList& selectedCells)
+        :
+            mesh_(mesh),
+            selected_(selectedCells)
+        {}
+
+        autoPtr<setCellField> operator()(Istream& is) const
+        {
+            const fieldDescription fieldDesc(is);
+
+            bool ok = setCellField::apply(fieldDesc, mesh_, selected_, is);
+
+            if (!ok)
+            {
+                ok = consumeUnused(fieldDesc, is);
+
+                if (ok)
+                {
+                    // Not meant for us
+                    Info<< "Skip " << fieldDesc.type()
+                        << " for finite-volume" << nl;
+                }
+                else
+                {
+                    WarningInFunction
+                        << "Unsupported field type: "
+                        << fieldDesc.type() << endl;
+                }
+            }
+
+            return nullptr;  // Irrelevant return value
+        }
+    };
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// Dispatcher for setting volume boundary fields
+struct setFaceField
+{
+    autoPtr<setFaceField> clone() const { return nullptr; }  // placeholder
+
+    static bool apply
+    (
+        const fieldDescription& fieldDesc,
+        const fvMesh& m,
+        const labelList& selectedFaces,
+        Istream& is
+    )
+    {
+        return
+        (
+            setFaceFieldType<scalar>(fieldDesc, m, selectedFaces, is)
+         || setFaceFieldType<vector>(fieldDesc, m, selectedFaces, is)
+         || setFaceFieldType<sphericalTensor>(fieldDesc, m, selectedFaces, is)
+         || setFaceFieldType<symmTensor>(fieldDesc, m, selectedFaces, is)
+         || setFaceFieldType<tensor>(fieldDesc, m, selectedFaces, is)
+        );
+    }
+
+    class iNew
+    {
+        const fvMesh& mesh_;
+        const labelList& selected_;
 
     public:
 
         iNew(const fvMesh& mesh, const labelList& selectedFaces)
         :
             mesh_(mesh),
-            selectedFaces_(selectedFaces)
+            selected_(selectedFaces)
         {}
 
-        iNew(const fvMesh& mesh, labelList&& selectedFaces)
-        :
-            mesh_(mesh),
-            selectedFaces_(std::move(selectedFaces))
-        {}
-
-        autoPtr<setFaceField> operator()(Istream& fieldValues) const
+        autoPtr<setFaceField> operator()(Istream& is) const
         {
-            word fieldType(fieldValues);
+            const fieldDescription fieldDesc(is);
 
-            if
-            (
-               !(
-                    setFaceFieldType<scalar>
-                        (fieldType, mesh_, selectedFaces_, fieldValues)
-                 || setFaceFieldType<vector>
-                        (fieldType, mesh_, selectedFaces_, fieldValues)
-                 || setFaceFieldType<sphericalTensor>
-                        (fieldType, mesh_, selectedFaces_, fieldValues)
-                 || setFaceFieldType<symmTensor>
-                        (fieldType, mesh_, selectedFaces_, fieldValues)
-                 || setFaceFieldType<tensor>
-                        (fieldType, mesh_, selectedFaces_, fieldValues)
-                )
-            )
+            bool ok = setFaceField::apply(fieldDesc, mesh_, selected_, is);
+
+            if (!ok)
             {
-                WarningInFunction
-                    << "field type " << fieldType << " not currently supported"
-                    << endl;
+                ok = consumeUnused(fieldDesc, is);
+
+                if (ok)
+                {
+                    // Not meant for us
+                    Info<< "Skip " << fieldDesc.type()
+                        << " for finite-volume" << nl;
+                }
+                else
+                {
+                    WarningInFunction
+                        << "Unsupported field type: "
+                        << fieldDesc.type() << endl;
+                }
             }
 
-            return autoPtr<setFaceField>::New();
+            return nullptr;  // Irrelevant return value
         }
     };
 };
 
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// Dispatcher for setting area face fields
+struct setAreaField
+{
+    autoPtr<setAreaField> clone() const { return nullptr; }  // placeholder
+
+    static bool apply
+    (
+        const fieldDescription& fieldDesc,
+        const faMesh& m,
+        const labelList& selectedFaces,
+        Istream& is
+    )
+    {
+        return
+        (
+            setAreaFieldType<scalar>(fieldDesc, m, selectedFaces, is)
+         || setAreaFieldType<vector>(fieldDesc, m, selectedFaces, is)
+         || setAreaFieldType<sphericalTensor>(fieldDesc, m, selectedFaces, is)
+         || setAreaFieldType<symmTensor>(fieldDesc, m, selectedFaces, is)
+         || setAreaFieldType<tensor>(fieldDesc, m, selectedFaces, is)
+        );
+    }
+
+    class iNew
+    {
+        const faMesh& mesh_;
+        const labelList& selected_;
+
+    public:
+
+        iNew(const faMesh& mesh, const labelList& selectedFaces)
+        :
+            mesh_(mesh),
+            selected_(selectedFaces)
+        {}
+
+        autoPtr<setAreaField> operator()(Istream& is) const
+        {
+            const fieldDescription fieldDesc(is);
+
+            bool ok = setAreaField::apply(fieldDesc, mesh_, selected_, is);
+
+            if (!ok)
+            {
+                ok = consumeUnused(fieldDesc, is);
+
+                if (ok)
+                {
+                    // Not meant for us
+                    Info<< "Skip " << fieldDesc.type()
+                        << " for finite-volume" << nl;
+                }
+                else
+                {
+                    WarningInFunction
+                        << "Unsupported field type: "
+                        << fieldDesc.type() << endl;
+                }
+            }
+
+            return nullptr;  // Irrelevant return value
+        }
+    };
+};
+
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -403,11 +652,28 @@ int main(int argc, char *argv[])
 
     argList::addOption("dict", "file", "Alternative setFieldsDict");
 
+    argList::addBoolOption
+    (
+        "no-finite-area",
+        "Suppress handling of finite-area mesh/fields"
+    );
+
     #include "addRegionOption.H"
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createNamedMesh.H"
 
+    autoPtr<faMesh> faMeshPtr;
+
+    if (!args.found("no-finite-area"))
+    {
+        faMeshPtr = faMesh::TryNew(mesh);
+    }
+    if (faMeshPtr)
+    {
+        Info<< "Detected finite-area mesh" << nl;
+    }
+
     const word dictName("setFieldsDict");
     #include "setSystemMeshDictionaryIO.H"
 
@@ -415,70 +681,144 @@ int main(int argc, char *argv[])
 
     IOdictionary setFieldsDict(dictIO);
 
-    if (setFieldsDict.found("defaultFieldValues"))
+
+    // Note.
+    // The PtrList + iNew mechanism is used to trigger the callbacks
+    // and perform the desired actions. The contents of the PtrList
+    // itself are actually irrelevant.
+
+
+    // Default field values
     {
-        Info<< "Setting field default values" << endl;
-        PtrList<setCellField> defaultFieldValues
-        (
-            setFieldsDict.lookup("defaultFieldValues"),
-            setCellField::iNew(mesh, labelList(mesh.nCells()))
-        );
-        Info<< endl;
+        const entry* eptr =
+            setFieldsDict.findEntry("defaultFieldValues", keyType::LITERAL);
+
+        if (eptr)
+        {
+            ITstream& is = eptr->stream();
+
+            Info<< "Setting volume field default values" << endl;
+
+            PtrList<setCellField> defaultFieldValues
+            (
+                is,
+                setCellField::iNew(mesh, labelList::null())
+            );
+
+            if (faMeshPtr)
+            {
+                const faMesh& areaMesh = faMeshPtr();
+                is.rewind();
+
+                Info<< "Setting area field default values" << endl;
+
+                PtrList<setAreaField> defaultFieldValues
+                (
+                    is,
+                    setAreaField::iNew(areaMesh, labelList::null())
+                );
+            }
+            Info<< endl;
+        }
     }
 
 
-    Info<< "Setting field region values" << endl;
+    Info<< "Setting field region values" << nl << endl;
 
     PtrList<entry> regions(setFieldsDict.lookup("regions"));
 
-    forAll(regions, regionI)
+    for (const entry& region : regions)
     {
-        const entry& region = regions[regionI];
-
         autoPtr<topoSetSource> source =
             topoSetSource::New(region.keyword(), mesh, region.dict());
 
         if (source().setType() == topoSetSource::CELLSET_SOURCE)
         {
-            cellSet selectedCellSet
+            cellSet subset
             (
                 mesh,
                 "cellSet",
                 mesh.nCells()/10+1  // Reasonable size estimate.
             );
 
-            source->applyToSet
-            (
-                topoSetSource::NEW,
-                selectedCellSet
-            );
+            source->applyToSet(topoSetSource::NEW, subset);
+
+            labelList selectedCells(subset.sortedToc());
+
+            Info<< "    Selected "
+                << returnReduce(selectedCells.size(), sumOp<label>())
+                << '/'
+                << returnReduce(mesh.nCells(), sumOp<label>())
+                << " cells" << nl;
+
+            ITstream& is = region.dict().lookup("fieldValues");
 
             PtrList<setCellField> fieldValues
             (
-                region.dict().lookup("fieldValues"),
-                setCellField::iNew(mesh, selectedCellSet.sortedToc())
+                is,
+                setCellField::iNew(mesh, selectedCells)
             );
         }
         else if (source().setType() == topoSetSource::FACESET_SOURCE)
         {
-            faceSet selectedFaceSet
+            faceSet subset
             (
                 mesh,
                 "faceSet",
                 mesh.nBoundaryFaces()/10+1
             );
 
-            source->applyToSet
-            (
-                topoSetSource::NEW,
-                selectedFaceSet
-            );
+            source->applyToSet(topoSetSource::NEW, subset);
+
+            labelList selectedFaces(subset.sortedToc());
+
+            Info<< "    Selected " << selectedFaces.size()
+                << " faces" << nl;
+
+            ITstream& is = region.dict().lookup("fieldValues");
 
             PtrList<setFaceField> fieldValues
             (
-                region.dict().lookup("fieldValues"),
-                setFaceField::iNew(mesh, selectedFaceSet.sortedToc())
+                is,
+                setFaceField::iNew(mesh, selectedFaces)
             );
+
+            if (faMeshPtr)
+            {
+                const faMesh& areaMesh = faMeshPtr();
+
+                const labelUList& faceLabels = areaMesh.faceLabels();
+
+                // Transcribe from mesh faces to finite-area addressing
+                labelList areaFaces(faceLabels.size());
+
+                label nUsed = 0;
+                forAll(faceLabels, facei)
+                {
+                    const label meshFacei = faceLabels[facei];
+
+                    if (subset.test(meshFacei))
+                    {
+                        areaFaces[nUsed] = facei;
+                        ++nUsed;
+                    }
+                }
+                areaFaces.resize(nUsed);
+
+                Info<< "    Selected "
+                    << returnReduce(areaFaces.size(), sumOp<label>())
+                    << '/'
+                    << returnReduce(faceLabels.size(), sumOp<label>())
+                    << " area faces" << nl;
+
+                is.rewind();
+
+                PtrList<setAreaField> fieldValues
+                (
+                    is,
+                    setAreaField::iNew(areaMesh, areaFaces)
+                );
+            }
         }
     }
 

applications/utilities/preProcessing/setTurbulenceFields/setTurbulenceFields.C

@@ -109,6 +109,7 @@ Note
 #include "singlePhaseTransportModel.H"
 #include "turbulentTransportModel.H"
 #include "turbulentFluidThermoModel.H"
+#include "processorFvPatchField.H"
 #include "wallFvPatch.H"
 #include "fixedValueFvPatchFields.H"
 
@@ -122,6 +123,40 @@ void InfoField(const word& fldName)
 }
 
 
+template<class Type>
+void correctProcessorPatches
+(
+    GeometricField<Type, fvPatchField, volMesh>& vf
+)
+{
+    if (!Pstream::parRun())
+    {
+        return;
+    }
+
+    // Not possible to use correctBoundaryConditions on fields as they may
+    // use local info as opposed to the constraint values employed here,
+    // but still need to update processor patches
+    auto& bf = vf.boundaryFieldRef();
+
+    forAll(bf, patchi)
+    {
+        if (isA<processorFvPatchField<Type>>(bf[patchi]))
+        {
+            bf[patchi].initEvaluate();
+        }
+    }
+
+    forAll(bf, patchi)
+    {
+        if (isA<processorFvPatchField<Type>>(bf[patchi]))
+        {
+            bf[patchi].evaluate();
+        }
+    }
+}
+
+
 IOobject createIOobject
 (
     const fvMesh& mesh,
@@ -447,22 +482,26 @@ int main(int argc, char *argv[])
         // (M:Eq. 9)
         const dimensionedScalar maxU(dimVelocity, SMALL);
         U *= min(scalar(1), fRei*uTau/max(mag(U), maxU));
+        correctProcessorPatches<vector>(U);
     }
 
     if (tepsilon.valid())
     {
         tepsilon.ref() = epsilon;
+        correctProcessorPatches<scalar>(tepsilon.ref());
     }
 
     if (tk.valid())
     {
         tk.ref() = k;
+        correctProcessorPatches<scalar>(tk.ref());
     }
 
     if (tomega.valid())
     {
         const dimensionedScalar k0(sqr(dimLength/dimTime), SMALL);
         tomega.ref() = Cmu*epsilon/(k + k0);
+        correctProcessorPatches<scalar>(tomega.ref());
     }
 
     if (tR.valid())
@@ -475,6 +514,7 @@ int main(int argc, char *argv[])
         {
             R[celli] = Rdiag[celli];
         }
+        correctProcessorPatches<symmTensor>(R);
     }
 
 

applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C

@@ -1062,7 +1062,12 @@ int main(int argc, char *argv[])
                             }
                         }
 
-                        scalar err = (F2LIij-oldEToeInt)/F2LIij;
+                        const scalar err
+                        (
+                            mag(F2LIij) > ROOTVSMALL
+                          ? (F2LIij-oldEToeInt)/F2LIij
+                          : 0
+                        );
 
                         if
                         (

applications/utilities/surface/surfaceMeshExtract/surfaceMeshExtract.C

@@ -120,7 +120,6 @@ int main(int argc, char *argv[])
 
     // Less frequently used - reduce some clutter
     argList::setAdvanced("decomposeParDict");
-    argList::setAdvanced("noFunctionObjects");
 
     argList::addArgument("output", "The output surface file");
 

applications/utilities/surface/surfaceToPatch/surfaceToPatch.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.
@@ -58,7 +58,7 @@ label addPatch(polyMesh& mesh, const word& patchName)
     {
         const polyBoundaryMesh& patches = mesh.boundaryMesh();
 
-        List<polyPatch*> newPatches(patches.size() + 1);
+        polyPatchList newPatches(patches.size() + 1);
 
         patchi = 0;
 
@@ -67,20 +67,25 @@ label addPatch(polyMesh& mesh, const word& patchName)
         {
             const polyPatch& pp = patches[i];
 
-            newPatches[patchi] =
+            newPatches.set
+            (
+                patchi,
                 pp.clone
                 (
                     patches,
                     patchi,
                     pp.size(),
                     pp.start()
-                ).ptr();
+                )
+            );
 
             patchi++;
         }
 
         // Add zero-sized patch
-        newPatches[patchi] =
+        newPatches.set
+        (
+            patchi,
             new polyPatch
             (
                 patchName,
@@ -89,7 +94,8 @@ label addPatch(polyMesh& mesh, const word& patchName)
                 patchi,
                 patches,
                 polyPatch::typeName
-            );
+            )
+        );
 
         mesh.removeBoundary();
         mesh.addPatches(newPatches);

applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C

@@ -188,15 +188,18 @@ int main(int argc, char *argv[])
     );
     argList::addBoolOption
     (
-        "auto-origin",
-        "Use bounding box centre as origin for rotations"
+        "auto-centre",
+        "Use bounding box centre as centre for rotations"
     );
     argList::addOption
     (
-        "origin",
+        "centre",
         "point",
-        "Use specified <point> as origin for rotations"
+        "Use specified <point> as centre for rotations"
     );
+    argList::addOptionCompat("auto-centre", {"auto-origin", 2206});
+    argList::addOptionCompat("centre", {"origin", 2206});
+
     argList::addOption
     (
         "rotate",
@@ -352,18 +355,18 @@ int main(int argc, char *argv[])
         points += v;
     }
 
-    vector origin;
-    bool useOrigin = args.readIfPresent("origin", origin);
-    if (args.found("auto-origin") && !useOrigin)
+    vector rotationCentre;
+    bool useRotationCentre = args.readIfPresent("centre", rotationCentre);
+    if (args.found("auto-centre") && !useRotationCentre)
     {
-        useOrigin = true;
-        origin = boundBox(points).centre();
+        useRotationCentre = true;
+        rotationCentre = boundBox(points).centre();
     }
 
-    if (useOrigin)
+    if (useRotationCentre)
     {
-        Info<< "Set origin for rotations to " << origin << endl;
-        points -= origin;
+        Info<< "Set centre of rotation to " << rotationCentre << endl;
+        points -= rotationCentre;
     }
 
 
@@ -455,15 +458,15 @@ int main(int argc, char *argv[])
         transform(points, rot, points);
     }
 
+    if (useRotationCentre)
+    {
+        Info<< "Unset centre of rotation from " << rotationCentre << endl;
+        points += rotationCentre;
+    }
+
     // Output scaling
     applyScaling(points, getScalingOpt("write-scale", args));
 
-    if (useOrigin)
-    {
-        Info<< "Unset origin for rotations from " << origin << endl;
-        points += origin;
-    }
-
     surf1.movePoints(points);
     surf1.write(exportName, writeFileType);
 

bin/foamCleanPath

@@ -7,7 +7,7 @@
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 #     Copyright (C) 2011-2016 OpenFOAM Foundation
-#     Copyright (C) 2017-2021 OpenCFD Ltd.
+#     Copyright (C) 2017-2022 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
@@ -48,26 +48,29 @@
 #     - Similarly for c-shell
 #       eval `foamCleanPath -csh-path dir1:dir2`
 #
-# For library paths, it is suggested to use -sh-lib, or -csh-lib.
-# The will use DYLD_LIBRARY_PATH instead of LD_LIBRARY_PATH on Darwin.
+# For library paths, it is suggested to use -sh-lib, -env=-lib etc.
+#
+# On Darwin it uses FOAM_LD_LIBRARY_PATH instead of LD_LIBRARY_PATH.
+# This should actually be DYLD_LIBRARY_PATH on Darwin, but setting that
+# or LD_LIBRARY_PATH via a shell-script is disallowed when SIP is active.
 #
 #------------------------------------------------------------------------------
 printHelp() {
     cat<<USAGE
 
-Usage: foamCleanPath [OPTION] ENV [filter] .. [filter]
+Usage: foamCleanPath [OPTION] ENVNAME [filter] .. [filter]
        foamCleanPath [OPTION] -env=name [filter] .. [filter]
 options:
   -env=NAME         Evaluate NAME to obtain initial content,
                     Accepts "-env=-path", "-env=-lib" shortcuts for PATH
-                    and LD_LIBRARY_PATH (DYLD_LIBRARY_PATH on Darwin)
+                    and LD_LIBRARY_PATH (FOAM_LD_LIBRARY_PATH on Darwin)
   -sh=NAME          Produce 'NAME=...' output for sh eval
   -csh=NAME         Produce 'setenv NAME ...' output for csh eval
   -sh-env=NAME      Same as -sh=NAME -env=NAME
   -csh-env=NAME     Same as -csh=NAME -env=NAME
   -sh-path | -csh-path  Same as -[c]sh-env=PATH
   -sh-lib  | -csh-lib   Same as -[c]sh-env=LD_LIBRARY_PATH
-                        or DYLD_LIBRARY_PATH on Darwin
+                        (FOAM_LD_LIBRARY_PATH on Darwin)
   -debug            Print debug information to stderr
   -strip            Remove inaccessible directories
   -verbose          Report some progress (input, output, ...)
@@ -81,7 +84,7 @@ Prints its argument (which should be a ':' separated list) cleansed from
 Exit status
     0  on success
     1  general error
-    2  initial value of 'path' is empty
+    2  initial value of ENVNAME is empty
 
 USAGE
     exit 0  # A clean exit
@@ -103,63 +106,69 @@ die()
 #-------------------------------------------------------------------------------
 
 # Input and outputs
-unset dirList shellOutput shellFlavour
+unset dirList shellFlavour shellOutput
 unset optDebug optEnvName optStrip optVerbose
 
 # Parse options
 while [ "$#" -gt 0 ]
 do
     case "$1" in
-    -h | -help*)
+    (-h | -help*)
         printHelp
         ;;
 
-    -env=*)
-        name="${1#*=}"
-        [ -n "$name" ] || die "Option '$1' missing an ENVNAME"
-
-        # Accept aliases
-        case "$name" in
-        (-path) name='PATH';;
-        (-lib)
-            case "$(uname -s 2>/dev/null)" in
-                (Darwin) name='DYLD_LIBRARY_PATH';;
-                (*) name='LD_LIBRARY_PATH';;
-            esac
+    (-csh-lib | -csh-path | -sh-lib | -sh-path)
+        shellFlavour="$1"
+        case "$1" in
+        (*-lib)
+            name='LD_LIBRARY_PATH'
+            if [ "$(uname -s 2>/dev/null)" = Darwin ]
+            then
+                name='FOAM_LD_LIBRARY_PATH' # Shadow DYLD_LIBRARY_PATH
+            fi
+            ;;
+        (*-path)
+            name='PATH'
             ;;
-         esac
-         optEnvName="$name"     # Use for input evaluation
-         ;;
-
-    -csh-path | -sh-path)
-        shellFlavour="$1"
-        name='PATH'
-        optEnvName="$name"      # Use for input evaluation
-        shellOutput="$name"     # Use for output
-        ;;
-
-    -csh-lib | -sh-lib)
-        shellFlavour="$1"
-        case "$(uname -s 2>/dev/null)" in
-            (Darwin) name='DYLD_LIBRARY_PATH';;
-            (*) name='LD_LIBRARY_PATH';;
         esac
         optEnvName="$name"      # Use for input evaluation
         shellOutput="$name"     # Use for output
         ;;
 
-    -csh=* | -sh=* | -csh-env=* | -sh-env=*)
+    (-env=*)
+        name="${1#*=}"
+        [ -n "$name" ] || die "Option '$1' missing an ENVNAME"
+        # Handle (-lib | -path) aliases
+        case "$1" in
+        (*=-lib)
+            name='LD_LIBRARY_PATH'
+            if [ "$(uname -s 2>/dev/null)" = Darwin ]
+            then
+                name='FOAM_LD_LIBRARY_PATH' # Shadow DYLD_LIBRARY_PATH
+            fi
+            ;;
+        (*=-path)
+            name='PATH'
+            ;;
+        esac
+        optEnvName="$name"      # Use for input evaluation
+        ;;
+
+    (-csh=* | -csh-env=* | -sh=* | -sh-env=*)
         shellFlavour="$1"
         name="${1#*=}"
         [ -n "$name" ] || die "Option '$1' missing an ENVNAME"
-        # Accept aliases
-        case "$name" in
-        (-path) name='PATH';;
-        (-lib)
-            case "$(uname -s 2>/dev/null)" in
-                (Darwin) name='DYLD_LIBRARY_PATH';;
-                (*) name='LD_LIBRARY_PATH';;
-            esac
+        # Handle (-lib | -path) aliases
+        case "$1" in
+        (*=-lib)
+            name='LD_LIBRARY_PATH'
+            if [ "$(uname -s 2>/dev/null)" = Darwin ]
+            then
+                name='FOAM_LD_LIBRARY_PATH' # Shadow DYLD_LIBRARY_PATH
+            fi
+            ;;
+        (*=-path)
+            name='PATH'
             ;;
         esac
         shellOutput="$name"     # Use for output
@@ -167,16 +176,16 @@ do
         case "$1" in (*-env=*) optEnvName="$name";; esac
         ;;
 
-    -debug)
+    (-debug)
         optDebug=true
         ;;
-    -strip)
+    (-strip)
         optStrip=true
         ;;
-    -verbose)
+    (-verbose)
         optVerbose=true
         ;;
-    *)
+    (*)
         break
         ;;
     esac

bin/tools/RunFunctions

@@ -26,9 +26,9 @@
 [ -d "$FOAM_TUTORIALS" ] || echo "No OpenFOAM tutorials? : $FOAM_TUTORIALS" 1>&2
 
 # Darwin workaround - SIP clearing DYLD_LIBRARY_PATH variable
-if [ -n "$FOAM_DYLD_LIBRARY_PATH" ] && [ -z "$DYLD_LIBRARY_PATH" ]
+if [ -n "$FOAM_LD_LIBRARY_PATH" ] && [ -z "$DYLD_LIBRARY_PATH" ]
 then
-    export DYLD_LIBRARY_PATH="$FOAM_DYLD_LIBRARY_PATH"
+    export DYLD_LIBRARY_PATH="$FOAM_LD_LIBRARY_PATH"
 fi
 
 

bin/tools/change-sitedir.sh

@@ -49,8 +49,8 @@ then
     foamClean="$WM_PROJECT_DIR/bin/foamCleanPath"
     if [ -x "$foamClean" ]
     then
-        cleaned=$($foamClean "$PATH" "$foamOldDirs") && PATH="$cleaned"
-        cleaned=$($foamClean "$LD_LIBRARY_PATH" "$foamOldDirs") \
+        cleaned=$($foamClean -env=PATH "$foamOldDirs") && PATH="$cleaned"
+        cleaned=$($foamClean -env=LD_LIBRARY_PATH "$foamOldDirs") \
             && LD_LIBRARY_PATH="$cleaned"
     fi
 

bin/tools/change-userdir.sh

@@ -5,7 +5,7 @@
 #   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
-#     Copyright (C) 2017-2020 OpenCFD Ltd.
+#     Copyright (C) 2017-2022 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
@@ -49,8 +49,8 @@ then
     foamClean="$WM_PROJECT_DIR/bin/foamCleanPath"
     if [ -x "$foamClean" ]
     then
-        cleaned=$($foamClean "$PATH" "$foamOldDirs") && PATH="$cleaned"
-        cleaned=$($foamClean "$LD_LIBRARY_PATH" "$foamOldDirs") \
+        cleaned=$($foamClean -env=PATH "$foamOldDirs") && PATH="$cleaned"
+        cleaned=$($foamClean -env=LD_LIBRARY_PATH "$foamOldDirs") \
             && LD_LIBRARY_PATH="$cleaned"
     fi
 

etc/bashrc

@@ -79,7 +79,7 @@ export WM_PRECISION_OPTION=DP
 export WM_LABEL_SIZE=32
 
 # [WM_COMPILE_OPTION] - Optimised(default), debug, profiling, other:
-# = Opt | Debug | Prof
+# = Opt | Dbg | Debug | Prof
 export WM_COMPILE_OPTION=Opt
 
 # [WM_COMPILE_CONTROL] - additional control for compiler rules

etc/caseDicts/annotated/snappyHexMeshDict

@@ -564,7 +564,10 @@ snapControls
         //  multiRegionFeatureSnap) have the other points follow these points
         //  instead of having their own independent movement, i.e. have snapping
         //  to multi-region edges/points take priority. This might aid snapping
-        //  to sharp edges that are also region edges. The default is false.
+        //  to sharp edges that are also region edges. The default is false
+        //  since it might also introduce problems - at morphing the patching
+        //  might still be wrong so points get 'released' instead of behaving
+        //  as any other point.
         //releasePoints true;
         //- Walk along feature edges, adding missing ones. Default is true.
         //stringFeatures false;

etc/caseDicts/meshQualityDict

@@ -67,12 +67,14 @@ minVolRatio 0.01;
 //  for Fluent compatibility
 minTriangleTwist -1;
 
-
 //- If >0 : preserve cells with all points on the surface if the
 //  resulting volume after snapping (by approximation) is larger than
 //  minVolCollapseRatio times old volume (i.e. not collapsed to flat cell).
 //  If <0 : delete always.
 //minVolCollapseRatio 0.1;
 
+//- Minimum edge length. Set to <0 to disable
+minEdgeLength 0.001;
+
 
 // ************************************************************************* //

etc/caseDicts/postProcessing/pressure/pressureDifference.cfg

@@ -22,12 +22,14 @@ functions
         #includeEtc "caseDicts/postProcessing/surfaceFieldValue/surfaceRegion.cfg"
         operation       areaAverage;
         fields          (p);
+        $region1;
     }
     region2
     {
         #includeEtc "caseDicts/postProcessing/surfaceFieldValue/surfaceRegion.cfg"
         operation       areaAverage;
         fields          (p);
+        $region2;
     }
 }
 

etc/caseDicts/postProcessing/pressure/pressureDifferencePatch.cfg

@@ -6,8 +6,6 @@
      \\/     M anipulation  |
 \*---------------------------------------------------------------------------*/
 
-#includeEtc "caseDicts/postProcessing/pressure/pressureDifference.cfg"
-
 region1
 {
     regionType  patch;
@@ -19,4 +17,6 @@ region2
     name        $patch2;
 }
 
+#includeEtc "caseDicts/postProcessing/pressure/pressureDifference.cfg"
+
 // ************************************************************************* //

etc/caseDicts/postProcessing/pressure/pressureDifferenceSurface.cfg

@@ -6,16 +6,14 @@
      \\/     M anipulation  |
 \*---------------------------------------------------------------------------*/
 
-#includeEtc "caseDicts/postProcessing/pressure/pressureDifference.cfg"
-
 region1
 {
-    regionType sampledSurface;
-
+    regionType  sampledSurface;
+    name        $triSurface1;
     sampledSurfaceDict
     {
         type        meshedSurface;
-        regionType  cells;
+        source      cells;
         interpolate true;
         surface     $triSurface1;
     }
@@ -24,10 +22,13 @@ region1
 region2
 {
     $region1;
+    name        $triSurface2;
     sampledSurfaceDict
     {
         surface     $triSurface2;
     }
 }
 
+#includeEtc "caseDicts/postProcessing/pressure/pressureDifference.cfg"
+
 // ************************************************************************* //

etc/config.csh/functions

@@ -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, distributed under GPL-3.0-or-later.
@@ -46,10 +46,10 @@ alias _foamAddMan  'setenv MANPATH \!*\:${MANPATH}'
 
 # Special treatment for Darwin
 # - DYLD_LIBRARY_PATH instead of LD_LIBRARY_PATH
-if ("${_foam_uname_s}" == "Darwin") then
-    alias _foamAddLib  'setenv DYLD_LIBRARY_PATH \!*\:${DYLD_LIBRARY_PATH}'
+if ("${_foam_uname_s}" == 'Darwin') then
+    alias _foamAddLib 'if (-e \!*) setenv DYLD_LIBRARY_PATH \!*\:${DYLD_LIBRARY_PATH}; if (-e \!*) setenv FOAM_LD_LIBRARY_PATH \!*\:${FOAM_LD_LIBRARY_PATH}'
 else
-    alias _foamAddLib  'setenv LD_LIBRARY_PATH \!*\:${LD_LIBRARY_PATH}'
+    alias _foamAddLib 'setenv LD_LIBRARY_PATH \!*\:${LD_LIBRARY_PATH}'
 endif
 
 # Prefix to LD_LIBRARY_PATH with additional checking

etc/config.csh/paraview

@@ -69,6 +69,13 @@ set archDir="$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER"
 eval `$WM_PROJECT_DIR/bin/foamCleanPath -csh-path "$ParaView_DIR $archDir/ParaView- $archDir/qt-"`
 eval `$WM_PROJECT_DIR/bin/foamCleanPath -csh-lib "$ParaView_DIR $archDir/ParaView- $archDir/qt-"`
 
+# Darwin
+switch ("$WM_ARCH")
+case darwin*:
+    setenv DYLD_LIBRARY_PATH "${FOAM_LD_LIBRARY_PATH}"
+    breaksw
+endsw
+
 # Evaluate command-line parameters for ParaView
 while ( $#argv > 0 )
     switch ($argv[1])
@@ -206,10 +213,11 @@ default:
         if ( "$pv_libdirs" != "" ) then
             switch ("$WM_ARCH")
             case darwin*:
-                setenv DYLD_LIBRARY_PATH "${pv_libdirs}:$DYLD_LIBRARY_PATH"
+                setenv FOAM_LD_LIBRARY_PATH "${pv_libdirs}:${FOAM_LD_LIBRARY_PATH}"
+                setenv DYLD_LIBRARY_PATH "${FOAM_LD_LIBRARY_PATH}"
                 breaksw
             default:
-                setenv LD_LIBRARY_PATH "${pv_libdirs}:$LD_LIBRARY_PATH"
+                setenv LD_LIBRARY_PATH "${pv_libdirs}:${LD_LIBRARY_PATH}"
                 breaksw
             endsw
         endif

etc/config.csh/setup

@@ -148,16 +148,21 @@ endif
 # Clean standard environment variables (PATH, MANPATH, [DY]LD_LIBRARY_PATH)
 # - avoid local variables shadowing setenv variables
 
-unset PATH MANPATH LD_LIBRARY_PATH DYLD_LIBRARY_PATH
+unset PATH MANPATH LD_LIBRARY_PATH DYLD_LIBRARY_PATH FOAM_LD_LIBRARY_PATH
 if (! $?MANPATH ) setenv MANPATH
-if (! $?LD_LIBRARY_PATH ) setenv LD_LIBRARY_PATH
-if ("${_foam_uname_s}" == "Darwin" ) then
+if ("${_foam_uname_s}" == 'Darwin') then
     if (! $?DYLD_LIBRARY_PATH ) setenv DYLD_LIBRARY_PATH
+    if (! $?FOAM_LD_LIBRARY_PATH ) setenv FOAM_LD_LIBRARY_PATH
+else
+    if (! $?LD_LIBRARY_PATH ) setenv LD_LIBRARY_PATH
 endif
 
 _foamClean PATH "$foamOldDirs"
 _foamClean MANPATH "$foamOldDirs"
 _foamClean -lib "$foamOldDirs"
+if ("${_foam_uname_s}" == 'Darwin') then
+    setenv DYLD_LIBRARY_PATH "${FOAM_LD_LIBRARY_PATH}"
+endif
 
 
 #------------------------------------------------------------------------------
@@ -213,6 +218,9 @@ endif
 _foamClean PATH
 _foamClean MANPATH
 _foamClean -lib
+if ("${_foam_uname_s}" == 'Darwin') then
+   setenv DYLD_LIBRARY_PATH "${FOAM_LD_LIBRARY_PATH}"
+endif
 
 # Add trailing ':' for system manpages
 if ( $?MANPATH ) then
@@ -224,8 +232,8 @@ if ($?LD_LIBRARY_PATH) then
 endif
 
 # Darwin
-if ($?DYLD_LIBRARY_PATH) then
-    if ("${DYLD_LIBRARY_PATH}" == "") unsetenv DYLD_LIBRARY_PATH
+if ($?FOAM_LD_LIBRARY_PATH) then
+    if ("${FOAM_LD_LIBRARY_PATH}" == "") unsetenv DYLD_LIBRARY_PATH FOAM_LD_LIBRARY_PATH
 endif
 
 

etc/config.csh/unset

@@ -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, distributed under GPL-3.0-or-later.
@@ -172,8 +172,10 @@ if ( $?foamClean ) then
     if ($?LD_LIBRARY_PATH) then
         eval `$foamClean -csh-env=LD_LIBRARY_PATH "$foamOldDirs"`
     endif
-    if ($?DYLD_LIBRARY_PATH) then
-        eval `$foamClean -csh-env=DYLD_LIBRARY_PATH "$foamOldDirs"`
+    # Darwin
+    if ($?FOAM_LD_LIBRARY_PATH) then
+        eval `$foamClean -csh-env=FOAM_LD_LIBRARY_PATH "$foamOldDirs"`
+        setenv DYLD_LIBRARY_PATH ${FOAM_LD_LIBRARY_PATH}
     endif
 endif
 
@@ -188,7 +190,7 @@ if ($?DYLD_LIBRARY_PATH) then
 endif
 
 # Remove any shadow env variables
-unsetenv FOAM_DYLD_LIBRARY_PATH
+unsetenv FOAM_DYLD_LIBRARY_PATH FOAM_LD_LIBRARY_PATH
 
 #------------------------------------------------------------------------------
 # Cleanup aliases

etc/config.sh/functions

@@ -6,7 +6,7 @@
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 #     Copyright (C) 2011-2016 OpenFOAM Foundation
-#     Copyright (C) 2017-2021 OpenCFD Ltd.
+#     Copyright (C) 2017-2022 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
@@ -31,7 +31,7 @@
 #     _foamEtc       : resolve etc files (silent or verbose)
 #     _foamAddPath   : prepend to PATH
 #     _foamAddMan    : prepend to MANPATH
-#     _foamAddLib    : prepend to [DY]LD_LIBRARY_PATH
+#     _foamAddLib    : prepend to {DY,FOAM_}LD_LIBRARY_PATH
 #     _foamAddLibAuto: prepend to lib64/lib resolved name
 #
 #------------------------------------------------------------------------------
@@ -56,7 +56,7 @@ then
          foamVar_name="$1"
          shift
          eval "$($foamClean -sh-env="$foamVar_name" "$@")"
-         unset "foamVar_name"
+         unset foamVar_name
     }
 
     # Echo values to stderr when FOAM_VERBOSE is on, no-op otherwise
@@ -94,14 +94,18 @@ then
         _foamAddLib()
         {
             case "$1" in (/?*)
-                export DYLD_LIBRARY_PATH="${1}${DYLD_LIBRARY_PATH:+:}${DYLD_LIBRARY_PATH}" ;;
+            if [ -e "$1" ]
+            then
+                export FOAM_LD_LIBRARY_PATH="${1}${FOAM_LD_LIBRARY_PATH:+:}${FOAM_LD_LIBRARY_PATH}"
+                export DYLD_LIBRARY_PATH="$FOAM_LD_LIBRARY_PATH"
+            fi
             esac
         }
     else
         _foamAddLib()
         {
             case "$1" in (/?*)
-                export LD_LIBRARY_PATH="${1}${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}" ;;
+                export LD_LIBRARY_PATH="${1}${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}"
             esac
         }
     fi

etc/config.sh/paraview

@@ -76,6 +76,12 @@ eval \
     "$($WM_PROJECT_DIR/bin/foamCleanPath -sh-lib \
     $ParaView_DIR $archDir/ParaView- $archDir/qt-)"
 
+# Darwin
+case "$WM_ARCH" in
+(darwin*)
+    export DYLD_LIBRARY_PATH="${FOAM_LD_LIBRARY_PATH}" ;;
+esac
+
 # Evaluate command-line parameters for ParaView
 for i
 do
@@ -186,8 +192,12 @@ case "$ParaView_VERSION" in
         then
             case "$WM_ARCH" in
             (darwin*)
-                export DYLD_LIBRARY_PATH="${pv_libdirs}:$DYLD_LIBRARY_PATH" ;;
-            (*) export LD_LIBRARY_PATH="${pv_libdirs}:$LD_LIBRARY_PATH" ;;
+                export FOAM_LD_LIBRARY_PATH="${pv_libdirs}:${FOAM_LD_LIBRARY_PATH}"
+                export DYLD_LIBRARY_PATH="${FOAM_LD_LIBRARY_PATH}"
+                ;;
+            (*)
+                export LD_LIBRARY_PATH="${pv_libdirs}:${LD_LIBRARY_PATH}"
+                ;;
             esac
         fi
 

etc/config.sh/paraview-system

@@ -5,7 +5,7 @@
 #   \\  /    A nd           | www.openfoam.com
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
-#     Copyright (C) 2019-2021 OpenCFD Ltd.
+#     Copyright (C) 2019-2022 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
@@ -34,6 +34,12 @@ eval \
     "$($WM_PROJECT_DIR/bin/foamCleanPath -sh-lib \
     $ParaView_DIR $archDir/ParaView-)"
 
+# Darwin
+case "$WM_ARCH" in
+(darwin*)
+    export DYLD_LIBRARY_PATH="${FOAM_LD_LIBRARY_PATH}" ;;
+esac
+
 #------------------------------------------------------------------------------
 
 ParaView_DIR="$(command -v paraview 2>/dev/null)"

etc/config.sh/setup

@@ -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, distributed under GPL-3.0-or-later.
@@ -178,12 +178,23 @@ else
 fi
 
 
-# Clean standard environment variables
+# Clean standard environment variables (PATH, MANPATH, [DY]LD_LIBRARY_PATH)
+
+export PATH MANPATH
+if [ "${_foam_uname_s}" = Darwin ]
+then
+    export DYLD_LIBRARY_PATH FOAM_LD_LIBRARY_PATH
+else
+    export LD_LIBRARY_PATH
+fi
 
-export PATH MANPATH LD_LIBRARY_PATH
 _foamClean PATH "$foamOldDirs"
 _foamClean MANPATH "$foamOldDirs"
 _foamClean -lib "$foamOldDirs"
+if [ "${_foam_uname_s}" = Darwin ]
+then
+    export DYLD_LIBRARY_PATH="$FOAM_LD_LIBRARY_PATH"
+fi
 
 #------------------------------------------------------------------------------
 # Base setup (OpenFOAM compilation), MPI and third-party packages
@@ -237,11 +248,21 @@ fi
 #------------------------------------------------------------------------------
 
 # Remove duplicates from environment paths
-export PATH MANPATH LD_LIBRARY_PATH
+export PATH MANPATH
+if [ "${_foam_uname_s}" = Darwin ]
+then
+    export DYLD_LIBRARY_PATH FOAM_LD_LIBRARY_PATH
+else
+    export LD_LIBRARY_PATH
+fi
 
 _foamClean PATH
 _foamClean MANPATH
 _foamClean -lib
+if [ "${_foam_uname_s}" = Darwin ]
+then
+    export DYLD_LIBRARY_PATH="$FOAM_LD_LIBRARY_PATH"
+fi
 
 # Add trailing ':' for system manpages
 if [ -n "$MANPATH" ]

etc/config.sh/unset

@@ -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, distributed under GPL-3.0-or-later.
@@ -164,7 +164,9 @@ then
     eval "$($foamClean -sh-env=PATH $foamOldDirs)"
     eval "$($foamClean -sh-env=MANPATH $foamOldDirs)"
     eval "$($foamClean -sh-env=LD_LIBRARY_PATH $foamOldDirs)"
-    eval "$($foamClean -sh-env=DYLD_LIBRARY_PATH $foamOldDirs)"
+    # Darwin
+    eval "$($foamClean -sh-env=FOAM_LD_LIBRARY_PATH $foamOldDirs)"
+    export DYLD_LIBRARY_PATH="$FOAM_LD_LIBRARY_PATH"
 fi
 
 [ -n "$MANPATH" ] || unset MANPATH
@@ -172,7 +174,7 @@ fi
 [ -n "$DYLD_LIBRARY_PATH" ] || unset DYLD_LIBRARY_PATH
 
 # Remove any shadow env variables
-unset FOAM_DYLD_LIBRARY_PATH
+unset FOAM_DYLD_LIBRARY_PATH FOAM_LD_LIBRARY_PATH
 
 #------------------------------------------------------------------------------
 # Cleanup aliases and functions

etc/cshrc

@@ -79,7 +79,7 @@ setenv WM_PRECISION_OPTION DP
 setenv WM_LABEL_SIZE 32
 
 # [WM_COMPILE_OPTION] - Optimised(default), debug, profiling, other:
-# = Opt | Debug | Prof
+# = Opt | Dbg | Debug | Prof
 setenv WM_COMPILE_OPTION Opt
 
 # [WM_COMPILE_CONTROL] - additional control for compiler rules

src/OpenFOAM/Make/files

@@ -776,6 +776,7 @@ $(Fields)/fieldTypes.C
 
 
 pointPatchFields = fields/pointPatchFields
+$(pointPatchFields)/pointPatchField/pointPatchFieldBase.C
 $(pointPatchFields)/pointPatchField/pointPatchFields.C
 
 basicPointPatchFields = $(pointPatchFields)/basic