ENH: improve efficiency of point-cell/cell-point construction (#2715)

- calculate point-cell from point-face if available

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

@@ -103,7 +103,14 @@ Foam::smoluchowskiJumpTFvPatchScalarField::smoluchowskiJumpTFvPatchScalarField
             << exit(FatalIOError);
     }
 
-    if (!this->readValueEntry(dict))
+    if (dict.found("value"))
+    {
+        fvPatchField<scalar>::operator=
+        (
+            scalarField("value", dict, p.size())
+        );
+    }
+    else
     {
         fvPatchField<scalar>::operator=(patchInternalField());
     }

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

@@ -105,15 +105,18 @@ Foam::maxwellSlipUFvPatchVectorField::maxwellSlipUFvPatchVectorField
             << exit(FatalIOError);
     }
 
-    if (this->readValueEntry(dict))
+    if (dict.found("value"))
     {
-        const auto* hasRefValue = dict.findEntry("refValue", keyType::LITERAL);
-        const auto* hasFrac = dict.findEntry("valueFraction", keyType::LITERAL);
+        fvPatchField<vector>::operator=
+        (
+            vectorField("value", dict, p.size())
+        );
 
-        if (hasRefValue && hasFrac)
+        if (dict.found("refValue") && dict.found("valueFraction"))
         {
-            this->refValue().assign(*hasRefValue, p.size());
-            this->valueFraction().assign(*hasFrac, p.size());
+            this->refValue() = vectorField("refValue", dict, p.size());
+            this->valueFraction() =
+                scalarField("valueFraction", dict, p.size());
         }
         else
         {

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

@@ -243,12 +243,14 @@ turbulentTemperatureTwoPhaseRadCoupledMixedFvPatchScalarField
             << exit(FatalError);
     }
 
+    fvPatchScalarField::operator=(scalarField("value", dict, p.size()));
 
-    this->readValueEntry(dict, IOobjectOption::MUST_READ);
-
-    if (this->readMixedEntries(dict))
+    if (dict.found("refValue"))
     {
         // Full restart
+        refValue() = scalarField("refValue", dict, p.size());
+        refGrad() = scalarField("refGradient", dict, p.size());
+        valueFraction() = scalarField("valueFraction", dict, p.size());
     }
     else
     {

applications/test/boundBox2/Test-boundBox2.C

@@ -143,7 +143,7 @@ int main(int argc, char *argv[])
 {
     #include "setRootCase.H"
 
-    treeBoundBox bb(zero_one{});
+    treeBoundBox bb(cube(0, 1));
     treeBoundBox sub(cube(0.1, 0.8));
 
     Info<< nl

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

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2022-2023 OpenCFD Ltd.
+    Copyright (C) 2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -51,7 +51,7 @@ void printInfo(const label comm)
         << " sub:" << UPstream::subProcs(comm) << nl;
 
 
-    if (UPstream::commSelf() == comm)
+    if (UPstream::selfComm == comm)
     {
         Pout<< "self all:" << UPstream::allProcs(comm)
             << " sub:" << UPstream::subProcs(comm) << nl;
@@ -86,32 +86,32 @@ int main(int argc, char *argv[])
         << "nProcs = " << UPstream::nProcs()
         << " with " << UPstream::nComms() << " predefined comm(s)" << nl;
 
-    Info<< "comm-world : ";
-    printInfo(UPstream::commWorld());
+    Info<< "worldComm : ";
+    printInfo(UPstream::worldComm);
 
-    Info<< "comm-self  : ";
-    printInfo(UPstream::commSelf());
+    Info<< "selfComm  : ";
+    printInfo(UPstream::selfComm);
 
     Info<< nl;
 
     // Reductions (using MPI intrinsics)
     {
-        label val = Pstream::myProcNo(UPstream::commWorld());
+        label val = Pstream::myProcNo(UPstream::worldComm);
 
         label worldVal = returnReduce
         (
             val,
             sumOp<label>(),
-            UPstream::msgType(),
-            UPstream::commWorld()
+            Pstream::msgType(),
+            UPstream::worldComm
         );
 
         label selfVal = returnReduce
         (
             val,
             sumOp<label>(),
-            UPstream::msgType(),
-            UPstream::commSelf()
+            Pstream::msgType(),
+            UPstream::selfComm
         );
 
         Pout<< "value " << val
@@ -123,8 +123,8 @@ int main(int argc, char *argv[])
     {
         Pair<label> val
         (
-            Pstream::myProcNo(UPstream::commWorld()),
-            Pstream::myProcNo(UPstream::commWorld())
+            Pstream::myProcNo(UPstream::worldComm),
+            Pstream::myProcNo(UPstream::worldComm)
         );
 
         Pair<label> worldVal = val;
@@ -133,8 +133,8 @@ int main(int argc, char *argv[])
         (
             worldVal,
             minFirstEqOp<label>(),
-            UPstream::msgType(),
-            UPstream::commWorld()
+            Pstream::msgType(),
+            UPstream::worldComm
         );
 
         Pair<label> selfVal = val;
@@ -143,8 +143,8 @@ int main(int argc, char *argv[])
         (
             worldVal,
             minFirstEqOp<label>(),
-            UPstream::msgType(),
-            UPstream::commSelf()
+            Pstream::msgType(),
+            UPstream::selfComm
         );
 
         Pout<< "value " << val

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

@@ -150,7 +150,11 @@ int main(int argc, char *argv[])
     Pout<< "localValue      :" << localValue << endl;
 
 
-    label comm = UPstream::allocateCommunicator(UPstream::worldComm, top);
+    label comm = Pstream::allocateCommunicator
+    (
+        UPstream::worldComm,
+        top
+    );
 
     Pout<< "allocated comm  :" << comm << endl;
     Pout<< "comm myproc     :" << Pstream::myProcNo(comm)
@@ -169,7 +173,7 @@ int main(int argc, char *argv[])
         Pout<< "sum             :" << sum << endl;
     }
 
-    UPstream::freeCommunicator(comm);
+    Pstream::freeCommunicator(comm);
 
 
     Pout<< "End\n" << endl;

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

@@ -88,12 +88,12 @@ int main(int argc, char *argv[])
 
     //- Process IDs within a given communicator
     Info<< "procIDs: "
-        << flatOutput(UPstream::procID(UPstream::commWorld())) << endl;
+        << flatOutput(UPstream::procID(UPstream::worldComm)) << endl;
 
-    rankInfo(UPstream::commWorld());
+    rankInfo(UPstream::worldComm);
     Pout<< endl;
 
-    const int myProci = UPstream::myProcNo(UPstream::commWorld());
+    const int myProci = UPstream::myProcNo(UPstream::worldComm);
     int localRanki = myProci;
 
     labelList subRanks;
@@ -101,9 +101,9 @@ int main(int argc, char *argv[])
 
     #if 1
     // With first ranks
-    subRanks = identity(UPstream::nProcs(UPstream::commWorld()) / 2);
+    subRanks = identity(UPstream::nProcs(UPstream::worldComm) / 2);
 
-    newComm.reset(UPstream::commWorld(), subRanks);
+    newComm.reset(UPstream::worldComm, subRanks);
     localRanki = UPstream::myProcNo(newComm);
 
     Pout.prefix() =
@@ -120,14 +120,14 @@ int main(int argc, char *argv[])
 
     #if 1
     // With every other rank
-    subRanks = identity(UPstream::nProcs(UPstream::commWorld()));
+    subRanks = identity(UPstream::nProcs(UPstream::worldComm));
 
     for (label& val : subRanks)
     {
         if (val % 2) val = -1;
     }
 
-    newComm.reset(UPstream::commWorld(), subRanks);
+    newComm.reset(UPstream::worldComm, subRanks);
     localRanki = UPstream::myProcNo(newComm);
 
     Pout.prefix() =
@@ -165,19 +165,19 @@ int main(int argc, char *argv[])
     }
     if (Pstream::parRun() && args.found("host-comm"))
     {
-        // Host communicator, based on the current world communicator
+        // Host communicator, based on the current worldComm
         // Use hostname
         // Lowest rank per hostname is the IO rank
 
-        label numprocs = UPstream::nProcs(UPstream::commGlobal());
+        label numprocs = UPstream::nProcs(UPstream::globalComm);
 
         stringList hosts(numprocs);
-        hosts[Pstream::myProcNo(UPstream::commGlobal())] = hostName();
+        hosts[Pstream::myProcNo(UPstream::globalComm)] = hostName();
 
         labelList hostIDs_;
 
         // Compact
-        if (Pstream::master(UPstream::commGlobal()))
+        if (Pstream::master(UPstream::globalComm))
         {
             DynamicList<word> hostNames(numprocs);
             hostIDs_.resize_nocopy(numprocs);
@@ -196,10 +196,10 @@ int main(int argc, char *argv[])
             }
         }
 
-        Pstream::broadcasts(UPstream::commGlobal(), hostIDs_);
+        Pstream::broadcasts(UPstream::globalComm, hostIDs_);
 
         const label myHostId =
-            hostIDs_[Pstream::myProcNo(UPstream::commGlobal())];
+            hostIDs_[Pstream::myProcNo(UPstream::globalComm)];
 
         DynamicList<label> subRanks;
         forAll(hostIDs_, proci)
@@ -210,11 +210,11 @@ int main(int argc, char *argv[])
             }
         }
 
-        // Allocate new communicator with global communicator as its parent
+        // Allocate new communicator with globalComm as its parent
         const label hostComm =
             UPstream::allocateCommunicator
             (
-                UPstream::commGlobal(),
+                UPstream::globalComm,  // parent
                 subRanks,
                 true
             );

applications/test/pointField/Test-PointField.C

@@ -39,6 +39,7 @@ Description
 
 int main(int argc, char *argv[])
 {
+
     #include "setRootCase.H"
 
     #include "createTime.H"
@@ -46,42 +47,11 @@ int main(int argc, char *argv[])
 
     const pointMesh& pMesh = pointMesh::New(mesh);
 
-    #if 1
-    pointLabelField state
-    (
-        IOobject
-        (
-            "test-state",
-            runTime.timeName(),
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        pMesh
-    );
-    #else
-    pointLabelField state
-    (
-        IOobject
-        (
-            "test-state",
-            runTime.timeName(),
-            mesh,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        pMesh,
-        dimensioned<label>(dimLength, 1),
-        pointPatchLabelField::calculatedType()
-    );
-    state.write();
-    #endif
-
     pointVectorField U
     (
         IOobject
         (
-            "test-U",
+            "U",
             runTime.timeName(),
             mesh,
             IOobject::NO_READ,
@@ -92,8 +62,6 @@ int main(int argc, char *argv[])
         pointPatchVectorField::calculatedType()
     );
 
-    U.write();
-
     pointVectorField V(U + 2*U);
 
     Info<< "End\n" << endl;

applications/test/polyMeshGeom-speed1/Make/files

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

applications/test/polyMeshGeom-speed1/Make/options

@@ -1,5 +0,0 @@
-EXE_INC = \
-    -I$(LIB_SRC)/mesh/blockMesh/lnInclude
-
-EXE_LIBS = \
-    -lblockMesh

applications/test/polyMeshGeom-speed1/Test-polyMeshGeom-speed1.C

@@ -1,804 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2023 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/>.
-
-Description
-    Simple timing tests for some polyMesh primitives
-
-\*---------------------------------------------------------------------------*/
-
-#include "argList.H"
-#include "clockTime.H"
-#include "Time.H"
-#include "PDRblock.H"
-#include "polyMesh.H"
-#include "ListOps.H"
-
-using namespace Foam;
-
-void printAlloc(const polyMesh& mesh)
-{
-    Info<< "memory"
-        << " hasCellPoints:" << mesh.hasCellPoints()
-        << " hasPointCells:" << mesh.hasPointCells() << endl;
-}
-
-
-void printInfo(const polyMesh& mesh)
-{
-    Info<< "polyMesh"
-        << " nPoints:" << mesh.nPoints()
-        << " nInternalFaces:" << mesh.nInternalFaces()
-        << " nFaces:" << mesh.nFaces()
-        << " nCells:" << mesh.nCells() << endl;
-}
-
-
-// How point cells are calculated in OpenFOAM-v2212 and earlier
-autoPtr<labelListList> pointCells_2212(const polyMesh& mesh)
-{
-    const cellList& cf = mesh.cells();
-
-    // Count number of cells per point
-
-    labelList npc(mesh.nPoints(), Zero);
-
-    forAll(cf, celli)
-    {
-        const labelList curPoints = cf[celli].labels(mesh.faces());
-
-        for (const label pointi : curPoints)
-        {
-            ++npc[pointi];
-        }
-    }
-
-
-    // Size and fill cells per point
-
-    auto pcPtr_ = autoPtr<labelListList>::New(npc.size());
-    labelListList& pointCellAddr = *pcPtr_;
-
-    forAll(pointCellAddr, pointi)
-    {
-        pointCellAddr[pointi].setSize(npc[pointi]);
-        npc[pointi] = 0;
-    }
-
-
-    forAll(cf, celli)
-    {
-        const labelList curPoints = cf[celli].labels(mesh.faces());
-
-        for (const label pointi : curPoints)
-        {
-            pointCellAddr[pointi][npc[pointi]++] = celli;
-        }
-    }
-
-    return pcPtr_;
-}
-
-
-// Line cell::labels but with persistent storage
-void cell_labels
-(
-    const cell& cFaces,
-    const faceUList& meshFaces,
-    DynamicList<label>& pointLabels
-)
-{
-    // const labelList& cFaces = *this;
-
-    label nVerts = 0;
-    for (const label facei : cFaces)
-    {
-        nVerts += meshFaces[facei].size();
-    }
-
-    // pointLabels.clear();
-    pointLabels.expandStorage();
-
-    // The first face has no duplicates, can copy in values
-    const labelList& firstFace = meshFaces[cFaces[0]];
-
-    std::copy(firstFace.cbegin(), firstFace.cend(), pointLabels.begin());
-
-    // Now already contains some vertices
-    nVerts = firstFace.size();
-
-    // For the rest of the faces. For each vertex, check if the point is
-    // already inserted (up to nVerts, which now carries the number of real
-    // points. If not, add it at the end of the list.
-
-    for (label facei = 1; facei < cFaces.size(); ++facei)
-    {
-        for (const label curPoint : meshFaces[cFaces[facei]])
-        {
-            bool pointFound = false;
-
-            for (label checki = 0; checki < nVerts; ++checki)
-            {
-                if (curPoint == pointLabels[checki])
-                {
-                    pointFound = true;
-                    break;
-                }
-            }
-
-            if (!pointFound)
-            {
-                pointLabels[nVerts] = curPoint;
-                ++nVerts;
-            }
-        }
-    }
-
-    pointLabels.resize(nVerts);
-}
-
-
-
-// Like OpenFOAM-v2212, but with cell::labels unrolled to avoid allocations
-autoPtr<labelListList> pointCells_2212mod(const polyMesh& mesh)
-{
-    const cellList& cf = mesh.cells();
-
-    // Vertex labels for the current cell
-    DynamicList<label> vertices(256);
-
-    // Count number of cells per point
-
-    labelList npc(mesh.nPoints(), Zero);
-
-    for (const cell& c : cf)
-    {
-        cell_labels(c, mesh.faces(), vertices);
-
-        for (const label pointi : vertices)
-        {
-            ++npc[pointi];
-        }
-    }
-
-
-    // Size and fill cells per point
-
-    auto pcPtr_ = autoPtr<labelListList>::New(npc.size());
-    labelListList& pointCellAddr = *pcPtr_;
-
-    forAll(pointCellAddr, pointi)
-    {
-        pointCellAddr[pointi].resize(npc[pointi]);
-        npc[pointi] = 0;
-    }
-
-
-    forAll(cf, celli)
-    {
-        cell_labels(cf[celli], mesh.faces(), vertices);
-
-        for (const label pointi : vertices)
-        {
-            pointCellAddr[pointi][npc[pointi]++] = celli;
-        }
-    }
-
-    return pcPtr_;
-}
-
-
-// How cells points are calculated in OpenFOAM-v2212 and earlier
-autoPtr<labelListList> cellPoints_2212(const polyMesh& mesh)
-{
-    autoPtr<labelListList> pointCells = pointCells_2212(mesh);
-
-    auto cpPtr_ = autoPtr<labelListList>::New(mesh.nCells());
-
-    invertManyToMany(mesh.nCells(), pointCells(), *cpPtr_);
-
-    return cpPtr_;
-}
-
-
-// Calculate with bitSet tracking and avoid cells::labels
-autoPtr<labelListList> pointCells_bitSet(const polyMesh& mesh)
-{
-    // Calculate point-cell topology
-
-    const cellList& cellLst = mesh.cells();
-    const faceList& faceLst = mesh.faces();
-
-    // For tracking (only use each point id once)
-    bitSet usedPoints(mesh.nPoints());
-
-    // Vertex labels for the current cell
-    DynamicList<label> vertices(256);
-
-    const label loopLen = mesh.nCells();
-
-    // Step 1: count number of cells per point
-
-    labelList pointCount(mesh.nPoints(), Zero);
-
-    for (label celli = 0; celli < loopLen; ++celli)
-    {
-        // Clear any previous contents
-        usedPoints.unset(vertices);
-        vertices.clear();
-
-        for (const label facei : cellLst[celli])
-        {
-            for (const label pointi : faceLst[facei])
-            {
-                // Only once for each point id
-                if (usedPoints.set(pointi))
-                {
-                    vertices.push_back(pointi);
-                    ++pointCount[pointi];
-                }
-            }
-        }
-    }
-
-
-    // Step 2: set sizing, reset counters
-
-    auto pcPtr_ = autoPtr<labelListList>::New(mesh.nPoints());
-    auto& pointCellAddr = *pcPtr_;
-
-    forAll(pointCellAddr, pointi)
-    {
-        pointCellAddr[pointi].resize_nocopy(pointCount[pointi]);
-        pointCount[pointi] = 0;
-    }
-
-
-    // Step 3: fill in values. Logic as per step 1
-    for (label celli = 0; celli < loopLen; ++celli)
-    {
-        // Clear any previous contents
-        usedPoints.unset(vertices);
-        vertices.clear();
-
-        for (const label facei : cellLst[celli])
-        {
-            for (const label pointi : faceLst[facei])
-            {
-                // Only once for each point id
-                if (usedPoints.set(pointi))
-                {
-                    vertices.push_back(pointi);
-                    pointCellAddr[pointi][pointCount[pointi]++] = celli;
-                }
-            }
-        }
-    }
-
-    return pcPtr_;
-}
-
-
-// Calculate with bitSet tracking and avoid cells::labels
-autoPtr<labelListList> cellPoints_bitSet(const polyMesh& mesh)
-{
-    // Calculate cell-point topology
-
-    auto cpPtr_ = autoPtr<labelListList>::New(mesh.nCells());
-    auto& cellPointAddr = *cpPtr_;
-
-    const cellList& cellLst = mesh.cells();
-    const faceList& faceLst = mesh.faces();
-
-    // For tracking (only use each point id once)
-    bitSet usedPoints(mesh.nPoints());
-
-    // Vertex labels for the current cell
-    DynamicList<label> vertices(256);
-
-    const label loopLen = mesh.nCells();
-
-    for (label celli = 0; celli < loopLen; ++celli)
-    {
-        // Clear any previous contents
-        usedPoints.unset(vertices);
-        vertices.clear();
-
-        for (const label facei : cellLst[celli])
-        {
-            for (const label pointi : faceLst[facei])
-            {
-                // Only once for each point id
-                if (usedPoints.set(pointi))
-                {
-                    vertices.push_back(pointi);
-                }
-            }
-        }
-
-        cellPointAddr[celli] = vertices;  // unsorted
-    }
-
-    return cpPtr_;
-}
-
-
-// Calculate with linear lookup and avoid cells::labels
-autoPtr<labelListList> pointCells_linear(const polyMesh& mesh)
-{
-    // Calculate point-cell topology
-
-    const cellList& cellLst = mesh.cells();
-    const faceList& faceLst = mesh.faces();
-
-    // Vertex labels for the current cell
-    DynamicList<label> vertices(256);
-
-    const label loopLen = mesh.nCells();
-
-    // Step 1: count number of cells per point
-
-    labelList pointCount(mesh.nPoints(), Zero);
-
-    for (label celli = 0; celli < loopLen; ++celli)
-    {
-        // Clear any previous contents
-        vertices.clear();
-
-        for (const label facei : cellLst[celli])
-        {
-            for (const label pointi : faceLst[facei])
-            {
-                // Only once for each point id
-                if (!vertices.contains(pointi))
-                {
-                    vertices.push_back(pointi);
-                    ++pointCount[pointi];
-                }
-            }
-        }
-    }
-
-
-    // Step 2: set sizing, reset counters
-
-    auto pcPtr_ = autoPtr<labelListList>::New(mesh.nPoints());
-    auto& pointCellAddr = *pcPtr_;
-
-    forAll(pointCellAddr, pointi)
-    {
-        pointCellAddr[pointi].resize_nocopy(pointCount[pointi]);
-        pointCount[pointi] = 0;
-    }
-
-
-    // Step 3: fill in values. Logic as per step 1
-    for (label celli = 0; celli < loopLen; ++celli)
-    {
-        // Clear any previous contents
-        vertices.clear();
-
-        for (const label facei : cellLst[celli])
-        {
-            for (const label pointi : faceLst[facei])
-            {
-                // Only once for each point id
-                if (!vertices.contains(pointi))
-                {
-                    vertices.push_back(pointi);
-                    pointCellAddr[pointi][pointCount[pointi]++] = celli;
-                }
-            }
-        }
-    }
-
-    return pcPtr_;
-}
-
-
-// Calculate with linear lookup and avoid cells::labels
-autoPtr<labelListList> cellPoints_linear(const polyMesh& mesh)
-{
-    // Calculate cell-point topology
-
-    auto cpPtr_ = autoPtr<labelListList>::New(mesh.nCells());
-    auto& cellPointAddr = *cpPtr_;
-
-    const cellList& cellLst = mesh.cells();
-    const faceList& faceLst = mesh.faces();
-
-    // Vertex labels for the current cell
-    DynamicList<label> vertices(256);
-
-    const label loopLen = mesh.nCells();
-
-    for (label celli = 0; celli < loopLen; ++celli)
-    {
-        // Clear any previous contents
-        vertices.clear();
-
-        for (const label facei : cellLst[celli])
-        {
-            for (const label pointi : faceLst[facei])
-            {
-                // Only once for each point id
-                if (!vertices.contains(pointi))
-                {
-                    vertices.push_back(pointi);
-                }
-            }
-        }
-
-        cellPointAddr[celli] = vertices;  // unsorted
-    }
-
-    return cpPtr_;
-}
-
-
-// Calculate point-cell from point-face information
-autoPtr<labelListList> pointCells_faces(const polyMesh& mesh)
-{
-    const labelList& own = mesh.faceOwner();
-    const labelList& nei = mesh.faceNeighbour();
-    const labelListList& pFaces = mesh.pointFaces();
-
-    const label loopLen = mesh.nPoints();
-
-    auto pcPtr_ = autoPtr<labelListList>::New(mesh.nPoints());
-    auto& pointCellAddr = *pcPtr_;
-
-    DynamicList<label> storage(256);
-
-    for (label pointi = 0; pointi < loopLen; ++pointi)
-    {
-        // Clear any previous contents
-        storage.clear();
-
-        for (const label facei : pFaces[pointi])
-        {
-            // Owner cell
-            storage.push_back(own[facei]);
-
-            // Neighbour cell
-            if (facei < mesh.nInternalFaces())
-            {
-                storage.push_back(nei[facei]);
-            }
-        }
-
-        // Sort + unique to eliminate duplicates
-        std::sort(storage.begin(), storage.end());
-        auto last = std::unique(storage.begin(), storage.end());
-        storage.resize(label(last - storage.begin()));
-
-        pointCellAddr[pointi] = storage;
-    }
-
-    return pcPtr_;
-}
-
-// Calculate point-cell from point-face information
-autoPtr<labelListList> pointCells_bitSet_faces(const polyMesh& mesh)
-{
-    const labelList& own = mesh.faceOwner();
-    const labelList& nei = mesh.faceNeighbour();
-    const labelListList& pFaces = mesh.pointFaces();
-
-    const label loopLen = mesh.nPoints();
-
-    auto pcPtr_ = autoPtr<labelListList>::New(mesh.nPoints());
-    auto& pointCellAddr = *pcPtr_;
-
-    // For tracking (only use each cell id once)
-    bitSet usedCells(mesh.nCells());
-
-    DynamicList<label> storage(256);
-
-    for (label pointi = 0; pointi < loopLen; ++pointi)
-    {
-        // Clear any previous contents
-        usedCells.unset(storage);
-        storage.clear();
-
-        for (const label facei : pFaces[pointi])
-        {
-            // Owner cell - only once
-            if (usedCells.set(own[facei]))
-            {
-                storage.push_back(own[facei]);
-            }
-
-            // Neighbour cell
-            if (facei < mesh.nInternalFaces() && usedCells.set(nei[facei]))
-            {
-                storage.push_back(nei[facei]);
-            }
-        }
-
-        pointCellAddr[pointi] = storage;
-    }
-
-    return pcPtr_;
-}
-
-
-// Calculate point-cell from cell-point information
-autoPtr<labelListList> pointCells_bitSet_alon(const polyMesh& mesh)
-{
-    autoPtr<labelListList> cellPoints = cellPoints_bitSet(mesh);
-
-    auto pcPtr_ = autoPtr<labelListList>::New(mesh.nPoints());
-
-    invertManyToMany(mesh.nPoints(), cellPoints(), *pcPtr_);
-
-    return pcPtr_;
-}
-
-
-// Eliminate duplicates with sort+unique
-autoPtr<labelListList> cellPoints_sorted(const polyMesh& mesh)
-{
-    // Calculate cell-point topology
-
-    auto cpPtr_ = autoPtr<labelListList>::New(mesh.nCells());
-    auto& cellPointAddr = *cpPtr_;
-
-    const cellList& cellLst = mesh.cells();
-    const faceList& faceLst = mesh.faces();
-
-    // Vertex labels for the current cell
-    DynamicList<label> vertices(256);
-
-    const label loopLen = mesh.nCells();
-
-    for (label celli = 0; celli < loopLen; ++celli)
-    {
-        // Clear any previous contents
-        vertices.clear();
-
-        for (const label facei : cellLst[celli])
-        {
-            for (const label pointi : faceLst[facei])
-            {
-                vertices.push_back(pointi);
-            }
-        }
-
-        // Sort + unique to eliminate duplicates
-        std::sort(vertices.begin(), vertices.end());
-        auto last = std::unique(vertices.begin(), vertices.end());
-        vertices.resize(label(last - vertices.begin()));
-
-        cellPointAddr[celli] = vertices;
-    }
-
-    return cpPtr_;
-}
-
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// Main program:
-
-int main(int argc, char *argv[])
-{
-    argList::noBanner();
-    argList::noParallel();
-    argList::noFunctionObjects();
-    argList::addOption("nCells", "number", "The number of cells");
-
-    #include "setRootCase.H"
-
-    const scalar cellCount(args.getOrDefault<scalar>("nCells", 1000));
-
-    const label nDivs(::round(::cbrt(cellCount)));
-
-    PDRblock blkMesh(boundBox(zero_one{}), labelVector::uniform(nDivs));
-
-    autoPtr<Time> dummyTimePtr(Time::New());
-
-    Info<< "Requested " << cellCount
-        << " cells, blockMesh with " << blkMesh.nCells() << " cells" << nl;
-
-    autoPtr<polyMesh> meshPtr = blkMesh.innerMesh
-    (
-        IOobject
-        (
-            "Testing",
-            dummyTimePtr->system(),
-            *dummyTimePtr,
-            IOobject::NO_READ,
-            IOobject::NO_WRITE,
-            IOobject::NO_REGISTER
-        )
-    );
-
-    auto& mesh = meshPtr();
-
-    printInfo(mesh);
-    printAlloc(mesh);
-
-    clockTime timing;
-
-    // pointCells
-    {
-        mesh.clearOut();
-        timing.resetTime();
-        (void) mesh.pointCells();
-        Info<< "pointCells (builtin): " << timing.elapsedTime() << " s" << nl;
-    }
-
-    // cellPoints
-    {
-        mesh.clearOut();
-        timing.resetTime();
-        (void) mesh.cellPoints();
-        Info<< "cellPoints (builtin): " << timing.elapsedTime() << " s" << nl;
-    }
-    Info<< nl;
-
-
-    // pointCells
-    {
-        mesh.clearOut();
-        timing.resetTime();
-        (void) pointCells_2212(mesh);
-        Info<< "pointCells (2212): " << timing.elapsedTime() << " s" << nl;
-    }
-
-    {
-        mesh.clearOut();
-        timing.resetTime();
-        (void) pointCells_2212mod(mesh);
-        Info<< "pointCells (2212mod): " << timing.elapsedTime() << " s" << nl;
-    }
-
-    {
-        mesh.clearOut();
-        timing.resetTime();
-        (void) pointCells_bitSet(mesh);
-        Info<< "pointCells (bitSet): " << timing.elapsedTime() << " s" << nl;
-    }
-
-    {
-        mesh.clearOut();
-        timing.resetTime();
-        (void) pointCells_linear(mesh);
-        Info<< "pointCells (linear): " << timing.elapsedTime() << " s" << nl;
-    }
-
-    {
-        mesh.clearOut();
-        timing.resetTime();
-        (void) pointCells_faces(mesh);
-        Info<< "pointCells (faces): " << timing.elapsedTime() << " s" << nl;
-    }
-
-    {
-        mesh.clearOut();
-        timing.resetTime();
-        (void) pointCells_bitSet_faces(mesh);
-        Info<< "pointCells (bitSet faces): " << timing.elapsedTime() << " s" << nl;
-    }
-
-    {
-        mesh.clearOut();
-        timing.resetTime();
-        (void) pointCells_bitSet_alon(mesh);
-        Info<< "pointCells (bitSet alon): " << timing.elapsedTime() << " s" << nl;
-    }
-
-    // cellPoints
-    {
-        mesh.clearOut();
-        timing.resetTime();
-        (void) cellPoints_2212(mesh);
-        Info<< "cellPoints (2212): " << timing.elapsedTime() << " s" << nl;
-    }
-
-    {
-        mesh.clearOut();
-        timing.resetTime();
-        (void) cellPoints_bitSet(mesh);
-        Info<< "cellPoints (bitSet): " << timing.elapsedTime() << " s" << nl;
-    }
-
-    {
-        mesh.clearOut();
-        timing.resetTime();
-        (void) cellPoints_linear(mesh);
-        Info<< "cellPoints (linear): " << timing.elapsedTime() << " s" << nl;
-    }
-
-    {
-        mesh.clearOut();
-        timing.resetTime();
-        (void) cellPoints_sorted(mesh);
-        Info<< "cellPoints (sorted): " << timing.elapsedTime() << " s" << nl;
-    }
-
-
-    // With precalculated values
-    {
-        mesh.clearOut();
-        const auto& cp = mesh.cellPoints();
-        timing.resetTime();
-
-        auto pcPtr_ = autoPtr<labelListList>::New(mesh.nPoints());
-
-        invertManyToMany(mesh.nPoints(), cp, *pcPtr_);
-
-        Info<< "pointCells (from cached cellPoints): " << timing.elapsedTime() << " s" << nl;
-    }
-
-    // With precalculated values
-    {
-        mesh.clearOut();
-        (void)mesh.pointFaces();
-        timing.resetTime();
-
-        (void) pointCells_bitSet_faces(mesh);
-
-        Info<< "pointCells (bitSet from cached pointFaces): " << timing.elapsedTime() << " s" << nl;
-    }
-
-
-    // With precalculated values
-    {
-        mesh.clearOut();
-        const auto& pc = mesh.pointCells();
-        timing.resetTime();
-
-        auto cpPtr_ = autoPtr<labelListList>::New(mesh.nCells());
-
-        invertManyToMany(mesh.nCells(), pc, *cpPtr_);
-
-        Info<< "cellPoints (from cached pointCells): " << timing.elapsedTime() << " s" << nl;
-    }
-
-
-    // Re-measure timings
-    Info<< nl;
-    {
-        mesh.clearOut();
-        timing.resetTime();
-        (void) mesh.pointCells();
-        Info<< "pointCells (builtin): " << timing.elapsedTime() << " s" << nl;
-    }
-
-    {
-        mesh.clearOut();
-        timing.resetTime();
-        (void) mesh.cellPoints();
-        Info<< "cellPoints (builtin): " << timing.elapsedTime() << " s" << nl;
-    }
-
-    Info<< "\nEnd\n" << nl;
-
-    return 0;
-}
-
-
-// ************************************************************************* //

applications/test/primitives/Test-primitives.C

@@ -224,21 +224,73 @@ int main(int argc, char *argv[])
             << lerp(vector::uniform(0), vector::uniform(100), 0.5) << nl;
     }
 
+    {
+        const lerpOp1<vector> half(0.5);
+
+        const vector a(vector::uniform(20));
+        const vector b(vector::uniform(100));
+
+        Info<< "lerp half: "
+            << a << " : " << b << " => " << half(a, b) << nl;
+    }
+
     {
         const labelVector a(labelVector::uniform(10000));
         const labelVector b(labelVector::uniform(1));
 
-        Info<<"lerp (labelVector) = "
+        Info<< "lerp (labelVector) = "
             << lerp(a, b, 0.1) << nl;
     }
 
+    {
+        const scalar a(0);
+        const scalar b(100);
+
+        Info<< "lerp of " << a << " : " << b << nl;
+
+        for (const double t : { 0.0, 0.5, 1.0, -0.5, 1.5 })
+        {
+            Info<< "    " << t << " = " << lerp(a, b, t) << nl;
+        }
+    }
+
+
+    // No yet
+    #if 0
+    {
+        const label a(10000);
+        const label b(1);
+
+        Info<<"lerp (label) = "
+            << label(lerp(a, b, 0.1)) << nl;
+    }
+
+    {
+        const bool a(true);
+        const bool b(false);
+
+        Info<<"lerp (bool) = "
+            << (lerp(a, b, 0.5)) << nl;
+    }
+    #endif
+
     {
         const sphericalTensor a(10), b(20);
 
         Info<<"lerp exact: "
             << (a == lerp(a, b, 0.0f)) << " "
             << (b == lerp(a, b, 1.0f)) << nl;
-//
+//        Info<< "lerp: "
+//            << lerp(vector::uniform(0), vector::uniform(100), 0.5) << nl;
+    }
+
+    {
+        const tensor a(tensor::uniform(1e24));
+        const tensor b(tensor::uniform(0));
+
+        Info<<"lerp exact: "
+            << (a == lerp(a, b, 0.0f)) << " "
+            << (b == lerp(a, b, 1.0f)) << nl;
 //        Info<< "lerp: "
 //            << lerp(vector::uniform(0), vector::uniform(100), 0.5) << nl;
     }

applications/test/triangleIntersection/Test-triangleIntersection.C

@@ -88,7 +88,8 @@ int main(int argc, char *argv[])
     // Info<<"tree-bb faces: " << treeBoundBox::faces << nl
     //     <<"tree-bb edges: " << treeBoundBox::edges << endl;
 
-    treeBoundBox bb(zero_one{});
+    treeBoundBox bb;
+    bb = cube(0, 1);
 
     triPoints tri;
     tri.a() = point(-0.1, 0.5, 0.5);

applications/utilities/finiteArea/checkFaMesh/faMeshWriteVTK.H

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2021-2023 OpenCFD Ltd.
+    Copyright (C) 2021-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
@@ -76,9 +76,9 @@ Description
     writer.beginCellData(4);
     writer.writeProcIDs();
     {
+        // Use primitive patch order
         Field<scalar> fld
         (
-            // Use primitive patch order
             faMeshTools::flattenEdgeField(aMesh.magLe(), true)
         );
         writer.write("magLe", fld);
@@ -93,17 +93,11 @@ Description
 }
 
 {
-    const Field<vector> edgeCentres
-    (
-        // Use primitive patch order
-        faMeshTools::flattenEdgeField(aMesh.edgeCentres(), true)
-    );
-
     // finiteArea - edgeCentres
     // (no other convenient way to display vectors on the edges)
     vtk::lineWriter writer
     (
-        edgeCentres,
+        aMesh.edgeCentres(),
         edgeList::null(),
         // vtk::formatType::INLINE_ASCII,
         fileName
@@ -115,20 +109,19 @@ Description
     writer.writeGeometry();
 
     // PointData
-    writer.beginPointData(3);
-    writer.writeProcIDs();  // Unfortunately cannot threshold on points
+    writer.beginPointData(4);
     {
+        // Use primitive patch order
         Field<vector> fld
         (
-            // Use primitive patch order
             faMeshTools::flattenEdgeField(aMesh.Le(), true)
         );
         writer.write("Le", fld);
     }
     {
+        // Use primitive patch order
         Field<vector> fld
         (
-            // Use primitive patch order
             faMeshTools::flattenEdgeField(aMesh.edgeAreaNormals(), true)
         );
         writer.write("normal", fld);

bin/mpirunDebug

@@ -7,7 +7,7 @@
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 #     Copyright (C) 2011-2015 OpenFOAM Foundation
-#     Copyright (C) 2017-2023 OpenCFD Ltd.
+#     Copyright (C) 2017-2021 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
@@ -45,7 +45,6 @@ options:
   -local        Same as -spawn=1
   -remote       Same as -spawn=2
   -clean        Remove old processor*.{log,sh} files, mpirun.schema etc
-  -decompose-dict=<file>   Specific decomposeParDict name
   -help         Print the usage
 
 Invoke mpirun with separate per-processor log files or running in
@@ -112,7 +111,7 @@ Linux)
 esac
 
 unset appName appArgs nProcs
-unset method spawn optClean optValue
+unset method spawn optClean
 optConfirm=true
 
 decompDict="system/decomposeParDict"
@@ -127,7 +126,7 @@ do
     then
         knownOption=true  # Assume success
         case "$1" in
-        ('') ;;  # Ignore junk
+        '') ;;  # ignore junk
 
         -clean)     optClean=true ;;
         -yes)       unset optConfirm ;;
@@ -174,25 +173,14 @@ do
             shift
             ;;
 
-        (-decompose-dict=*)
-            optValue="${1#*=}"
-            case "$optValue" in
-            ('' | none | false) ;;  ## Ignore
-            (*)
-                decompDict="$optValue"
-                appArgs="${appArgs}${appArgs:+ }-decomposeParDict '$decompDict'"
-                ;;
-            esac
-            ;;
-
         -decomposeParDict)
             # Grab values and add to args immediately
             decompDict="$2"
+            appArgs="${appArgs}${appArgs:+ }$1 '$2'"
             shift
-            appArgs="${appArgs}${appArgs:+ }-decomposeParDict '$decompDict'"
             ;;
 
-        (*)
+        *)
             knownOption=false  # Fallthrough to regular processing
             ;;
         esac
@@ -204,24 +192,23 @@ do
         fi
     fi
 
-    # Processing application arguments
     case "$1" in
-    (-help* | --help*) usage ;;
-    ('') ;;  ## Ignore junk
+    -help* | --help*) usage ;;
+    '') ;;  # ignore junk
 
-    (-np)
+    -np)
         nProcs="$2"
         shift
         ;;
 
-    (-decomposeParDict)
+    -decomposeParDict)
         # Grab values and add to args immediately
         decompDict="$2"
-        appArgs="${appArgs}${appArgs:+ }-decomposeParDict '$decompDict'"
+        appArgs="${appArgs}${appArgs:+ }$1 '$2'"
         shift
         ;;
 
-    (*)
+    *)
         if [ -z "$appName" ]
         then
             appName="$1"

bin/tools/RunFunctions

@@ -6,7 +6,7 @@
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 #     Copyright (C) 2011-2016 OpenFOAM Foundation
-#     Copyright (C) 2015-2023 OpenCFD Ltd.
+#     Copyright (C) 2015-2022 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
@@ -180,16 +180,6 @@ getNumberOfProcessors()
 {
     local dict="${1:-system/decomposeParDict}"
 
-    case "$dict" in
-    (system/*)  # Already qualified
-        ;;
-    (*)
-        # If it does not exist, assume it refers to location in system/
-        [ -f "$dict" ] || dict="system/$dict"
-        ;;
-    esac
-
-
     # Re-use positional parameters for automatic whitespace elimination
     set -- $(foamDictionary -entry numberOfSubdomains -value "$dict" 2>/dev/null)
 
@@ -233,7 +223,7 @@ getApplication()
 #
 runApplication()
 {
-    local appName appRun optValue logFile logMode
+    local appName appRun logFile logMode
 
     # Any additional parsed arguments (eg, decomposeParDict)
     local appArgs
@@ -242,39 +232,25 @@ runApplication()
     while [ "$#" -gt 0 ] && [ -z "$appRun" ]
     do
         case "$1" in
-        ('') ;;  # Ignore junk
-
-        (-a | -append)
-            logMode=append
-            ;;
-        (-o | -overwrite)
-            logMode=overwrite
-            ;;
-        (-s | -suffix)
-            logFile=".$2"
-            shift
-            ;;
-
-        (-decompose-dict=*)
-            optValue="${1#*=}"
-            case "$optValue" in
-            ('' | none | false) ;;  ## Ignore
-            (*) appArgs="$appArgs -decomposeParDict $optValue" ;;
-            esac
-            ;;
-
-        (-decomposeParDict)
-            optValue="$2"
-            shift
-            case "$optValue" in
-            ('' | none | false) ;; ## Ignore
-            (*) appArgs="$appArgs -decomposeParDict $optValue" ;;
-            esac
-            ;;
-
-        (*)
-            appRun="$1"
-            ;;
+            -a | -append)
+                logMode=append
+                ;;
+            -o | -overwrite)
+                logMode=overwrite
+                ;;
+            -s | -suffix)
+                logFile=".$2"
+                shift
+                ;;
+            -decomposeParDict)
+                appArgs="$appArgs $1 $2"
+                shift
+                ;;
+            '')
+                ;;
+            *)
+                appRun="$1"
+                ;;
         esac
         shift
     done
@@ -304,7 +280,7 @@ runApplication()
 #
 runParallel()
 {
-    local appName appRun optValue logFile logMode nProcs
+    local appName appRun logFile logMode nProcs
 
     # Any additional parsed arguments (eg, decomposeParDict)
     local appArgs="-parallel"
@@ -319,46 +295,30 @@ runParallel()
     while [ "$#" -gt 0 ] && [ -z "$appRun" ]
     do
         case "$1" in
-        ('') ;;  # Ignore junk
-
-        (-a | -append)
-            logMode=append
-            ;;
-        (-o | -overwrite)
-            logMode=overwrite
-            ;;
-        (-s | -suffix)
-            logFile=".$2"
-            shift
-            ;;
-        (-n | -np)
-            nProcs="$2"
-            shift
-            ;;
-        (-decompose-dict=*)
-            optValue="${1#*=}"
-            case "$optValue" in
-            ('' | none | false) ;;  ## Ignore
-            (*)
-                appArgs="$appArgs -decomposeParDict $optValue"
-                nProcs="$(getNumberOfProcessors "$optValue")"
+            -a | -append)
+                logMode=append
                 ;;
-            esac
-            ;;
-        (-decomposeParDict)
-            optValue="$2"
-            shift
-            case "$optValue" in
-            ('' | none | false) ;;  ## Ignore
-            (*)
-                appArgs="$appArgs -decomposeParDict $optValue"
-                nProcs="$(getNumberOfProcessors "$optValue")"
+            -o | -overwrite)
+                logMode=overwrite
+                ;;
+            -s | -suffix)
+                logFile=".$2"
+                shift
+                ;;
+            -n | -np)
+                nProcs="$2"
+                shift
+                ;;
+            -decomposeParDict)
+                appArgs="$appArgs $1 $2"
+                nProcs=$(getNumberOfProcessors "$2")
+                shift
+                ;;
+            '')
+                ;;
+            *)
+                appRun="$1"
                 ;;
-            esac
-            ;;
-         (*)
-            appRun="$1"
-            ;;
         esac
         shift
     done

src/OpenFOAM/containers/PtrLists/PtrList/PtrList.H

@@ -173,10 +173,6 @@ public:
         //- (discard old element at that location).
         //- Return reference to the new list element.
         template<class... Args>
-        inline T& emplace_set(const label i, Args&&... args);
-
-        //- Same as emplace_set()
-        template<class... Args>
         inline T& emplace(const label i, Args&&... args);
 
         //- Set element to given pointer and return old element (can be null)

src/OpenFOAM/containers/PtrLists/PtrList/PtrListI.H

@@ -172,17 +172,11 @@ inline void Foam::PtrList<T>::push_back(PtrList<T>&& other)
 
 template<class T>
 template<class... Args>
-inline T& Foam::PtrList<T>::emplace_set(const label i, Args&&... args)
-{
-    T* ptr = new T(std::forward<Args>(args)...);
-    (void)this->set(i, ptr);
-    return *ptr;
-}
-
-
-template<class T>
-template<class... Args>
-inline T& Foam::PtrList<T>::emplace(const label i, Args&&... args)
+inline T& Foam::PtrList<T>::emplace
+(
+    const label i,
+    Args&&... args
+)
 {
     T* ptr = new T(std::forward<Args>(args)...);
     (void)this->set(i, ptr);

src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H

@@ -470,7 +470,8 @@ public:
 
     // Exchange
 
-        //- Helper: exchange sizes of sendBufs for specified send/recv ranks
+        //- Helper: exchange sizes of sendBufs for specified
+        //- set of send/receive processes.
         template<class Container>
         static void exchangeSizes
         (
@@ -482,17 +483,6 @@ public:
             const label comm = UPstream::worldComm
         );
 
-        //- Helper: exchange sizes of sendBufs for specified neighbour ranks
-        template<class Container>
-        static void exchangeSizes
-        (
-            const labelUList& neighProcs,
-            const Container& sendBufs,
-            labelList& sizes,
-            const label tag = UPstream::msgType(),
-            const label comm = UPstream::worldComm
-        );
-
         //- Helper: exchange sizes of sendBufs.
         //- The sendBufs is the data per processor (in the communicator).
         //  Returns sizes of sendBufs on the sending processor.

src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.C

@@ -28,30 +28,6 @@ License
 
 #include "PstreamBuffers.H"
 #include "bitSet.H"
-#include "debug.H"
-#include "registerSwitch.H"
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-int Foam::PstreamBuffers::algorithm
-(
-    // Not really the most creative name...
-    Foam::debug::optimisationSwitch("pbufs.algorithm", -1)
-);
-registerOptSwitch
-(
-    "pbufs.algorithm",
-    int,
-    Foam::PstreamBuffers::algorithm
-);
-
-
-// Simple enumerations
-// -------------------
-static constexpr int algorithm_PEX_allToAll = -1;  // OpenFOAM 2212 and earlier
-//static constexpr int algorithm_PEX_hybrid = 0;   // New default?
-static constexpr int algorithm_full_NBX = 1;       // Experimental
-
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
@@ -67,58 +43,9 @@ void Foam::PstreamBuffers::finalExchange
 
     if (commsType_ == UPstream::commsTypes::nonBlocking)
     {
-        if
-        (
-            wait
-         && (algorithm >= algorithm_full_NBX)
-         && (UPstream::maxCommsSize <= 0)
-        )
-        {
-            // NBX algorithm (nonblocking exchange)
-            // - when requested and waiting, no data chunking etc
+        // Dense storage uses all-to-all
+        Pstream::exchangeSizes(sendBuffers_, recvSizes, comm_);
 
-            PstreamDetail::exchangeConsensus<DynamicList<char>, char>
-            (
-                sendBuffers_,
-                recvBuffers_,
-                recvSizes,
-                (tag_ + 271828),  // some unique tag?
-                comm_,
-                wait
-            );
-
-            return;
-        }
-
-
-        // PEX algorithm with two different flavours of exchanging sizes
-
-        // Assemble the send sizes (cf. Pstream::exchangeSizes)
-        labelList sendSizes(nProcs_);
-        forAll(sendBuffers_, proci)
-        {
-            sendSizes[proci] = sendBuffers_[proci].size();
-        }
-        recvSizes.resize_nocopy(nProcs_);
-
-        if (algorithm == algorithm_PEX_allToAll)
-        {
-            // PEX stage 1: exchange sizes (all-to-all)
-            UPstream::allToAll(sendSizes, recvSizes, comm_);
-        }
-        else
-        {
-            // PEX stage 1: exchange sizes (non-blocking consensus)
-            UPstream::allToAllConsensus
-            (
-                sendSizes,
-                recvSizes,
-                (tag_ + 314159),  // some unique tag?
-                comm_
-            );
-        }
-
-        // PEX stage 2: point-to-point data exchange
         Pstream::exchange<DynamicList<char>, char>
         (
             sendBuffers_,
@@ -146,30 +73,6 @@ void Foam::PstreamBuffers::finalExchange
 
     if (commsType_ == UPstream::commsTypes::nonBlocking)
     {
-        // Preparation. Temporarily abuse recvSizes as logic to clear
-        // send buffers that are not in the neighbourhood connection
-        {
-            recvSizes.resize_nocopy(nProcs_);
-            recvSizes = 0;
-
-            // Preserve self-send, even if not described by neighbourhood
-            recvSizes[UPstream::myProcNo(comm_)] = 1;
-
-            for (const label proci : sendProcs)
-            {
-                recvSizes[proci] = 1;  // Connected
-            }
-
-            for (label proci=0; proci < nProcs_; ++proci)
-            {
-                if (!recvSizes[proci])  // Not connected
-                {
-                    sendBuffers_[proci].clear();
-                }
-            }
-        }
-
-        // PEX stage 1: exchange sizes (limited neighbourhood)
         Pstream::exchangeSizes
         (
             sendProcs,
@@ -180,7 +83,6 @@ void Foam::PstreamBuffers::finalExchange
             comm_
         );
 
-        // PEX stage 2: point-to-point data exchange
         Pstream::exchange<DynamicList<char>, char>
         (
             sendBuffers_,
@@ -194,10 +96,11 @@ void Foam::PstreamBuffers::finalExchange
 }
 
 
-void Foam::PstreamBuffers::finalGatherScatter
+void Foam::PstreamBuffers::finalExchangeGatherScatter
 (
     const bool isGather,
     const bool wait,
+    const bool needSizes,
     labelList& recvSizes
 )
 {
@@ -230,12 +133,6 @@ void Foam::PstreamBuffers::finalGatherScatter
 
     if (commsType_ == UPstream::commsTypes::nonBlocking)
     {
-        // Use PEX algorithm
-        // - for a non-sparse gather/scatter, it is presumed that
-        // MPI_Gather/MPI_Scatter will be the most efficient way to
-        // communicate the sizes.
-
-        // PEX stage 1: exchange sizes (gather or scatter)
         if (isGather)
         {
             // gather mode (all-to-one): master [0] <- everyone
@@ -269,7 +166,7 @@ void Foam::PstreamBuffers::finalGatherScatter
             recvSizes[0] = myRecv;
         }
 
-        // PEX stage 2: point-to-point data exchange
+
         Pstream::exchange<DynamicList<char>, char>
         (
             sendBuffers_,
@@ -481,7 +378,7 @@ Foam::label Foam::PstreamBuffers::recvDataCount(const label proci) const
 
 Foam::labelList Foam::PstreamBuffers::recvDataCounts() const
 {
-    labelList counts(nProcs_, Zero);
+    labelList counts(recvPositions_.size(), Zero);
 
     if (finishedSendsCalled_)
     {
@@ -507,20 +404,17 @@ Foam::labelList Foam::PstreamBuffers::recvDataCounts() const
 }
 
 
-Foam::label Foam::PstreamBuffers::maxNonLocalRecvCount
-(
-    const label excludeProci
-) const
+Foam::label Foam::PstreamBuffers::maxNonLocalRecvCount(const label proci) const
 {
     label maxLen = 0;
 
     if (finishedSendsCalled_)
     {
-        forAll(recvBuffers_, proci)
+        forAll(recvBuffers_, idx)
         {
-            if (excludeProci != proci)
+            const label len(recvBuffers_[idx].size() - recvPositions_[idx]);
+            if (idx != proci)
             {
-                label len(recvBuffers_[proci].size() - recvPositions_[proci]);
                 maxLen = max(maxLen, len);
             }
         }
@@ -600,9 +494,6 @@ void Foam::PstreamBuffers::finishedSends
     const bool wait
 )
 {
-    // Resize for copying back
-    recvSizes.resize_nocopy(sendBuffers_.size());
-
     finalExchange(wait, recvSizes);
 
     if (commsType_ != UPstream::commsTypes::nonBlocking)
@@ -619,25 +510,39 @@ void Foam::PstreamBuffers::finishedSends
 }
 
 
-void Foam::PstreamBuffers::finishedNeighbourSends
+void Foam::PstreamBuffers::finishedSends
 (
-    const labelUList& neighProcs,
-    labelList& recvSizes,
-    const bool wait
-)
-{
-    finalExchange(neighProcs, neighProcs, wait, recvSizes);
-}
-
-
-void Foam::PstreamBuffers::finishedNeighbourSends
-(
-    const labelUList& neighProcs,
+    const labelUList& sendProcs,
+    const labelUList& recvProcs,
     const bool wait
 )
 {
     labelList recvSizes;
-    finalExchange(neighProcs, neighProcs, wait, recvSizes);
+    finalExchange(sendProcs, recvProcs, wait, recvSizes);
+}
+
+
+void Foam::PstreamBuffers::finishedSends
+(
+    const labelUList& sendProcs,
+    const labelUList& recvProcs,
+    labelList& recvSizes,
+    const bool wait
+)
+{
+    finalExchange(sendProcs, recvProcs, wait, recvSizes);
+
+    if (commsType_ != UPstream::commsTypes::nonBlocking)
+    {
+        FatalErrorInFunction
+            << "Obtaining sizes not supported in "
+            << UPstream::commsTypeNames[commsType_] << endl
+            << " since transfers already in progress. Use non-blocking instead."
+            << exit(FatalError);
+
+        // Note: maybe possible only if using different tag from write started
+        // by ~UOPstream. Needs some work.
+    }
 }
 
 
@@ -657,8 +562,10 @@ bool Foam::PstreamBuffers::finishedSends
     }
 
     // Update send connections
+    // - reasonable to assume there are no self-sends on UPstream::myProcNo
     forAll(sendBuffers_, proci)
     {
+        // ie, sendDataCount(proci) != 0
         if (sendConnections.set(proci, !sendBuffers_[proci].empty()))
         {
             // The state changed
@@ -670,20 +577,22 @@ bool Foam::PstreamBuffers::finishedSends
 
     if (changed)
     {
-        // Update send/recv topology
-        labelList recvSizes;
-        finishedSends(recvSizes, wait);  // eg, using all-to-all
+        // Create send/recv topology
 
         // The send ranks
         sendProcs.clear();
         forAll(sendBuffers_, proci)
         {
+            // ie, sendDataCount(proci) != 0
             if (!sendBuffers_[proci].empty())
             {
                 sendProcs.push_back(proci);
             }
         }
 
+        labelList recvSizes;
+        finishedSends(recvSizes, wait);  // All-to-all
+
         // The recv ranks
         recvProcs.clear();
         forAll(recvSizes, proci)
@@ -697,25 +606,46 @@ bool Foam::PstreamBuffers::finishedSends
     else
     {
         // Use existing send/recv ranks
-        labelList recvSizes;
-        finalExchange(sendProcs, recvProcs, wait, recvSizes);
+
+        finishedSends(sendProcs, recvProcs, wait);
     }
 
     return changed;
 }
 
 
+void Foam::PstreamBuffers::finishedNeighbourSends
+(
+    const labelUList& neighProcs,
+    labelList& recvSizes,
+    const bool wait
+)
+{
+    finishedSends(neighProcs, neighProcs, recvSizes, wait);
+}
+
+
+void Foam::PstreamBuffers::finishedNeighbourSends
+(
+    const labelUList& neighProcs,
+    const bool wait
+)
+{
+    finishedSends(neighProcs, neighProcs, wait);
+}
+
+
 void Foam::PstreamBuffers::finishedGathers(const bool wait)
 {
     labelList recvSizes;
-    finalGatherScatter(true, wait, recvSizes);
+    finalExchangeGatherScatter(true, wait, false, recvSizes);
 }
 
 
 void Foam::PstreamBuffers::finishedScatters(const bool wait)
 {
     labelList recvSizes;
-    finalGatherScatter(false, wait, recvSizes);
+    finalExchangeGatherScatter(false, wait, false, recvSizes);
 }
 
 
@@ -725,7 +655,7 @@ void Foam::PstreamBuffers::finishedGathers
     const bool wait
 )
 {
-    finalGatherScatter(true, wait, recvSizes);
+    finalExchangeGatherScatter(true, wait, true, recvSizes);
 
     if (commsType_ != UPstream::commsTypes::nonBlocking)
     {
@@ -747,7 +677,7 @@ void Foam::PstreamBuffers::finishedScatters
     const bool wait
 )
 {
-    finalGatherScatter(false, wait, recvSizes);
+    finalExchangeGatherScatter(false, wait, true, recvSizes);
 
     if (commsType_ != UPstream::commsTypes::nonBlocking)
     {

src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.H

@@ -164,7 +164,7 @@ class PstreamBuffers
         );
 
         //- Mark sends as done.
-        //  Only exchange sizes using the neighbour ranks
+        //  Only exchange sizes using the sendProcs/recvProcs subset
         //  (nonBlocking comms).
         void finalExchange
         (
@@ -175,10 +175,11 @@ class PstreamBuffers
         );
 
         //- For all-to-one or one-to-all
-        void finalGatherScatter
+        void finalExchangeGatherScatter
         (
             const bool isGather,
             const bool wait,
+            const bool needSizes,   // If recvSizes needed or scratch
             labelList& recvSizes
         );
 
@@ -201,12 +202,6 @@ class PstreamBuffers
 
 public:
 
-    // Static Data
-
-        //- Preferred exchange algorithm (may change or be removed in future)
-        static int algorithm;
-
-
     // Constructors
 
         //- Construct given communication type (default: nonBlocking), message
@@ -345,7 +340,7 @@ public:
 
         //- Maximum receive size, excluding the specified processor rank
         //- Must call finishedSends() or other finished.. method first!
-        label maxNonLocalRecvCount(const label excludeProci) const;
+        label maxNonLocalRecvCount(const label proci) const;
 
         //- Number of unconsumed receive bytes for the specified processor.
         //- Must call finishedSends() or other finished.. method first!
@@ -402,6 +397,60 @@ public:
 
     // Functions with restricted neighbours
 
+        //- Mark sends as done using subset of send/recv ranks
+        //- to exchange data on.
+        //
+        //  Non-blocking mode: populates receive buffers.
+        //  \param sendProcs ranks used for sends
+        //  \param recvProcs ranks used for recvs
+        //  \param wait wait for requests to complete (in nonBlocking mode)
+        //
+        //  \warning currently only valid for nonBlocking comms.
+        void finishedSends
+        (
+            const labelUList& sendProcs,
+            const labelUList& recvProcs,
+            const bool wait = true
+        );
+
+        //- Mark sends as done using subset of send/recv ranks
+        //- to exchange data on. Recovers the sizes (bytes) received.
+        //
+        //  Non-blocking mode: populates receive buffers.
+        //
+        //  \param sendProcs ranks used for sends
+        //  \param recvProcs ranks used for recvs
+        //  \param[out] recvSizes the sizes (bytes) received
+        //  \param wait wait for requests to complete (in nonBlocking mode)
+        //
+        //  \warning currently only valid for nonBlocking comms.
+        void finishedSends
+        (
+            const labelUList& sendProcs,
+            const labelUList& recvProcs,
+            labelList& recvSizes,
+            const bool wait = true
+        );
+
+        //- A caching version that uses a limited send/recv connectivity.
+        //
+        //  Non-blocking mode: populates receive buffers.
+        //  \param sendConnections on/off for sending ranks
+        //  \param sendProcs ranks used for sends
+        //  \param recvProcs ranks used for recvs
+        //  \param wait wait for requests to complete (in nonBlocking mode)
+        //
+        //  \return True if the send/recv connectivity changed
+        //
+        //  \warning currently only valid for nonBlocking comms.
+        bool finishedSends
+        (
+            bitSet& sendConnections,
+            DynamicList<label>& sendProcs,
+            DynamicList<label>& recvProcs,
+            const bool wait = true
+        );
+
         //- Mark sends as done using subset of send/recv ranks
         //- and recover the sizes (bytes) received.
         //
@@ -435,25 +484,6 @@ public:
             const bool wait = true
         );
 
-        //- A caching version that uses a limited send/recv connectivity.
-        //
-        //  Non-blocking mode: populates receive buffers.
-        //  \param sendConnections on/off for sending ranks
-        //  \param sendProcs ranks used for sends
-        //  \param recvProcs ranks used for recvs
-        //  \param wait wait for requests to complete (in nonBlocking mode)
-        //
-        //  \return True if the send/recv connectivity changed
-        //
-        //  \warning currently only valid for nonBlocking comms.
-        bool finishedSends
-        (
-            bitSet& sendConnections,
-            DynamicList<label>& sendProcs,
-            DynamicList<label>& recvProcs,
-            const bool wait = true
-        );
-
 
     // Gather/scatter modes
 

src/OpenFOAM/db/IOstreams/Pstreams/PstreamExchange.C

@@ -746,89 +746,58 @@ void Foam::Pstream::exchangeSizes
     const label comm
 )
 {
-    const label myProci = UPstream::myProcNo(comm);
-    const label numProcs = UPstream::nProcs(comm);
+    //const label myProci = UPstream::myProcNo(comm);
 
-    if (sendBufs.size() != numProcs)
+    if (sendBufs.size() != UPstream::nProcs(comm))
     {
         FatalErrorInFunction
             << "Size of container " << sendBufs.size()
-            << " does not equal the number of processors " << numProcs
+            << " does not equal the number of processors "
+            << UPstream::nProcs(comm)
             << Foam::abort(FatalError);
     }
 
-    labelList sendSizes(numProcs);
-    for (label proci = 0; proci < numProcs; ++proci)
+    labelList sendSizes(sendProcs.size());
+    forAll(sendProcs, i)
     {
-        sendSizes[proci] = sendBufs[proci].size();
+        sendSizes[i] = sendBufs[sendProcs[i]].size();
     }
 
-    recvSizes.resize_nocopy(numProcs);
+    recvSizes.resize_nocopy(sendBufs.size());
     recvSizes = 0;  // Ensure non-received entries are properly zeroed
 
-    // Preserve self-send, even if not described by neighbourhood
-    recvSizes[myProci] = sendSizes[myProci];
-
     const label startOfRequests = UPstream::nRequests();
 
     for (const label proci : recvProcs)
     {
-        if (proci != myProci)
-        {
-            UIPstream::read
-            (
-                UPstream::commsTypes::nonBlocking,
-                proci,
-                reinterpret_cast<char*>(&recvSizes[proci]),
-                sizeof(label),
-                tag,
-                comm
-            );
-        }
+        UIPstream::read
+        (
+            UPstream::commsTypes::nonBlocking,
+            proci,
+            reinterpret_cast<char*>(&recvSizes[proci]),
+            sizeof(label),
+            tag,
+            comm
+        );
     }
 
-    for (const label proci : sendProcs)
+    forAll(sendProcs, i)
     {
-        if (proci != myProci)
-        {
-            UOPstream::write
-            (
-                UPstream::commsTypes::nonBlocking,
-                proci,
-                reinterpret_cast<char*>(&sendSizes[proci]),
-                sizeof(label),
-                tag,
-                comm
-            );
-        }
+        UOPstream::write
+        (
+            UPstream::commsTypes::nonBlocking,
+            sendProcs[i],
+            reinterpret_cast<char*>(&sendSizes[i]),
+            sizeof(label),
+            tag,
+            comm
+        );
     }
 
     UPstream::waitRequests(startOfRequests);
 }
 
 
-template<class Container>
-void Foam::Pstream::exchangeSizes
-(
-    const labelUList& neighProcs,
-    const Container& sendBufs,
-    labelList& recvSizes,
-    const label tag,
-    const label comm
-)
-{
-    Pstream::exchangeSizes<Container>
-    (
-        neighProcs,  // send
-        neighProcs,  // recv
-        sendBufs,
-        recvSizes,
-        tag,
-        comm
-    );
-}
-
-
 // Sparse sending
 template<class Container>
 void Foam::Pstream::exchangeSizes

src/OpenFOAM/db/IOstreams/Pstreams/PstreamReduceOps.H

@@ -58,7 +58,7 @@ void reduce
     const label comm
 )
 {
-    if (UPstream::warnComm >= 0 && comm != UPstream::warnComm)
+    if (UPstream::warnComm != -1 && comm != UPstream::warnComm)
     {
         Pout<< "** reducing:" << value << " with comm:" << comm << endl;
         error::printStack(Pout);

src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H

@@ -284,52 +284,24 @@ public:
 
     // Standard Communicators
 
-        //- Communicator for all ranks.
+        //- Default world communicator (all processors).
         //- May differ from globalComm if local worlds are in use
         static label worldComm;
 
         //- Debugging: warn for use of any communicator differing from warnComm
         static label warnComm;
 
-        //- Communicator for all ranks, irrespective of any local worlds
+        //- Communicator for all processors, irrespective of any local worlds
         static constexpr label globalComm = 0;
 
         //- A communicator within the current rank only
         static constexpr label selfComm = 1;
 
-        //- Communicator for all ranks, irrespective of any local worlds
-        static constexpr label commGlobal() noexcept { return 0; }
-
-        //- Communicator within the current rank only
-        static constexpr label commSelf() noexcept { return 1; }
-
-        //- Communicator for all ranks (respecting any local worlds)
-        static label commWorld() noexcept { return worldComm; }
-
-        //- Alter value of world communicator
-        //  \returns the previous value
-        static label commWorld(const label communicator) noexcept
-        {
-            label old(worldComm);
-            worldComm = communicator;
-            return old;
-        }
-
-        //- Alter communicator debugging setting.
-        //- Warns for use of any communicator differing from specified.
-        //  \returns the previous warn communicator
-        static label commWarn(const label communicator) noexcept
-        {
-            label old(warnComm);
-            warnComm = communicator;
-            return old;
-        }
-
         //- Number of currently defined communicators
         static label nComms() noexcept { return parentComm_.size(); }
 
         //- True if communicator appears to be user-allocated
-        static bool isUserComm(const label communicator) noexcept
+        static bool isUserComm(label communicator) noexcept
         {
             return (communicator > worldComm && communicator > selfComm);
         }

src/OpenFOAM/db/error/messageStream.C

@@ -143,7 +143,7 @@ Foam::OSstream& Foam::messageStream::stream(OSstream* alternative)
 
 Foam::OSstream& Foam::messageStream::masterStream(const label communicator)
 {
-    if (UPstream::warnComm >= 0 && communicator != UPstream::warnComm)
+    if (UPstream::warnComm != -1 && communicator != UPstream::warnComm)
     {
         Pout<< "** messageStream with comm:" << communicator << endl;
         error::printStack(Pout);

src/OpenFOAM/fields/GeometricFields/pointFields/pointFields.C

@@ -6,7 +6,6 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -34,14 +33,12 @@ License
 namespace Foam
 {
 
-defineTemplateTypeNameAndDebug(pointLabelField::Internal, 0);
 defineTemplateTypeNameAndDebug(pointScalarField::Internal, 0);
 defineTemplateTypeNameAndDebug(pointVectorField::Internal, 0);
 defineTemplateTypeNameAndDebug(pointSphericalTensorField::Internal, 0);
 defineTemplateTypeNameAndDebug(pointSymmTensorField::Internal, 0);
 defineTemplateTypeNameAndDebug(pointTensorField::Internal, 0);
 
-defineTemplateTypeNameAndDebug(pointLabelField, 0);
 defineTemplateTypeNameAndDebug(pointScalarField, 0);
 defineTemplateTypeNameAndDebug(pointVectorField, 0);
 defineTemplateTypeNameAndDebug(pointSphericalTensorField, 0);
@@ -57,7 +54,6 @@ defineTemplateTypeNameAndDebug(pointTensorField, 0);
 
 const Foam::wordList Foam::fieldTypes::point
 ({
-    "pointLabelField",
     "pointScalarField",
     "pointVectorField",
     "pointSphericalTensorField",

src/OpenFOAM/fields/GeometricFields/pointFields/pointFields.H

@@ -33,8 +33,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef Foam_pointFields_H
-#define Foam_pointFields_H
+#ifndef pointFields_H
+#define pointFields_H
 
 #include "GeometricFields.H"
 #include "pointMesh.H"

src/OpenFOAM/fields/GeometricFields/pointFields/pointFieldsFwd.H

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
-    Copyright (C) 2018-2023 OpenCFD Ltd.
+    Copyright (C) 2018-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -80,7 +80,6 @@ using PointInternalField = DimensionedField<Type, pointMesh>;
 
 // Typedefs
 
-typedef GeometricField<label, pointPatchField, pointMesh> pointLabelField;
 typedef GeometricField<scalar, pointPatchField, pointMesh> pointScalarField;
 typedef GeometricField<vector, pointPatchField, pointMesh> pointVectorField;
 typedef GeometricField<sphericalTensor, pointPatchField, pointMesh>

src/OpenFOAM/fields/pointPatchFields/basic/basicSymmetry/basicSymmetryPointPatchField.C

@@ -6,7 +6,6 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -30,6 +29,7 @@ License
 #include "transformField.H"
 #include "symmTransformField.H"
 
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
@@ -87,17 +87,15 @@ void Foam::basicSymmetryPointPatchField<Type>::evaluate
     const Pstream::commsTypes
 )
 {
-    if (pTraits<Type>::rank == 0)
-    {
-        // Transform-invariant types
-        return;
-    }
+    const vectorField& nHat = this->patch().pointNormals();
 
-    Field<Type> pif(this->patchInternalField());
-
-    symmTensorField rot(I - 2.0*sqr(this->patch().pointNormals()));
-
-    tmp<Field<Type>> tvalues = (pif + transform(rot, pif))/2.0;
+    tmp<Field<Type>> tvalues =
+    (
+        (
+            this->patchInternalField()
+          + transform(I - 2.0*sqr(nHat), this->patchInternalField())
+        )/2.0
+    );
 
     // Get internal field to insert values into
     Field<Type>& iF = const_cast<Field<Type>&>(this->primitiveField());

src/OpenFOAM/fields/pointPatchFields/basic/basicSymmetry/basicSymmetryPointPatchField.H

@@ -34,8 +34,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef Foam_basicSymmetryPointPatchField_H
-#define Foam_basicSymmetryPointPatchField_H
+#ifndef basicSymmetryPointPatchField_H
+#define basicSymmetryPointPatchField_H
 
 #include "pointPatchField.H"
 #include "symmetryPointPatch.H"
@@ -54,6 +54,7 @@ class basicSymmetryPointPatchField
 :
     public pointPatchField<Type>
 {
+
 public:
 
     // Constructors

src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchFields.C

@@ -6,7 +6,6 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
-    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -30,12 +29,17 @@ License
 #include "pointPatchFields.H"
 #include "addToRunTimeSelectionTable.H"
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-    makePointPatchFields(calculated);
-    makePointPatchFieldType(label, calculated);
-}
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+makePointPatchFields(calculated);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
 
 // ************************************************************************* //

src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchFields.H

@@ -6,7 +6,6 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
-    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -26,10 +25,11 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef Foam_calculatedPointPatchFields_H
-#define Foam_calculatedPointPatchFields_H
+#ifndef calculatedPointPatchFields_H
+#define calculatedPointPatchFields_H
 
 #include "calculatedPointPatchField.H"
+#include "fieldTypes.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -39,7 +39,6 @@ namespace Foam
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 makePointPatchFieldTypedefs(calculated);
-makePointPatchFieldTypedef(label, calculated);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

src/OpenFOAM/fields/pointPatchFields/basic/coupled/coupledPointPatchFields.C

@@ -6,7 +6,6 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
-    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -27,15 +26,18 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "coupledPointPatchFields.H"
-#include "pointPatchFields.H"
-#include "addToRunTimeSelectionTable.H"
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-    makePointPatchFieldsTypeName(coupled);
-    makePointPatchFieldTypeName(label, coupled);
-}
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+makePointPatchFieldsTypeName(coupled);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
 
 // ************************************************************************* //

src/OpenFOAM/fields/pointPatchFields/basic/coupled/coupledPointPatchFields.H

@@ -6,7 +6,6 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
-    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -26,10 +25,12 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef Foam_coupledPointPatchFields_H
-#define Foam_coupledPointPatchFields_H
+#ifndef coupledPointPatchFields_H
+#define coupledPointPatchFields_H
 
 #include "coupledPointPatchField.H"
+#include "coupledPointPatch.H"
+#include "fieldTypes.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -39,7 +40,6 @@ namespace Foam
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 makePointPatchFieldTypedefs(coupled);
-makePointPatchFieldTypedef(label, coupled);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.C

@@ -6,7 +6,6 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2015 OpenFOAM Foundation
-    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -27,6 +26,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "fixedValuePointPatchField.H"
+#include "boolList.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -47,10 +47,10 @@ Foam::fixedValuePointPatchField<Type>::fixedValuePointPatchField
     const pointPatch& p,
     const DimensionedField<Type, pointMesh>& iF,
     const dictionary& dict,
-    IOobjectOption::readOption requireValue
+    const bool valueRequired
 )
 :
-    valuePointPatchField<Type>(p, iF, dict, requireValue)
+    valuePointPatchField<Type>(p, iF, dict, valueRequired)
 {}
 
 

src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.H

@@ -6,7 +6,6 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -35,8 +34,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef Foam_fixedValuePointPatchField_H
-#define Foam_fixedValuePointPatchField_H
+#ifndef fixedValuePointPatchField_H
+#define fixedValuePointPatchField_H
 
 #include "valuePointPatchField.H"
 
@@ -54,6 +53,7 @@ class fixedValuePointPatchField
 :
     public valuePointPatchField<Type>
 {
+
 public:
 
     //- Runtime type information
@@ -75,25 +75,9 @@ public:
             const pointPatch&,
             const DimensionedField<Type, pointMesh>&,
             const dictionary&,
-            IOobjectOption::readOption requireValue = IOobjectOption::MUST_READ
+            const bool valueRequired=true
         );
 
-        //- Compatibility. Prefer with readOption
-        fixedValuePointPatchField
-        (
-            const pointPatch& p,
-            const DimensionedField<Type, pointMesh>& iF,
-            const dictionary& dict,
-            const bool valueReqd
-        )
-        :
-            fixedValuePointPatchField
-            (
-                p, iF, dict,
-                (valueReqd? IOobjectOption::MUST_READ : IOobjectOption::NO_READ)
-            )
-        {}
-
         //- Construct by mapping given patch field onto a new patch
         fixedValuePointPatchField
         (

src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C

@@ -84,17 +84,29 @@ Foam::valuePointPatchField<Type>::valuePointPatchField
     const pointPatch& p,
     const DimensionedField<Type, pointMesh>& iF,
     const dictionary& dict,
-    IOobjectOption::readOption requireValue
+    const bool valueRequired
 )
 :
     pointPatchField<Type>(p, iF, dict),
     Field<Type>(p.size())
 {
-    if (!readValueEntry(dict, requireValue))
+    const auto* hasValue = dict.findEntry("value", keyType::LITERAL);
+
+    if (hasValue)
+    {
+        Field<Type>::assign(*hasValue, p.size());
+    }
+    else if (!valueRequired)
     {
-        // Not read (eg, optional and missing): define zero
         Field<Type>::operator=(Zero);
     }
+    else
+    {
+        FatalIOErrorInFunction(dict)
+            << "Essential entry 'value' missing on patch "
+            << p.name() << endl
+            << exit(FatalIOError);
+    }
 }
 
 

src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.H

@@ -101,27 +101,10 @@ public:
         (
             const pointPatch&,
             const DimensionedField<Type, pointMesh>&,
-            const dictionary& dict,
-            //! The "value" entry (default: mandatory)
-            IOobjectOption::readOption requireValue = IOobjectOption::MUST_READ
+            const dictionary&,
+            const bool valueRequired=true
         );
 
-        //- Construct, forwarding to readOption variant
-        valuePointPatchField
-        (
-            const pointPatch& p,
-            const DimensionedField<Type, pointMesh>& iF,
-            const dictionary& dict,
-            const bool valueReqd
-        )
-        :
-            valuePointPatchField
-            (
-                p, iF, dict,
-                (valueReqd? IOobjectOption::MUST_READ : IOobjectOption::NO_READ)
-            )
-        {}
-
         //- Construct by mapping given patch field onto a new patch
         valuePointPatchField
         (

src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchFields.C

@@ -6,7 +6,6 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
-    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -30,12 +29,17 @@ License
 #include "pointPatchFields.H"
 #include "addToRunTimeSelectionTable.H"
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-    makePointPatchFields(value);
-    makePointPatchFieldTypeName(label, value);
-}
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+makePointPatchFields(value);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
 
 // ************************************************************************* //

src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchFields.H

@@ -6,7 +6,6 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
-    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -26,10 +25,11 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef Foam_valuePointPatchFields_H
-#define Foam_valuePointPatchFields_H
+#ifndef valuePointPatchFields_H
+#define valuePointPatchFields_H
 
 #include "valuePointPatchField.H"
+#include "fieldTypes.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -39,7 +39,6 @@ namespace Foam
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 makePointPatchFieldTypedefs(value);
-makePointPatchFieldTypedef(label, value);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

src/OpenFOAM/fields/pointPatchFields/basic/zeroGradient/zeroGradientPointPatchFields.C

@@ -6,7 +6,6 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
-    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -30,12 +29,17 @@ License
 #include "pointPatchFields.H"
 #include "addToRunTimeSelectionTable.H"
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-    makePointPatchFields(zeroGradient);
-    makePointPatchFieldType(label, zeroGradient);
-}
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+makePointPatchFields(zeroGradient);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
 
 // ************************************************************************* //

src/OpenFOAM/fields/pointPatchFields/basic/zeroGradient/zeroGradientPointPatchFields.H

@@ -6,7 +6,6 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
-    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -26,10 +25,11 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef Foam_zeroGradientPointPatchFields_H
-#define Foam_zeroGradientPointPatchFields_H
+#ifndef zeroGradientPointPatchFields_H
+#define zeroGradientPointPatchFields_H
 
 #include "zeroGradientPointPatchField.H"
+#include "fieldTypes.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -39,7 +39,6 @@ namespace Foam
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 makePointPatchFieldTypedefs(zeroGradient);
-makePointPatchFieldTypedef(label, zeroGradient);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

src/OpenFOAM/fields/pointPatchFields/constraint/empty/emptyPointPatchFields.C

@@ -6,7 +6,6 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
-    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -30,12 +29,17 @@ License
 #include "pointPatchFields.H"
 #include "addToRunTimeSelectionTable.H"
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-    makePointPatchFieldsTypeName(empty);
-    makePointPatchFieldTypeName(label, empty);
-}
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+makePointPatchFields(empty);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
 
 // ************************************************************************* //

src/OpenFOAM/fields/pointPatchFields/constraint/empty/emptyPointPatchFields.H

@@ -6,7 +6,6 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
-    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -26,10 +25,11 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef Foam_emptyPointPatchFields_H
-#define Foam_emptyPointPatchFields_H
+#ifndef emptyPointPatchFields_H
+#define emptyPointPatchFields_H
 
 #include "emptyPointPatchField.H"
+#include "fieldTypes.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -39,7 +39,6 @@ namespace Foam
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 makePointPatchFieldTypedefs(empty);
-makePointPatchFieldTypedef(label, empty);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchFields.C

@@ -6,7 +6,6 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
-    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -30,12 +29,17 @@ License
 #include "pointPatchFields.H"
 #include "addToRunTimeSelectionTable.H"
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-    makePointPatchFields(processor);
-    makePointPatchFieldType(label, processor);
-}
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+makePointPatchFields(processor);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
 
 // ************************************************************************* //

src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchFields.H

@@ -6,7 +6,6 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
-    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -26,10 +25,11 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef Foam_processorPointPatchFields_H
-#define Foam_processorPointPatchFields_H
+#ifndef processorPointPatchFields_H
+#define processorPointPatchFields_H
 
 #include "processorPointPatchField.H"
+#include "fieldTypes.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -39,7 +39,6 @@ namespace Foam
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 makePointPatchFieldTypedefs(processor);
-makePointPatchFieldTypedef(label, processor);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

src/OpenFOAM/fields/pointPatchFields/constraint/symmetry/symmetryPointPatchFields.C

@@ -6,7 +6,6 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
-    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -30,12 +29,17 @@ License
 #include "pointPatchFields.H"
 #include "addToRunTimeSelectionTable.H"
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-    makePointPatchFields(symmetry);
-    makePointPatchFieldType(label, symmetry);
-}
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+makePointPatchFields(symmetry);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
 
 // ************************************************************************* //

src/OpenFOAM/fields/pointPatchFields/constraint/symmetry/symmetryPointPatchFields.H

@@ -6,7 +6,6 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
-    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -26,10 +25,11 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef Foam_symmetryPointPatchFields_H
-#define Foam_symmetryPointPatchFields_H
+#ifndef symmetryPointPatchFields_H
+#define symmetryPointPatchFields_H
 
 #include "symmetryPointPatchField.H"
+#include "fieldTypes.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -39,7 +39,6 @@ namespace Foam
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 makePointPatchFieldTypedefs(symmetry);
-makePointPatchFieldTypedef(label, symmetry);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchField.C

@@ -6,7 +6,6 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2013-2016 OpenFOAM Foundation
-    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -107,17 +106,15 @@ void Foam::symmetryPlanePointPatchField<Type>::evaluate
     const Pstream::commsTypes
 )
 {
-    if (pTraits<Type>::rank == 0)
-    {
-        // Transform-invariant types
-        return;
-    }
+    vector nHat = symmetryPlanePatch_.n();
 
-    Field<Type> pif(this->patchInternalField());
-
-    symmTensor rot(I - 2.0*sqr(symmetryPlanePatch_.n()));
-
-    tmp<Field<Type>> tvalues = (pif + transform(rot, pif))/2.0;
+    tmp<Field<Type>> tvalues =
+    (
+        (
+            this->patchInternalField()
+          + transform(I - 2.0*sqr(nHat), this->patchInternalField())
+        )/2.0
+    );
 
     // Get internal field to insert values into
     Field<Type>& iF = const_cast<Field<Type>&>(this->primitiveField());

src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchField.H

@@ -6,7 +6,6 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2013-2017 OpenFOAM Foundation
-    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -35,8 +34,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef Foam_symmetryPlanePointPatchField_H
-#define Foam_symmetryPlanePointPatchField_H
+#ifndef symmetryPlanePointPatchField_H
+#define symmetryPlanePointPatchField_H
 
 #include "basicSymmetryPointPatchField.H"
 #include "symmetryPlanePointPatch.H"
@@ -55,7 +54,7 @@ class symmetryPlanePointPatchField
 :
     public basicSymmetryPointPatchField<Type>
 {
-    // Private Data
+    // Private data
 
         //- Local reference cast into the symmetryPlane patch
         const symmetryPlanePointPatch& symmetryPlanePatch_;

src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchFields.C

@@ -6,7 +6,6 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2013 OpenFOAM Foundation
-    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -30,13 +29,17 @@ License
 #include "pointPatchFields.H"
 #include "addToRunTimeSelectionTable.H"
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-    makePointPatchFields(symmetryPlane);
-    makePointPatchFieldType(label, symmetryPlane);
-}
 
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+makePointPatchFields(symmetryPlane);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
 
 // ************************************************************************* //

src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchFields.H

@@ -6,7 +6,6 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2013 OpenFOAM Foundation
-    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -26,10 +25,11 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef Foam_symmetryPlanePointPatchFields_H
-#define Foam_symmetryPlanePointPatchFields_H
+#ifndef symmetryPlanePointPatchFields_H
+#define symmetryPlanePointPatchFields_H
 
 #include "symmetryPlanePointPatchField.H"
+#include "fieldTypes.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -39,7 +39,6 @@ namespace Foam
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 makePointPatchFieldTypedefs(symmetryPlane);
-makePointPatchFieldTypedef(label, symmetryPlane);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchField.C

@@ -28,6 +28,7 @@ License
 #include "wedgePointPatchField.H"
 #include "transformField.H"
 
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
@@ -100,18 +101,12 @@ Foam::wedgePointPatchField<Type>::wedgePointPatchField
 template<class Type>
 void Foam::wedgePointPatchField<Type>::evaluate(const Pstream::commsTypes)
 {
-    // label, scalar, sphericalTensor are rotationally invariant
-    if (pTraits<Type>::rank == 0 || std::is_same<sphericalTensor, Type>::value)
-    {
-        return;
-    }
-
     // In order to ensure that the wedge patch is always flat, take the
     // normal vector from the first point
+    const vector& nHat = this->patch().pointNormals()[0];
 
-    symmTensor rot(I - sqr(this->patch().pointNormals()[0]));
-
-    tmp<Field<Type>> tvalues = transform(rot, this->patchInternalField());
+    tmp<Field<Type>> tvalues =
+        transform(I - nHat*nHat, this->patchInternalField());
 
     // Get internal field to insert values into
     Field<Type>& iF = const_cast<Field<Type>&>(this->primitiveField());

src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchFields.C

@@ -6,7 +6,6 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
-    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -30,13 +29,17 @@ License
 #include "pointPatchFields.H"
 #include "addToRunTimeSelectionTable.H"
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-    makePointPatchFields(wedge);
-    makePointPatchFieldType(label, wedge);
-}
 
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+makePointPatchFields(wedge);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
 
 // ************************************************************************* //

src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchFields.H

@@ -6,7 +6,6 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
-    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -26,10 +25,11 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef Foam_wedgePointPatchFields_H
-#define Foam_wedgePointPatchFields_H
+#ifndef wedgePointPatchFields_H
+#define wedgePointPatchFields_H
 
 #include "wedgePointPatchField.H"
+#include "fieldTypes.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -39,7 +39,6 @@ namespace Foam
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 makePointPatchFieldTypedefs(wedge);
-makePointPatchFieldTypedef(label, wedge);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.C

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2012-2016 OpenFOAM Foundation
-    Copyright (C) 2016-2023 OpenCFD Ltd.
+    Copyright (C) 2016-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -161,11 +161,11 @@ Foam::codedFixedValuePointPatchField<Type>::codedFixedValuePointPatchField
 (
     const pointPatch& p,
     const DimensionedField<Type, pointMesh>& iF,
-    const dictionary& dict
+    const dictionary& dict,
+    const bool valueRequired
 )
 :
-    // The 'value' is optional (handled below)
-    parent_bctype(p, iF, dict, IOobjectOption::NO_READ),
+    parent_bctype(p, iF, dict, false),
     codedBase(),
     dict_
     (
@@ -186,7 +186,10 @@ Foam::codedFixedValuePointPatchField<Type>::codedFixedValuePointPatchField
 {
     updateLibrary(name_);
 
-    if (!this->readValueEntry(dict))
+    // Note: 'value' is used even with valueRequired = false ! This is
+    // inconsistent with fixedValueFvPatchField behaviour.
+
+    if (!dict.found("value")) // Q: check for valueRequired?
     {
         // Evaluate to assign a value
         this->evaluate(Pstream::commsTypes::blocking);

src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.H

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2012-2017 OpenFOAM Foundation
-    Copyright (C) 2019-2023 OpenCFD Ltd.
+    Copyright (C) 2019-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -100,8 +100,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef Foam_codedFixedValuePointPatchField_H
-#define Foam_codedFixedValuePointPatchField_H
+#ifndef codedFixedValuePointPatchField_H
+#define codedFixedValuePointPatchField_H
 
 #include "fixedValuePointPatchFields.H"
 #include "codedBase.H"
@@ -187,7 +187,8 @@ public:
         (
             const pointPatch&,
             const DimensionedField<Type, pointMesh>&,
-            const dictionary&
+            const dictionary&,
+            const bool valueRequired=true
         );
 
         //- Construct by mapping given codedFixedValuePointPatchField

src/OpenFOAM/fields/pointPatchFields/derived/slip/slipPointPatchFields.C

@@ -6,7 +6,6 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
-    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -30,12 +29,17 @@ License
 #include "pointPatchFields.H"
 #include "addToRunTimeSelectionTable.H"
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-    makePointPatchFields(slip);
-    makePointPatchFieldType(label, slip);
-}
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+makePointPatchFields(slip);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
 
 // ************************************************************************* //

src/OpenFOAM/fields/pointPatchFields/derived/slip/slipPointPatchFields.H

@@ -6,7 +6,6 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
-    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -26,10 +25,11 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef Foam_slipPointPatchFields_H
-#define Foam_slipPointPatchFields_H
+#ifndef slipPointPatchFields_H
+#define slipPointPatchFields_H
 
 #include "slipPointPatchField.H"
+#include "fieldTypes.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -39,7 +39,6 @@ namespace Foam
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 makePointPatchFieldTypedefs(slip);
-makePointPatchFieldTypedef(label, slip);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldBase.C

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2022-2023 OpenCFD Ltd.
+    Copyright (C) 2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.

src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFields.C

@@ -37,7 +37,6 @@ namespace Foam
     defineTemplateRunTimeSelectionTable(PatchTypeField, patchMapper);         \
     defineTemplateRunTimeSelectionTable(PatchTypeField, dictionary);
 
-makePointPatchField(pointPatchLabelField);
 makePointPatchField(pointPatchScalarField);
 makePointPatchField(pointPatchVectorField);
 makePointPatchField(pointPatchSphericalTensorField);

src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFields.H

@@ -31,6 +31,8 @@ License
 #include "pointPatchField.H"
 #include "pointPatchFieldsFwd.H"
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //

src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchFieldsFwd.H

@@ -6,7 +6,6 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
-    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -40,7 +39,6 @@ namespace Foam
 
 template<class Type> class pointPatchField;
 
-typedef pointPatchField<label> pointPatchLabelField;
 typedef pointPatchField<scalar> pointPatchScalarField;
 typedef pointPatchField<vector> pointPatchVectorField;
 typedef pointPatchField<sphericalTensor> pointPatchSphericalTensorField;

src/OpenFOAM/global/argList/argList.C

@@ -1720,8 +1720,6 @@ void Foam::argList::parse
                 << "    nProcsSimpleSum    : " << Pstream::nProcsSimpleSum << nl
                 << "    nonBlockingExchange: "
                 << Pstream::nProcsNonblockingExchange << nl
-                << "    exchange algorithm : "
-                << PstreamBuffers::algorithm << nl
                 << "    commsType          : "
                 << Pstream::commsTypeNames[Pstream::defaultCommsType] << nl
                 << "    polling iterations : " << Pstream::nPollProcInterfaces

src/OpenFOAM/meshes/boundBox/boundBox.H

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2016-2023 OpenCFD Ltd.
+    Copyright (C) 2016-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -163,9 +163,6 @@ public:
         //- Construct a bounding box containing a single initial point
         inline explicit boundBox(const point& p);
 
-        //- Construct a 0/1 unit bounding box
-        inline explicit boundBox(const Foam::zero_one);
-
         //- Construct from bound box min/max points
         inline boundBox(const point& min, const point& max);
 
@@ -294,9 +291,6 @@ public:
             //- Reset to an inverted box
             inline void reset();
 
-            //- Reset to a 0/1 unit bounding box
-            inline void reset(const Foam::zero_one);
-
             //- Reset min/max to be identical to the specified point
             inline void reset(const point& pt);
 

src/OpenFOAM/meshes/boundBox/boundBoxI.H

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2016-2023 OpenCFD Ltd.
+    Copyright (C) 2016-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -112,13 +112,6 @@ inline Foam::boundBox::boundBox()
 {}
 
 
-inline Foam::boundBox::boundBox(const Foam::zero_one)
-:
-    min_(point::zero),
-    max_(point::one)
-{}
-
-
 inline Foam::boundBox::boundBox(const point& p)
 :
     min_(p),
@@ -306,13 +299,6 @@ inline void Foam::boundBox::reset()
 }
 
 
-inline void Foam::boundBox::reset(const Foam::zero_one)
-{
-    min_ = point::zero;
-    max_ = point::one;
-}
-
-
 inline void Foam::boundBox::reset(const point& pt)
 {
     min_ = pt;

src/OpenFOAM/meshes/ijkMesh/ijkAddressing.H

@@ -34,8 +34,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef Foam_ijkAddressing_H
-#define Foam_ijkAddressing_H
+#ifndef ijkAddressing_H
+#define ijkAddressing_H
 
 #include "labelVector.H"
 #include "vector.H"

src/OpenFOAM/meshes/ijkMesh/ijkMesh.H

@@ -38,8 +38,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef Foam_ijkMesh_H
-#define Foam_ijkMesh_H
+#ifndef ijkMesh_H
+#define ijkMesh_H
 
 #include "ijkAddressing.H"
 

src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2015-2023 OpenCFD Ltd.
+    Copyright (C) 2015-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -2721,7 +2721,8 @@ void Foam::globalMeshData::updateMesh()
         identity(UPstream::nProcs(UPstream::worldComm)),
         true
     );
-    const label oldWarnComm = UPstream::commWarn(comm);
+    const label oldWarnComm = UPstream::warnComm;
+    UPstream::warnComm = comm;
 
 
     // Total number of faces.
@@ -2759,9 +2760,8 @@ void Foam::globalMeshData::updateMesh()
         comm
     );
 
-    // Restore communicator settings
     UPstream::freeCommunicator(comm);
-    UPstream::commWarn(oldWarnComm);
+    UPstream::warnComm = oldWarnComm;
 
     if (debug)
     {

src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellPoints.C

@@ -74,33 +74,31 @@ void Foam::primitiveMesh::calcCellPoints() const
         const cellList& cellLst = cells();
         const faceList& faceLst = faces();
 
-        // Tracking (only use each point id once)
-        bitSet usedPoints(nPoints());
-
         // Vertex labels for the current cell
-        DynamicList<label> currPoints(256);
+        DynamicList<label> vertices(256);
+
 
         const label loopLen = nCells();
 
         for (label celli = 0; celli < loopLen; ++celli)
         {
             // Clear any previous contents
-            usedPoints.unset(currPoints);
-            currPoints.clear();
+            vertices.clear();
 
             for (const label facei : cellLst[celli])
             {
                 for (const label pointi : faceLst[facei])
                 {
-                    // Only once for each point id
-                    if (usedPoints.set(pointi))
-                    {
-                        currPoints.push_back(pointi);
-                    }
+                    vertices.push_back(pointi);
                 }
             }
 
-            cellPointAddr[celli] = currPoints;  // NB: unsorted
+            // Sort + unique to eliminate duplicates
+            std::sort(vertices.begin(), vertices.end());
+            auto last = std::unique(vertices.begin(), vertices.end());
+            vertices.resize(label(last - vertices.begin()));
+
+            cellPointAddr[celli] = vertices;
         }
     }
 }

src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointCells.C

@@ -73,42 +73,36 @@ void Foam::primitiveMesh::calcPointCells() const
         const labelList& nei = faceNeighbour();
         const labelListList& pFaces = pointFaces();
 
-        // Tracking (only use each cell id once)
-        bitSet usedCells(nCells());
-
-        // Cell ids for the point currently being processed
-        DynamicList<label> currCells(256);
-
         const label loopLen = nPoints();
 
         pcPtr_ = new labelListList(nPoints());
         auto& pointCellAddr = *pcPtr_;
 
+        DynamicList<label> storage(256);
+
         for (label pointi = 0; pointi < loopLen; ++pointi)
         {
             // Clear any previous contents
-            usedCells.unset(currCells);
-            currCells.clear();
+            storage.clear();
 
             for (const label facei : pFaces[pointi])
             {
-                // Owner cell - only allow one occurance
-                if (usedCells.set(own[facei]))
-                {
-                    currCells.push_back(own[facei]);
-                }
+                // Owner cell
+                storage.push_back(own[facei]);
 
-                // Neighbour cell - only allow one occurance
+                // Neighbour cell
                 if (facei < nInternalFaces())
                 {
-                    if (usedCells.set(nei[facei]))
-                    {
-                        currCells.push_back(nei[facei]);
-                    }
+                    storage.push_back(nei[facei]);
                 }
             }
 
-            pointCellAddr[pointi] = currCells;  // NB: unsorted
+            // Sort + unique to eliminate duplicates
+            std::sort(storage.begin(), storage.end());
+            auto last = std::unique(storage.begin(), storage.end());
+            storage.resize(label(last - storage.begin()));
+
+            pointCellAddr[pointi] = storage;
         }
     }
     else
@@ -118,11 +112,12 @@ void Foam::primitiveMesh::calcPointCells() const
         const cellList& cellLst = cells();
         const faceList& faceLst = faces();
 
-        // Tracking (only use each point id once)
-        bitSet usedPoints(nPoints());
+        // Vertex labels for the current cell
+        // Note: since the number of points per cell is relatively small,
+        // using a bitSet to track does not help much.
+        // Using a labelHashSet to track has too many allocations.
+        DynamicList<label> vertices(256);
 
-        // Which of usedPoints needs to be unset [faster]
-        DynamicList<label> currPoints(256);
 
         const label loopLen = nCells();
 
@@ -133,17 +128,16 @@ void Foam::primitiveMesh::calcPointCells() const
         for (label celli = 0; celli < loopLen; ++celli)
         {
             // Clear any previous contents
-            usedPoints.unset(currPoints);
-            currPoints.clear();
+            vertices.clear();
 
             for (const label facei : cellLst[celli])
             {
                 for (const label pointi : faceLst[facei])
                 {
                     // Only once for each point id
-                    if (usedPoints.set(pointi))
+                    if (!vertices.contains(pointi))
                     {
-                        currPoints.push_back(pointi);  // Needed for cleanup
+                        vertices.push_back(pointi);
                         ++pointCount[pointi];
                     }
                 }
@@ -167,17 +161,16 @@ void Foam::primitiveMesh::calcPointCells() const
         for (label celli = 0; celli < loopLen; ++celli)
         {
             // Clear any previous contents
-            usedPoints.unset(currPoints);
-            currPoints.clear();
+            vertices.clear();
 
             for (const label facei : cellLst[celli])
             {
                 for (const label pointi : faceLst[facei])
                 {
                     // Only once for each point id
-                    if (usedPoints.set(pointi))
+                    if (!vertices.contains(pointi))
                     {
-                        currPoints.push_back(pointi);  // Needed for cleanup
+                        vertices.push_back(pointi);
                         pointCellAddr[pointi][pointCount[pointi]++] = celli;
                     }
                 }
@@ -234,8 +227,12 @@ const Foam::labelList& Foam::primitiveMesh::pointCells
         if (storage.size() > 1)
         {
             std::sort(storage.begin(), storage.end());
+
             auto last = std::unique(storage.begin(), storage.end());
-            storage.resize(label(last - storage.begin()));
+
+            const label newLen = label(last - storage.begin());
+
+            storage.resize(newLen);
         }
 
         return storage;

src/OpenFOAM/meshes/treeBoundBox/treeBoundBox.H

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2017-2023 OpenCFD Ltd.
+    Copyright (C) 2017-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -201,9 +201,6 @@ public:
 
     // Constructors
 
-        //- Construct a 0/1 unit bounding box
-        inline explicit treeBoundBox(const Foam::zero_one);
-
         //- Construct a bounding box containing a single initial point
         inline explicit treeBoundBox(const point& p);
 

src/OpenFOAM/meshes/treeBoundBox/treeBoundBoxI.H

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
-    Copyright (C) 2017-2023 OpenCFD Ltd.
+    Copyright (C) 2017-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -31,12 +31,6 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-inline Foam::treeBoundBox::treeBoundBox(const Foam::zero_one)
-:
-    boundBox(zero_one{})
-{}
-
-
 inline Foam::treeBoundBox::treeBoundBox(const point& p)
 :
     boundBox(p)

src/OpenFOAM/parallel/globalIndex/globalIndex.C

@@ -214,7 +214,7 @@ void Foam::globalIndex::reset
             // Non-parallel branch: use localSize on-proc, zero elsewhere
 
             localLens.resize(len, Zero);
-            localLens[UPstream::myProcNo(comm)] = localSize;
+            localLens[Pstream::myProcNo(comm)] = localSize;
         }
 
         reset(localLens, true);  // checkOverflow = true

src/OpenFOAM/parallel/globalIndex/globalIndex.H

@@ -519,9 +519,7 @@ public:
         {
             List<Type> allData;
             gather(offsets, comm, procIDs, fld, allData, tag, ct);
-
-            const int masterProci = procIDs.size() ? procIDs[0] : 0;
-            if (UPstream::myProcNo(comm) == masterProci)
+            if (Pstream::myProcNo(comm) == procIDs[0])
             {
                 fld.transfer(allData);
             }

src/OpenFOAM/parallel/globalIndex/globalIndexI.H

@@ -137,14 +137,14 @@ inline Foam::globalIndex::globalIndex
 
 inline bool Foam::globalIndex::empty() const
 {
-    return offsets_.empty() || offsets_.back() == 0;
+    return offsets_.empty() || offsets_.last() == 0;
 }
 
 
 inline Foam::label Foam::globalIndex::totalSize() const
 {
     const label len = (offsets_.size() - 1);
-    return (len < 1) ? 0 : offsets_[len];
+    return (len < 1) ? static_cast<label>(0) : offsets_[len];
 }
 
 
@@ -163,7 +163,7 @@ inline Foam::labelList Foam::globalIndex::sizes() const
 inline Foam::label Foam::globalIndex::nProcs() const noexcept
 {
     const label len = (offsets_.size() - 1);
-    return (len < 1) ? 0 : len;
+    return (len < 1) ? static_cast<label>(0) : len;
 }
 
 
@@ -219,7 +219,7 @@ inline Foam::label Foam::globalIndex::localStart(const label proci) const
 
 inline Foam::label Foam::globalIndex::localStart() const
 {
-    return localStart(UPstream::myProcNo());
+    return localStart(Pstream::myProcNo());
 }
 
 
@@ -231,7 +231,7 @@ inline Foam::label Foam::globalIndex::localSize(const label proci) const
 
 inline Foam::label Foam::globalIndex::localSize() const
 {
-    return localSize(UPstream::myProcNo());
+    return localSize(Pstream::myProcNo());
 }
 
 
@@ -244,7 +244,7 @@ inline Foam::label Foam::globalIndex::maxSize() const
 
 inline Foam::label Foam::globalIndex::maxNonLocalSize() const
 {
-    return maxNonLocalSize(UPstream::myProcNo());
+    return maxNonLocalSize(Pstream::myProcNo());
 }
 
 
@@ -256,7 +256,7 @@ inline Foam::labelRange Foam::globalIndex::range(const label proci) const
 
 inline Foam::labelRange Foam::globalIndex::range() const
 {
-    return range(UPstream::myProcNo());
+    return range(Pstream::myProcNo());
 }
 
 
@@ -268,7 +268,7 @@ inline bool Foam::globalIndex::isLocal(const label proci, const label i) const
 
 inline bool Foam::globalIndex::isLocal(const label i) const
 {
-    return isLocal(UPstream::myProcNo(), i);
+    return isLocal(Pstream::myProcNo(), i);
 }
 
 
@@ -284,7 +284,7 @@ inline Foam::label Foam::globalIndex::toGlobal
 
 inline Foam::label Foam::globalIndex::toGlobal(const label i) const
 {
-    return toGlobal(UPstream::myProcNo(), i);
+    return toGlobal(Pstream::myProcNo(), i);
 }
 
 
@@ -306,7 +306,7 @@ inline Foam::labelList Foam::globalIndex::toGlobal
     const labelUList& labels
 ) const
 {
-    return toGlobal(UPstream::myProcNo(), labels);
+    return toGlobal(Pstream::myProcNo(), labels);
 }
 
 
@@ -327,7 +327,7 @@ inline void Foam::globalIndex::inplaceToGlobal
 
 inline void Foam::globalIndex::inplaceToGlobal(labelUList& labels) const
 {
-    inplaceToGlobal(UPstream::myProcNo(), labels);
+    inplaceToGlobal(Pstream::myProcNo(), labels);
 }
 
 
@@ -349,7 +349,7 @@ Foam::globalIndex::toLocal(const label proci, const label i) const
 
 inline Foam::label Foam::globalIndex::toLocal(const label i) const
 {
-    return toLocal(UPstream::myProcNo(), i);
+    return toLocal(Pstream::myProcNo(), i);
 }
 
 
@@ -363,7 +363,7 @@ inline Foam::label Foam::globalIndex::whichProcID(const label i) const
             << abort(FatalError);
     }
 
-    const int proci = UPstream::myProcNo();
+    const label proci(Pstream::myProcNo());
 
     return isLocal(proci, i) ? proci : findLower(offsets_, i+1);
 }

src/OpenFOAM/parallel/globalIndex/globalIndexTemplates.C

@@ -91,9 +91,7 @@ void Foam::globalIndex::gatherValues
 
     const label startOfRequests = UPstream::nRequests();
 
-    const int masterProci = procIDs.size() ? procIDs[0] : 0;
-
-    if (UPstream::myProcNo(comm) == masterProci)
+    if (UPstream::myProcNo(comm) == procIDs[0])
     {
         allValues.resize_nocopy(procIDs.size());
         allValues[0] = localValue;
@@ -128,7 +126,7 @@ void Foam::globalIndex::gatherValues
             UOPstream::write
             (
                 commsType,
-                masterProci,
+                procIDs[0],
                 reinterpret_cast<const char*>(&localValue),
                 sizeof(Type),
                 tag,
@@ -137,7 +135,7 @@ void Foam::globalIndex::gatherValues
         }
         else
         {
-            OPstream toMaster(commsType, masterProci, 0, tag, comm);
+            OPstream toMaster(commsType, procIDs[0], 0, tag, comm);
             toMaster << localValue;
         }
     }
@@ -178,11 +176,9 @@ void Foam::globalIndex::gather
 
     const label startOfRequests = UPstream::nRequests();
 
-    const int masterProci = procIDs.size() ? procIDs[0] : 0;
-
-    if (UPstream::myProcNo(comm) == masterProci)
+    if (Pstream::myProcNo(comm) == procIDs[0])
     {
-        allFld.resize_nocopy(off.back());  // == totalSize()
+        allFld.resize_nocopy(off.last());  // == totalSize()
 
         // Assign my local data - respect offset information
         // so that we can request 0 entries to be copied.
@@ -230,7 +226,7 @@ void Foam::globalIndex::gather
             UOPstream::write
             (
                 commsType,
-                masterProci,
+                procIDs[0],
                 fld.cdata_bytes(),
                 fld.size_bytes(),
                 tag,
@@ -239,7 +235,7 @@ void Foam::globalIndex::gather
         }
         else
         {
-            OPstream toMaster(commsType, masterProci, 0, tag, comm);
+            OPstream toMaster(commsType, procIDs[0], 0, tag, comm);
             toMaster << fld;
         }
     }
@@ -298,11 +294,9 @@ void Foam::globalIndex::gather
 
     const label startOfRequests = UPstream::nRequests();
 
-    const int masterProci = procIDs.size() ? procIDs[0] : 0;
-
-    if (UPstream::myProcNo(comm) == masterProci)
+    if (Pstream::myProcNo(comm) == procIDs[0])
     {
-        allFld.resize_nocopy(off.back());  // == totalSize()
+        allFld.resize_nocopy(off.last());  // == totalSize()
 
         // Assign my local data - respect offset information
         // so that we can request 0 entries to be copied
@@ -337,7 +331,7 @@ void Foam::globalIndex::gather
         }
         else
         {
-            OPstream toMaster(commsType, masterProci, 0, tag, comm);
+            OPstream toMaster(commsType, procIDs[0], 0, tag, comm);
             toMaster << fld;
         }
     }
@@ -883,9 +877,7 @@ void Foam::globalIndex::scatter
 
     const label startOfRequests = UPstream::nRequests();
 
-    const int masterProci = procIDs.size() ? procIDs[0] : 0;
-
-    if (UPstream::myProcNo(comm) == masterProci)
+    if (Pstream::myProcNo(comm) == procIDs[0])
     {
         for (label i = 1; i < procIDs.size(); ++i)
         {
@@ -937,7 +929,7 @@ void Foam::globalIndex::scatter
             UIPstream::read
             (
                 commsType,
-                masterProci,
+                procIDs[0],
                 fld.data_bytes(),
                 fld.size_bytes(),
                 tag,
@@ -946,7 +938,7 @@ void Foam::globalIndex::scatter
         }
         else
         {
-            IPstream fromMaster(commsType, masterProci, 0, tag, comm);
+            IPstream fromMaster(commsType, procIDs[0], 0, tag, comm);
             fromMaster >> fld;
         }
     }

src/Pstream/mpi/UIPstreamRead.C

@@ -114,7 +114,7 @@ Foam::label Foam::UIPstream::read
             << " commsType:" << UPstream::commsTypeNames[commsType]
             << Foam::endl;
     }
-    if (UPstream::warnComm >= 0 && communicator != UPstream::warnComm)
+    if (UPstream::warnComm != -1 && communicator != UPstream::warnComm)
     {
         Pout<< "UIPstream::read : starting read from:" << fromProcNo
             << " tag:" << tag << " comm:" << communicator

src/Pstream/mpi/UOPstreamWrite.C

@@ -68,7 +68,7 @@ bool Foam::UOPstream::write
             << " commType:" << UPstream::commsTypeNames[commsType]
             << Foam::endl;
     }
-    if (UPstream::warnComm >= 0 && communicator != UPstream::warnComm)
+    if (UPstream::warnComm != -1 && communicator != UPstream::warnComm)
     {
         Pout<< "UOPstream::write : starting write to:" << toProcNo
             << " tag:" << tag

src/Pstream/mpi/UPstreamBroadcast.C

@@ -54,7 +54,7 @@ bool Foam::UPstream::broadcast
             << " size:" << label(bufSize)
             << Foam::endl;
     }
-    if (UPstream::warnComm >= 0 && comm != UPstream::warnComm)
+    if (UPstream::warnComm != -1 && comm != UPstream::warnComm)
     {
         Pout<< "UPstream::broadcast : root:" << rootProcNo
             << " comm:" << comm

src/Pstream/mpi/UPstreamWrappingTemplates.C

@@ -78,7 +78,7 @@ void Foam::PstreamDetail::reduce0
         return;
     }
 
-    if (UPstream::warnComm >= 0 && comm != UPstream::warnComm)
+    if (UPstream::warnComm != -1 && comm != UPstream::warnComm)
     {
         Pout<< "** reducing:";
         if (count == 1)
@@ -135,7 +135,7 @@ void Foam::PstreamDetail::allReduce
 
     const bool immediate = (req || requestID);
 
-    if (UPstream::warnComm >= 0 && comm != UPstream::warnComm)
+    if (UPstream::warnComm != -1 && comm != UPstream::warnComm)
     {
         if (immediate)
         {
@@ -246,7 +246,7 @@ void Foam::PstreamDetail::allToAll
 
     const label numProc = UPstream::nProcs(comm);
 
-    if (UPstream::warnComm >= 0 && comm != UPstream::warnComm)
+    if (UPstream::warnComm != -1 && comm != UPstream::warnComm)
     {
         if (immediate)
         {
@@ -383,7 +383,7 @@ void Foam::PstreamDetail::allToAllv
 
     const label np = UPstream::nProcs(comm);
 
-    if (UPstream::warnComm >= 0 && comm != UPstream::warnComm)
+    if (UPstream::warnComm != -1 && comm != UPstream::warnComm)
     {
         if (immediate)
         {
@@ -531,7 +531,7 @@ void Foam::PstreamDetail::allToAllConsensus
     const label myProci = UPstream::myProcNo(comm);
     const label numProc = UPstream::nProcs(comm);
 
-    if (UPstream::warnComm >= 0 && comm != UPstream::warnComm)
+    if (UPstream::warnComm != -1 && comm != UPstream::warnComm)
     {
         Pout<< "** non-blocking consensus Alltoall (list):";
         Pout<< " numProc:" << numProc
@@ -717,7 +717,7 @@ void Foam::PstreamDetail::allToAllConsensus
     const label myProci = UPstream::myProcNo(comm);
     const label numProc = UPstream::nProcs(comm);
 
-    if (UPstream::warnComm >= 0 && comm != UPstream::warnComm)
+    if (UPstream::warnComm != -1 && comm != UPstream::warnComm)
     {
         Pout<< "** non-blocking consensus Alltoall (map):";
         Pout<< " numProc:" << numProc
@@ -911,7 +911,7 @@ void Foam::PstreamDetail::gather
 
     const label np = UPstream::nProcs(comm);
 
-    if (UPstream::warnComm >= 0 && comm != UPstream::warnComm)
+    if (UPstream::warnComm != -1 && comm != UPstream::warnComm)
     {
         if (immediate)
         {
@@ -1037,7 +1037,7 @@ void Foam::PstreamDetail::scatter
 
     const label np = UPstream::nProcs(comm);
 
-    if (UPstream::warnComm >= 0 && comm != UPstream::warnComm)
+    if (UPstream::warnComm != -1 && comm != UPstream::warnComm)
     {
         if (immediate)
         {
@@ -1165,7 +1165,7 @@ void Foam::PstreamDetail::gatherv
 
     const label np = UPstream::nProcs(comm);
 
-    if (UPstream::warnComm >= 0 && comm != UPstream::warnComm)
+    if (UPstream::warnComm != -1 && comm != UPstream::warnComm)
     {
         if (immediate)
         {
@@ -1317,7 +1317,7 @@ void Foam::PstreamDetail::scatterv
 
     const label np = UPstream::nProcs(comm);
 
-    if (UPstream::warnComm >= 0 && comm != UPstream::warnComm)
+    if (UPstream::warnComm != -1 && comm != UPstream::warnComm)
     {
         if (immediate)
         {

src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C

@@ -53,7 +53,7 @@ Foam::fixedShearStressFvPatchVectorField::fixedShearStressFvPatchVectorField
     const dictionary& dict
 )
 :
-    fixedValueFvPatchVectorField(p, iF, dict, IOobjectOption::NO_READ),
+    fixedValueFvPatchVectorField(p, iF, dict, false),
     tau0_(dict.getOrDefault<vector>("tau", Zero))
 {
     fvPatchField<vector>::operator=(patchInternalField());

src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C

@@ -67,7 +67,14 @@ Foam::porousBafflePressureFvPatchField::porousBafflePressureFvPatchField
 {
     if (valueRequired)
     {
-        if (!this->readValueEntry(dict))
+        if (dict.found("value"))
+        {
+            fvPatchField<scalar>::operator=
+            (
+                Field<scalar>("value", dict, p.size())
+            );
+        }
+        else
         {
             this->evaluate(Pstream::commsTypes::blocking);
         }

src/atmosphericModels/derivedFvPatchFields/atmTurbulentHeatFluxTemperature/atmTurbulentHeatFluxTemperatureFvPatchScalarField.C

@@ -92,7 +92,7 @@ atmTurbulentHeatFluxTemperatureFvPatchScalarField
     const dictionary& dict
 )
 :
-    fixedGradientFvPatchScalarField(p, iF),  // Bypass dictionary constructor
+    fixedGradientFvPatchScalarField(p, iF),
     heatSource_
     (
         heatSourceTypeNames.getOrDefault
@@ -106,11 +106,13 @@ atmTurbulentHeatFluxTemperatureFvPatchScalarField
     Cp0_(Function1<scalar>::New("Cp0", dict, &db())),
     q_(PatchFunction1<scalar>::New(p.patch(), "q", dict))
 {
-    const auto* hasGrad = dict.findEntry("gradient", keyType::LITERAL);
-
-    if (hasGrad && this->readValueEntry(dict))
+    if (dict.found("value") && dict.found("gradient"))
     {
-        gradient().assign(*hasGrad, p.size());
+        fvPatchField<scalar>::operator =
+            (
+                Field<scalar>("value", dict, p.size())
+            );
+        gradient() = Field<scalar>("gradient", dict, p.size());
     }
     else
     {

src/dynamicFaMesh/interfaceTrackingFvMesh/fvPatchFields/freeSurfacePressure/freeSurfacePressureFvPatchScalarField.C

@@ -56,10 +56,17 @@ freeSurfacePressureFvPatchScalarField
     const dictionary& dict
 )
 :
-    fixedValueFvPatchScalarField(p, iF, dict, IOobjectOption::NO_READ),
+    fixedValueFvPatchScalarField(p, iF, dict, false),
     pa_("pa", dict, p.size())
 {
-    if (!this->readValueEntry(dict))
+    if (dict.found("value"))
+    {
+        fvPatchScalarField::operator=
+        (
+            scalarField("value", dict, p.size())
+        );
+    }
+    else
     {
         fvPatchField<scalar>::operator=(pa_);
     }

src/fileFormats/vtk/file/foamVtkFileWriter.C

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018-2023 OpenCFD Ltd.
+    Copyright (C) 2018-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -76,11 +76,11 @@ Foam::Ostream& Foam::vtk::fileWriter::reportBadState
 Foam::Ostream& Foam::vtk::fileWriter::reportBadState
 (
     Ostream& os,
-    outputState expected1,
+    outputState expected,
     outputState expected2
 ) const
 {
-    reportBadState(os, expected1)
+    reportBadState(os, expected)
         << " or (" << stateNames[expected2] << ')';
     return os;
 }
@@ -554,18 +554,10 @@ bool Foam::vtk::fileWriter::writeProcIDs(const label nValues)
     {
         ++nCellData_;
     }
-    else if (isState(outputState::POINT_DATA))
-    {
-        ++nPointData_;
-    }
     else
     {
-        reportBadState
-        (
-            FatalErrorInFunction,
-            outputState::CELL_DATA,
-            outputState::POINT_DATA
-        )   << " for procID field" << nl << endl
+        reportBadState(FatalErrorInFunction, outputState::CELL_DATA)
+            << " for procID field" << nl << endl
             << exit(FatalError);
 
         return false;

src/fileFormats/vtk/file/foamVtkFileWriter.H

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018-2023 OpenCFD Ltd.
+    Copyright (C) 2018-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -201,8 +201,7 @@ protected:
             const UList<Type>& field
         );
 
-        //- Write nValues of processor ids as CellData or PointData
-        //- (no-op in serial)
+        //- Write nValues of processor ids as CellData (no-op in serial)
         bool writeProcIDs(const label nValues);
 
 
@@ -306,16 +305,10 @@ public:
         //  \return True if the state changed
         virtual bool beginPointData(label nFields = 0) = 0;
 
-        //- True if output state corresponds to CELL_DATA
-        inline bool isCellData() const noexcept;
-
-        //- True if output state corresponds to POINT_DATA
-        inline bool isPointData() const noexcept;
-
-        //- The number of CellData written for the Piece thus far.
+        //- Return the number of CellData written for the Piece thus far.
         inline label nCellData() const noexcept;
 
-        //- The number of PointData written for the Piece thus far.
+        //- Return the number of PointData written for the Piece thus far.
         inline label nPointData() const noexcept;
 
 

src/fileFormats/vtk/file/foamVtkFileWriterI.H

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018-2023 OpenCFD Ltd.
+    Copyright (C) 2018-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -107,16 +107,4 @@ inline Foam::label Foam::vtk::fileWriter::nPointData() const noexcept
 }
 
 
-inline bool Foam::vtk::fileWriter::isCellData() const noexcept
-{
-    return (outputState::CELL_DATA == state_);
-}
-
-
-inline bool Foam::vtk::fileWriter::isPointData() const noexcept
-{
-    return (outputState::POINT_DATA == state_);
-}
-
-
 // ************************************************************************* //

src/fileFormats/vtk/write/foamVtkLineWriter.C

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2021-2023 OpenCFD Ltd.
+    Copyright (C) 2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -131,10 +131,6 @@ void Foam::vtk::lineWriter::piece
 
 bool Foam::vtk::lineWriter::writeProcIDs()
 {
-    if (this->isPointData())
-    {
-        return vtk::fileWriter::writeProcIDs(nLocalPoints_);
-    }
     return vtk::fileWriter::writeProcIDs(nLocalLines_);
 }
 

src/fileFormats/vtk/write/foamVtkLineWriter.H

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2021-2023 OpenCFD Ltd.
+    Copyright (C) 2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -155,8 +155,8 @@ public:
         void piece(const pointField& points, const edgeList& edges);
 
 
-        //- Write processor ids for each line as CellData or for each point
-        //- as PointData, depending on isPointData() state. No-op in serial.
+        //- Write processor ids for each line as CellData
+        //- (no-op in serial)
         bool writeProcIDs();
 
         //- Write a uniform field of Cell (Line) or Point values

src/fileFormats/vtk/write/foamVtkSurfaceWriter.C

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018-2023 OpenCFD Ltd.
+    Copyright (C) 2018-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -131,10 +131,6 @@ void Foam::vtk::surfaceWriter::piece
 
 bool Foam::vtk::surfaceWriter::writeProcIDs()
 {
-    if (this->isPointData())
-    {
-        return vtk::fileWriter::writeProcIDs(nLocalPoints_);
-    }
     return vtk::fileWriter::writeProcIDs(nLocalPolys_);
 }
 

src/fileFormats/vtk/write/foamVtkSurfaceWriter.H

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018-2023 OpenCFD Ltd.
+    Copyright (C) 2018-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -155,8 +155,8 @@ public:
         void piece(const pointField& points, const faceList& faces);
 
 
-        //- Write processor ids for each poly as CellData or for each point
-        //- as PointData, depending on isPointData() state. No-op in serial.
+        //- Write processor ids for each poly as CellData
+        //- (no-op in serial)
         bool writeProcIDs();
 
         //- Write a uniform field of Cell (Poly) or Point values

src/finiteArea/Make/files

@@ -44,7 +44,6 @@ $(faPatchFields)/faPatchField/faPatchFields.C
 basicFaPatchFields = $(faPatchFields)/basic
 $(basicFaPatchFields)/basicSymmetry/basicSymmetryFaPatchFields.C
 $(basicFaPatchFields)/calculated/calculatedFaPatchFields.C
-$(basicFaPatchFields)/extrapolatedCalculated/extrapolatedCalculatedFaPatchFields.C
 $(basicFaPatchFields)/coupled/coupledFaPatchFields.C
 $(basicFaPatchFields)/zeroGradient/zeroGradientFaPatchFields.C
 $(basicFaPatchFields)/fixedValue/fixedValueFaPatchFields.C
@@ -63,13 +62,9 @@ $(constraintFaPatchFields)/symmetry/symmetryFaPatchFields.C
 derivedFaPatchFields = $(faPatchFields)/derived
 $(derivedFaPatchFields)/fixedValueOutflow/fixedValueOutflowFaPatchFields.C
 $(derivedFaPatchFields)/inletOutlet/inletOutletFaPatchFields.C
-$(derivedFaPatchFields)/outletInlet/outletInletFaPatchFields.C
 $(derivedFaPatchFields)/slip/slipFaPatchFields.C
 $(derivedFaPatchFields)/edgeNormalFixedValue/edgeNormalFixedValueFaPatchVectorField.C
 $(derivedFaPatchFields)/timeVaryingUniformFixedValue/timeVaryingUniformFixedValueFaPatchFields.C
-$(derivedFaPatchFields)/uniformFixedGradient/uniformFixedGradientFaPatchFields.C
-$(derivedFaPatchFields)/uniformFixedValue/uniformFixedValueFaPatchFields.C
-$(derivedFaPatchFields)/uniformMixed/uniformMixedFaPatchFields.C
 $(derivedFaPatchFields)/clampedPlate/clampedPlateFaPatchFields.C
 
 faePatchFields = fields/faePatchFields

src/finiteArea/fields/areaFields/areaFields.C

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016-2017 Wikki Ltd
-    Copyright (C) 2018-2023 OpenCFD Ltd.
+    Copyright (C) 2018-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -34,14 +34,12 @@ License
 namespace Foam
 {
 
-defineTemplateTypeNameAndDebug(areaLabelField::Internal, 0);
 defineTemplateTypeNameAndDebug(areaScalarField::Internal, 0);
 defineTemplateTypeNameAndDebug(areaVectorField::Internal, 0);
 defineTemplateTypeNameAndDebug(areaSphericalTensorField::Internal, 0);
 defineTemplateTypeNameAndDebug(areaSymmTensorField::Internal, 0);
 defineTemplateTypeNameAndDebug(areaTensorField::Internal, 0);
 
-defineTemplateTypeNameAndDebug(areaLabelField, 0);
 defineTemplateTypeNameAndDebug(areaScalarField, 0);
 defineTemplateTypeNameAndDebug(areaVectorField, 0);
 defineTemplateTypeNameAndDebug(areaSphericalTensorField, 0);

src/finiteArea/fields/areaFields/areaFieldsFwd.H

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016-2017 Wikki Ltd
-    Copyright (C) 2018-2023 OpenCFD Ltd.
+    Copyright (C) 2018-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -75,7 +75,6 @@ using AreaInternalField = DimensionedField<Type, areaMesh>;
 
 // Typedefs
 
-typedef GeometricField<label, faPatchField, areaMesh> areaLabelField;
 typedef GeometricField<scalar, faPatchField, areaMesh> areaScalarField;
 typedef GeometricField<vector, faPatchField, areaMesh> areaVectorField;
 typedef GeometricField<sphericalTensor, faPatchField, areaMesh>

src/finiteArea/fields/edgeFields/edgeFields.C

@@ -6,7 +6,6 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016-2017 Wikki Ltd
-    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -34,14 +33,12 @@ License
 namespace Foam
 {
 
-defineTemplateTypeNameAndDebug(edgeLabelField::Internal, 0);
 defineTemplateTypeNameAndDebug(edgeScalarField::Internal, 0);
 defineTemplateTypeNameAndDebug(edgeVectorField::Internal, 0);
 defineTemplateTypeNameAndDebug(edgeSphericalTensorField::Internal, 0);
 defineTemplateTypeNameAndDebug(edgeSymmTensorField::Internal, 0);
 defineTemplateTypeNameAndDebug(edgeTensorField::Internal, 0);
 
-defineTemplateTypeNameAndDebug(edgeLabelField, 0);
 defineTemplateTypeNameAndDebug(edgeScalarField, 0);
 defineTemplateTypeNameAndDebug(edgeVectorField, 0);
 defineTemplateTypeNameAndDebug(edgeSphericalTensorField, 0);

src/finiteArea/fields/edgeFields/edgeFieldsFwd.H

@@ -60,7 +60,6 @@ template<class Type> class faePatchField;
 
 // Typedefs
 
-typedef GeometricField<label, faePatchField, edgeMesh> edgeLabelField;
 typedef GeometricField<scalar, faePatchField, edgeMesh> edgeScalarField;
 typedef GeometricField<vector, faePatchField, edgeMesh> edgeVectorField;
 typedef GeometricField<sphericalTensor, faePatchField, edgeMesh>

src/finiteArea/fields/faPatchFields/basic/basicSymmetry/basicSymmetryFaPatchField.C

@@ -6,7 +6,6 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016-2017 Wikki Ltd
-    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -96,23 +95,13 @@ template<class Type>
 Foam::tmp<Foam::Field<Type>>
 Foam::basicSymmetryFaPatchField<Type>::snGrad() const
 {
-    if (pTraits<Type>::rank == 0)
-    {
-        // Transform-invariant types
-        return tmp<Field<Type>>::New(this->size(), Zero);
-    }
-    else
-    {
-        symmTensorField rot(I - 2.0*sqr(this->patch().edgeNormals()));
+    const vectorField nHat(this->patch().edgeNormals());
 
-        Field<Type> pif(this->patchInternalField());
-
-        return
-        (
-            (transform(rot, pif) - pif)
-          * (this->patch().deltaCoeffs()/2.0)
-        );
-    }
+    return
+    (
+        transform(I - 2.0*sqr(nHat), this->patchInternalField())
+      - this->patchInternalField()
+    )*(this->patch().deltaCoeffs()/2.0);
 }
 
 
@@ -124,19 +113,14 @@ void Foam::basicSymmetryFaPatchField<Type>::evaluate(const Pstream::commsTypes)
         this->updateCoeffs();
     }
 
-    if (pTraits<Type>::rank == 0)
-    {
-        // Transform-invariant types
-        Field<Type>::operator=(this->patchInternalField());
-    }
-    else
-    {
-        symmTensorField rot(I - 2.0*sqr(this->patch().edgeNormals()));
-
-        Field<Type> pif(this->patchInternalField());
-
-        Field<Type>::operator=((pif + transform(rot, pif))/2.0);
-    }
+    const vectorField nHat(this->patch().edgeNormals());
+    Field<Type>::operator=
+    (
+        (
+            this->patchInternalField()
+          + transform(I - 2.0*sqr(nHat), this->patchInternalField())
+        )/2.0
+    );
 
     transformFaPatchField<Type>::evaluate();
 }

src/finiteArea/fields/faPatchFields/basic/basicSymmetry/basicSymmetryFaPatchField.H

@@ -38,8 +38,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef Foam_basicSymmetryFaPatchField_H
-#define Foam_basicSymmetryFaPatchField_H
+#ifndef basicSymmetryFaPatchField_H
+#define basicSymmetryFaPatchField_H
 
 #include "transformFaPatchField.H"
 #include "symmetryFaPatch.H"
@@ -58,6 +58,7 @@ class basicSymmetryFaPatchField
 :
     public transformFaPatchField<Type>
 {
+
 public:
 
     // Constructors
@@ -70,7 +71,6 @@ public:
         );
 
         //- Construct from patch, internal field and dictionary
-        //  The "value" entry: NO_READ
         basicSymmetryFaPatchField
         (
             const faPatch&,
@@ -78,8 +78,7 @@ public:
             const dictionary&
         );
 
-        //- Construct by mapping given basicSymmetryFaPatchField
-        //- onto a new patch
+        //- Construct by mapping given basicSymmetryFaPatchField onto a new patch
         basicSymmetryFaPatchField
         (
             const basicSymmetryFaPatchField<Type>&,
@@ -131,6 +130,8 @@ public:
             virtual tmp<Field<Type>> snGrad() const;
 
             //- Evaluate the patch field
+            //  Default argument needed to allow call in constructors
+            //  HJ, 30/Jun/2009
             virtual void evaluate
             (
                 const Pstream::commsTypes commsType = Pstream::commsTypes::blocking
@@ -141,6 +142,18 @@ public:
 };
 
 
+// * * * * * * * * * * * Template Specialisations  * * * * * * * * * * * * * //
+
+template<>
+tmp<scalarField> basicSymmetryFaPatchField<scalar>::snGrad() const;
+
+template<>
+void basicSymmetryFaPatchField<scalar>::evaluate
+(
+    const Pstream::commsTypes commsType
+);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam