WIP: support command-line redirection of stdout/stderr

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

META-INFO/api-info

@@ -1,2 +1,2 @@
 api=2306
-patch=240625
+patch=0

applications/solvers/acoustic/acousticFoam/readTransportProperties.H

@@ -18,6 +18,6 @@ dimensionedScalar rho("rho", dimDensity, transportProperties);
 
 scalar MaxCo =
     max(mesh.surfaceInterpolation::deltaCoeffs()*c0).value()
-   *runTime.deltaT().value();
+   *runTime.deltaTValue();
 
 Info<< "Max acoustic Courant Number = " << MaxCo << endl;

applications/solvers/combustion/chemFoam/setDeltaT.H

@@ -1,5 +1,5 @@
 if (adjustTimeStep)
 {
     runTime.setDeltaT(min(dtChem, maxDeltaT));
-    Info<< "deltaT = " <<  runTime.deltaT().value() << endl;
+    Info<< "deltaT = " <<  runTime.deltaTValue() << endl;
 }

applications/solvers/combustion/chemFoam/solveChemistry.H

@@ -1,3 +1,3 @@
-dtChem = chemistry.solve(runTime.deltaT().value());
+dtChem = chemistry.solve(runTime.deltaTValue());
 scalar Qdot = chemistry.Qdot()()[0]/rho[0];
-integratedHeat += Qdot*runTime.deltaT().value();
+integratedHeat += Qdot*runTime.deltaTValue();

applications/solvers/compressible/rhoCentralFoam/directionInterpolate.H

@@ -17,7 +17,7 @@ tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> interpolate
             vf,
             dir,
             "reconstruct("
-          + (reconFieldName != word::null ? reconFieldName : vf.name())
+          + (reconFieldName.empty() ? vf.name() : reconFieldName)
           + ')'
         )
     );

applications/solvers/finiteArea/liquidFilmFoam/capillaryCourantNo.H

@@ -7,7 +7,7 @@
             *mag(aMesh.edgeInterpolation::deltaCoeffs())
             /rhol
         )
-    ).value()*runTime.deltaT().value();
+    ).value()*runTime.deltaTValue();
 
     Info<< "Max Capillary Courant Number = " << CoNumSigma << '\n' << endl;
 }

applications/solvers/finiteArea/liquidFilmFoam/surfaceCourantNo.H

@@ -47,10 +47,10 @@ if (aMesh.nInternalEdges())
     );
 
     CoNum = max(SfUfbyDelta/aMesh.magLe())
-        .value()*runTime.deltaT().value();
+        .value()*runTime.deltaTValue();
 
     meanCoNum = (sum(SfUfbyDelta)/sum(aMesh.magLe()))
-        .value()*runTime.deltaT().value();
+        .value()*runTime.deltaTValue();
 
     velMag = max(mag(phis)/aMesh.magLe()).value();
 }

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

@@ -292,8 +292,7 @@ updateCoeffs()
 
     // Since we're inside initEvaluate/evaluate there might be processor
     // comms underway. Change the tag we use.
-    int oldTag = UPstream::msgType();
-    UPstream::msgType() = oldTag+1;
+    const int oldTag = UPstream::incrMsgType();
 
     // Get the coupling information from the mappedPatchBase
     const label patchi = patch().index();
@@ -471,10 +470,9 @@ updateCoeffs()
             << regionTypeNames_ << nl << exit(FatalError);
     }
 
-    mixedFvPatchScalarField::updateCoeffs();
+    UPstream::msgType(oldTag);  // Restore tag
 
-    // Restore tag
-    UPstream::msgType() = oldTag;
+    mixedFvPatchScalarField::updateCoeffs();
 }
 
 

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

@@ -49,11 +49,11 @@ if (adjustTimeStep)
         (
             min
             (
-                min(maxCo/CoNum, maxDi/DiNum)*runTime.deltaT().value(),
+                min(maxCo/CoNum, maxDi/DiNum)*runTime.deltaTValue(),
                 min(runTime.deltaTValue(), maxDeltaT)
             )
         );
-        Info<< "deltaT = " <<  runTime.deltaT().value() << endl;
+        Info<< "deltaT = " <<  runTime.deltaTValue() << endl;
     }
 }
 

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

@@ -59,12 +59,12 @@ if (adjustTimeStep)
     (
         min
         (
-            min(deltaTFluid, maxDeltaTSolid)*runTime.deltaT().value(),
+            min(deltaTFluid, maxDeltaTSolid)*runTime.deltaTValue(),
             maxDeltaT
         )
     );
 
-    Info<< "deltaT = " <<  runTime.deltaT().value() << endl;
+    Info<< "deltaT = " <<  runTime.deltaTValue() << endl;
 }
 
 // ************************************************************************* //

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

@@ -86,6 +86,7 @@ VoFPatchTransfer::VoFPatchTransfer
     wordRes patchNames;
     if (coeffDict_.readIfPresent("patches", patchNames))
     {
+        // Can also use pbm.indices(), but no warnings...
         patchIDs_ = pbm.patchSet(patchNames).sortedToc();
 
         Info<< "        applying to " << patchIDs_.size() << " patches:" << nl;

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

@@ -1075,7 +1075,7 @@ void Foam::multiphaseMixtureThermo::solveAlphas
 
         MULES::limit
         (
-            1.0/mesh_.time().deltaT().value(),
+            1.0/mesh_.time().deltaTValue(),
             geometricOneField(),
             alpha,
             phi_,

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

@@ -699,7 +699,7 @@ void Foam::radiation::laserDTRM::calculate()
         scalar totalQ = gSum(Q_.primitiveFieldRef()*mesh_.V());
         Info << "Total energy absorbed [W]: " << totalQ << endl;
 
-        if (mesh_.time().outputTime())
+        if (mesh_.time().writeTime())
         {
             reflectingCellsVol.write();
             nHat.write();

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

@@ -52,7 +52,9 @@ namespace Foam
 const Foam::volScalarField&
 Foam::radiation::localDensityAbsorptionEmission::alpha(word alphaName) const
 {
-    if (!mesh_.foundObject<volScalarField>(alphaName))
+    const volScalarField* ptr = mesh_.cfindObject<volScalarField>(alphaName);
+
+    if (!ptr)
     {
         FatalErrorInFunction
             << "Unable to retrieve density field " << alphaName << " from "
@@ -60,7 +62,7 @@ Foam::radiation::localDensityAbsorptionEmission::alpha(word alphaName) const
             << exit(FatalError);
     }
 
-    return mesh_.lookupObject<volScalarField>(alphaName);
+    return *ptr;
 }
 
 

applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/constant/constant.C

@@ -124,7 +124,7 @@ Foam::temperaturePhaseChangeTwoPhaseMixtures::constant::mDot() const
       * max(TSat - T, T0)
     );
 
-    if (mesh_.time().outputTime())
+    if (mesh_.time().writeTime())
     {
         mDotC.write();
         mDotE.write();

applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqn.H

@@ -96,7 +96,7 @@
             MULES::limiter
             (
                 allLambda,
-                1.0/runTime.deltaT().value(),
+                1.0/runTime.deltaTValue(),
                 geometricOneField(),
                 alpha1,
                 alphaPhi1BD,
@@ -164,7 +164,7 @@
             MULES::limiter
             (
                 allLambda,
-                1.0/runTime.deltaT().value(),
+                1.0/runTime.deltaTValue(),
                 geometricOneField(),
                 alpha2,
                 alphaPhi2BD,

applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C

@@ -628,7 +628,7 @@ void Foam::multiphaseMixture::solveAlphas
 
         MULES::limit
         (
-            1.0/mesh_.time().deltaT().value(),
+            1.0/mesh_.time().deltaTValue(),
             geometricOneField(),
             alpha,
             phi_,

applications/solvers/stressAnalysis/solidDisplacementFoam/readMechanicalProperties.H

@@ -20,7 +20,7 @@
     IOobject rhoIO
     (
         "rho",
-        runTime.timeName(0),
+        Time::timeName(0),
         mesh,
         IOobject::NO_READ,
         IOobject::NO_WRITE
@@ -75,7 +75,7 @@
     IOobject EHeader
     (
         "E",
-        runTime.timeName(0),
+        Time::timeName(0),
         mesh,
         IOobject::NO_READ,
         IOobject::NO_WRITE
@@ -127,7 +127,7 @@
     IOobject nuIO
     (
         "nu",
-        runTime.timeName(0),
+        Time::timeName(0),
         mesh,
         IOobject::NO_READ,
         IOobject::NO_WRITE

applications/solvers/stressAnalysis/solidDisplacementFoam/readThermalProperties.H

@@ -51,7 +51,7 @@ if (thermalStress)
     IOobject CIO
     (
         "C",
-        runTime.timeName(0),
+        Time::timeName(0),
         mesh,
         IOobject::NO_READ,
         IOobject::NO_WRITE
@@ -106,7 +106,7 @@ if (thermalStress)
     IOobject rhoKIO
     (
         "k",
-        runTime.timeName(0),
+        Time::timeName(0),
         mesh,
         IOobject::NO_READ,
         IOobject::NO_WRITE
@@ -161,7 +161,7 @@ if (thermalStress)
     IOobject alphaIO
     (
         "alpha",
-        runTime.timeName(0),
+        Time::timeName(0),
         mesh,
         IOobject::NO_READ,
         IOobject::NO_WRITE

applications/test/CircularBuffer/Test-CircularBuffer.C

@@ -92,7 +92,10 @@ int main(int argc, char *argv[])
     }
     report(buf1);
 
-    buf1.push_back(identity(5)); report(buf1);
+    buf1.push_back(identity(5));
+    buf1.emplace_front(-1000);
+    buf1.emplace_back(1000);
+    report(buf1);
 
     buf1.info(Info);
     Info<< buf1 << nl;

applications/test/Dictionary/Test-Dictionary.C

@@ -55,10 +55,7 @@ public:
         i_(i)
     {}
 
-    const word& keyword() const
-    {
-        return keyword_;
-    }
+    const word& keyword() const noexcept { return keyword_; }
 
     friend Ostream& operator<<(Ostream& os, const ent& e)
     {
@@ -74,28 +71,27 @@ class Scalar
 
 public:
 
-    Scalar()
-    :
-        data_(0)
-    {}
+    static bool verbose;
 
-    Scalar(scalar val)
-    :
-        data_(val)
-    {}
+    constexpr Scalar() noexcept : data_(0) {}
+    Scalar(scalar val) noexcept : data_(val) {}
 
     ~Scalar()
     {
-        Info<<"delete Scalar: " << data_ << endl;
+        if (verbose) Info<< "delete Scalar: " << data_ << endl;
     }
 
-    friend Ostream& operator<<(Ostream& os, const Scalar& val)
+    scalar value() const noexcept { return data_; }
+    scalar& value() noexcept { return data_; }
+
+    friend Ostream& operator<<(Ostream& os, const Scalar& item)
     {
-        os  << val.data_;
+        os  << item.value();
         return os;
     }
 };
 
+bool Scalar::verbose = true;
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -117,7 +113,7 @@ int main(int argc, char *argv[])
 
     dict.swapDown(dict.first());
 
-    forAllConstIter(Dictionary<ent>, dict, iter)
+    forAllConstIters(dict, iter)
     {
         Info<< "element : " << *iter;
     }
@@ -157,9 +153,9 @@ int main(int argc, char *argv[])
     }
 
     Info<< nl << "scalarDict1: " << endl;
-    forAllConstIter(PtrDictionary<Scalar>, scalarDict, iter)
+    forAllConstIters(scalarDict, iter)
     {
-        Info<< " = " << iter() << endl;
+        Info<< " = " << *iter << endl;
     }
 
     PtrDictionary<Scalar> scalarDict2;
@@ -169,7 +165,7 @@ int main(int argc, char *argv[])
         scalarDict2.insert(key, new Scalar(1.3*i));
     }
     Info<< nl << "scalarDict2: " << endl;
-    forAllConstIter(PtrDictionary<Scalar>, scalarDict2, iter)
+    forAllConstIters(scalarDict2, iter)
     {
         std::cout<< "iter: " << typeid(*iter).name() << '\n';
 

applications/test/DirLister/DirLister.H

@@ -85,7 +85,7 @@ Description
 
         fileNameList procDirs
         (
-            DirLister::dirs(".").sorted<fileName>(matchProcs)
+            DirLister::dirs(".").csorted<fileName>(matchProcs)
         );
     }
     \endcode
@@ -206,11 +206,11 @@ public:
 
         //- Return a complete list of names, sorted in natural order
         template<class StringType=Foam::word>
-        List<StringType> sorted() const;
+        List<StringType> csorted() const;
 
         //- Return complete list of names, sorted in natural order
         template<class StringType=Foam::word, class UnaryPredicate>
-        List<StringType> sorted
+        List<StringType> csorted
         (
             const UnaryPredicate& pred,
             const bool prune = false

applications/test/DirLister/DirListerTemplates.C

@@ -70,23 +70,23 @@ Foam::List<StringType> Foam::DirLister::list() const
 
 
 template<class StringType, class UnaryPredicate>
-Foam::List<StringType> Foam::DirLister::sorted
+Foam::List<StringType> Foam::DirLister::csorted
 (
     const UnaryPredicate& pred,
     const bool prune
 ) const
 {
-    List<StringType> lst(list<StringType>(pred, prune));
-    sort(lst, stringOps::natural_sort());
+    List<StringType> list(list<StringType>(pred, prune));
+    Foam::sort(list, stringOps::natural_sort());
 
-    return lst;
+    return list;
 }
 
 
 template<class StringType>
-Foam::List<StringType> Foam::DirLister::sorted() const
+Foam::List<StringType> Foam::DirLister::csorted() const
 {
-    return sorted<StringType>(predicates::always());
+    return csorted<StringType>(predicates::always());
 }
 
 

applications/test/DirLister/Test-DirLister.C

@@ -162,7 +162,7 @@ int main(int argc, char *argv[])
         Info<< "dirList: "
             << flatOutput
                (
-                   DirLister::dirs(".").sorted<fileName>(relist)
+                   DirLister::dirs(".").csorted<fileName>(relist)
                ) << nl;
     }
 

applications/test/FixedList/Test-FixedList.C

@@ -202,14 +202,31 @@ int main(int argc, char *argv[])
         Info<< "get<3>: " << list1.get<3>() << nl;
 // Will not compile:  Info<< "get<4>: " << list1.get<4>() << nl;
 
-        label a[4] = {0, 1, 2, 3};
-        FixedList<label, 4> list2(a);
+        // Test deprecated form
+        label array2[4] = {0, 1, 2, 3};
+        FixedList<label, 4> list2(array2);
 
         Info<< "list2:" << list2
             << " hash:" << FixedList<label, 4>::hasher()(list2) << nl
             << " hash:" << Hash<FixedList<label, 4>>()(list2) << nl;
 
 
+        // Test deprecated form
+        SLList<label> sllist3;
+        {
+            sllist3.push_back(0);
+            sllist3.push_back(1);
+            sllist3.push_back(2);
+            sllist3.push_back(3);
+        }
+        FixedList<label, 4> list3(sllist3);
+
+        Info<< "list3:" << list3 << nl;
+        // Test deprecated forms
+        list3 = array2;
+        list2 = sllist3;
+
+
         // Using FixedList for content too
         {
             List<FixedList<label, 4>> twolists{list1, list2};
@@ -237,8 +254,8 @@ int main(int argc, char *argv[])
         Info<< "mem: "
             << name(list1.data()) << " " << name(list2.data()) << nl;
 
-        Swap(list1, list2);
-        Info<< "The Swap() function" << nl;
+        Foam::Swap(list1, list2);
+        Info<< "Foam::Swap() function" << nl;
         Info<< "list1: " << list1 << nl
             << "list2: " << list2 << nl;
 

applications/test/FixedList2/Test-FixedList2.C

@@ -68,7 +68,7 @@ void runSwapTest
 
     for (label iLoop = 0; iLoop < nLoops; ++iLoop)
     {
-        Swap(list1, list2);
+        Foam::Swap(list1, list2);
     }
 
     Info<< "output 1: " << list1.first() << nl;

applications/test/HashPtrTable/Test-HashPtrTable.C

@@ -44,38 +44,28 @@ class Scalar
 
 public:
 
-    Scalar()
-    :
-        data_(0)
-    {}
+    static bool verbose;
 
-    Scalar(scalar val)
-    :
-        data_(val)
-    {}
+    constexpr Scalar() noexcept : data_(0) {}
+    Scalar(scalar val) noexcept : data_(val) {}
 
     ~Scalar()
     {
-        Info<<"delete Scalar: " << data_ << endl;
+        if (verbose) Info<< "delete Scalar: " << data_ << endl;
     }
 
-    const scalar& value() const
-    {
-        return data_;
-    }
+    const scalar& value() const noexcept { return data_; }
+    scalar& value() noexcept { return data_; }
 
-    scalar& value()
+    friend Ostream& operator<<(Ostream& os, const Scalar& item)
     {
-        return data_;
-    }
-
-    friend Ostream& operator<<(Ostream& os, const Scalar& val)
-    {
-        os  << val.data_;
+        os  << item.value();
         return os;
     }
 };
 
+bool Scalar::verbose = true;
+
 
 template<class T>
 void printTable(const HashPtrTable<T>& table)
@@ -129,6 +119,9 @@ int main()
     myTable.set("natlog", new double(2.718282));
     myTable.insert("sqrt2", autoPtr<double>::New(1.414214));
     myTable.insert("euler", autoPtr<double>::New(0.577216));
+    myTable.set("def_0", nullptr);
+    myTable.emplace_set("def_1", 123);
+    myTable.emplace_set("def_2", 456);
 
     HashTable<std::unique_ptr<double>> myTable1;
 
@@ -146,6 +139,14 @@ int main()
     Info<< "Initial table" << nl;
     printTable(myTable);
 
+    myTable.try_emplace("def_0", 1000);  // was nullptr, now value
+    myTable.try_emplace("def_1", 1001);  // no-op
+    myTable.try_emplace("def_2", 1002);  // no-op;
+    myTable.try_emplace("def_3", 1003);  // was non-existent, now value
+
+    Info<< "after try_emplace" << nl;
+    printTable(myTable);
+
     Info<< "print" << nl;
     Info<< myTable2 << nl;
 

applications/test/HashTable1/Test-HashTable1.C

@@ -75,8 +75,8 @@ int main()
     }
 
 
-    Info<< "\ntable1 sorted() :" << endl;
-    for (const auto& iter : table1.sorted())
+    Info<< "\ntable1 csorted() :" << endl;
+    for (const auto& iter : table1.csorted())
     {
         Info<< "    " << iter.key() << " => " << iter.val() << nl;
     }
@@ -100,7 +100,7 @@ int main()
     }
 
     Info<< "\nInplace modified - via sorted() access :" << endl;
-    for (const auto& iter : table1.sorted())
+    for (const auto& iter : table1.csorted())
     {
         Info<< "    " << iter.key() << " => " << iter.val() << nl;
     }
@@ -366,8 +366,8 @@ int main()
     Info<< nl << "input values" << nl;
     Info<<"table1 =  " << table1 << nl <<"table2 =  " << table2 << nl;
 
-    Info<<"global Swap function" << nl;
-    Swap(table1, table2);
+    Info<<"std::swap function" << nl;
+    std::swap(table1, table2);
     Info<<"table1 =  " << table1 << nl <<"table2 =  " << table2 << nl;
 
     Info<<"swap method" << nl;

applications/test/IOobjectList/Test-IOobjectList.C

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2017-2022 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -290,14 +290,14 @@ int main(int argc, char *argv[])
         Info<< "Time: " << runTime.timeName() << nl;
 
         report(objects);
-        report(objects.sorted());
+        report(objects.csorted());
 
-        report(objects.sorted<volScalarField>());
-        report(objects.sorted<volVectorField>());
+        report(objects.csorted<volScalarField>());
+        report(objects.csorted<volVectorField>());
 
         // Extra checks
-        report<volScalarField>(objects.sorted<volScalarField>());
-        report<volScalarField>(objects.sorted<volVectorField>());
+        report<volScalarField>(objects.csorted<volScalarField>());
+        report<volScalarField>(objects.csorted<volVectorField>());
 
 
         findObjectTest(objects);

applications/test/ISLList/Test-ISLList.C

@@ -46,26 +46,27 @@ class Scalar
 {
 public:
 
+    // static bool verbose;
+
     scalar data_;
 
-    Scalar()
-    :
-        data_(0)
-    {}
+    Scalar() : data_(0) {}
+    Scalar(scalar val) : data_(val) {}
 
-    Scalar(scalar s)
-    :
-        data_(s)
-    {}
+    // ~Scalar() {}
 
-    friend Ostream& operator<<(Ostream& os, const Scalar& s)
+    scalar value() const noexcept { return data_; }
+    scalar& value() noexcept { return data_; }
+
+    friend Ostream& operator<<(Ostream& os, const Scalar& item)
     {
-        os  << s.data_;
+        os  << item.value();
         return os;
     }
-
 };
 
+// bool Scalar::verbose = true;
+
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 //  Main program:

applications/test/ITstream/Test-ITstream.C

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2017-2021 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -27,6 +27,7 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
+#include "argList.H"
 #include "ListStream.H"
 #include "UListStream.H"
 #include "wordList.H"
@@ -155,35 +156,378 @@ void doTest
 }
 
 
+void printToken(const label index, const token& tok)
+{
+    Info<< "  " << index << "  " << tok.name();
+    if (tok.good())
+    {
+        Info<< " : " << tok;
+    }
+    Info<< nl;
+}
+
+
+template<class BUF>
+void testWalk1
+(
+    const std::string& name,
+    const BUF& input,
+    const int verbose
+)
+{
+    Info<< "tokenized " << name.c_str() << ":" << nl
+        << "====" << nl;
+    toString(Info, input)
+        << nl
+        << "====" << endl;
+
+    ITstream is(input);
+    Info<< is.size() << " tokens" << endl;
+    for (is.rewind(); !is.eof(); is.skip())
+    {
+        printToken(is.tokenIndex(), is.currentToken());
+    }
+    Info<< nl;
+
+    Info<< "every other token:" << nl;
+    for (is.seek(1); is.nRemainingTokens(); is.skip(2))
+    {
+        printToken(is.tokenIndex(), is.currentToken());
+    }
+
+    for (int i : { 3, 7, 11, 20 })
+    {
+        Info<< "peekToken: ";
+        printToken(i, is.peekToken(i));
+    }
+
+    labelRange range(is.size()-2, 2);
+    Info<< nl
+        << "remove: " << range << " of 0/" << is.size() << " tokens" << endl;
+    is.remove(range);
+
+    Info<< "Now " << is.size() << " tokens" << endl;
+    for (is.rewind(); !is.eof(); is.skip())
+    {
+        printToken(is.tokenIndex(), is.currentToken());
+    }
+
+    range.reset(10, 3);
+    Info<< nl
+        << "remove: " << range << " of 0/" << is.size() << " tokens" << endl;
+    is.remove(range);
+
+    Info<< "Now " << is.size() << " tokens" << endl;
+    for (is.rewind(); !is.eof(); is.skip())
+    {
+        printToken(is.tokenIndex(), is.currentToken());
+    }
+
+    Info<< nl;
+}
+
+
+void testRewrite(const std::string& input, const int verbose)
+{
+    Info<< "tokens" << nl
+        << "====" << nl;
+    toString(Info, input)
+        << nl
+        << "====" << endl;
+
+    ITstream is(input);
+    Info<< is.size() << " tokens" << endl;
+
+    if (verbose)
+    {
+        for (is.rewind(); !is.eof(); is.skip())
+        {
+            printToken(is.tokenIndex(), is.currentToken());
+        }
+        Info<< nl;
+    }
+    else
+    {
+        Info<< "==>";
+        for (const token& tok : is)
+        {
+            Info<< ' ' << tok;
+        }
+        Info<< nl;
+    }
+
+    Info<< nl
+        << "removing sub-dictionary tokens" << nl;
+
+    for (is.rewind(); !is.eof(); is.skip())
+    {
+        if (is.currentToken().isPunctuation(token::BEGIN_BLOCK))
+        {
+            labelRange slice(is.tokenIndex(), 0);
+
+            #if 0
+            // This is a bad way to remove things since we lose the parse
+            // point!
+            for (/*nil*/; !is.eof(); is.skip())
+            {
+                if (is.currentToken().isPunctuation(token::END_BLOCK))
+                {
+                    slice.size() = (is.tokenIndex() - slice.start()) + 1;
+                    break;
+                }
+            }
+            #else
+            for (label toki = is.tokenIndex()+1; toki < is.size(); ++toki)
+            {
+                if (is.peekToken(toki).isPunctuation(token::END_BLOCK))
+                {
+                    slice.size() = (toki - slice.start()) + 1;
+                    break;
+                }
+            }
+            #endif
+
+            Info<< "remove range: " << slice
+                << " currentIndex: " << is.tokenIndex() << '/' << is.size()
+                // NB peekToken handles out-of-range
+                << " token: " << is.peekToken(is.tokenIndex()) << nl;
+
+            const label nRemoved = is.remove(slice);
+
+            Info<< "remove " << nRemoved
+                << " new current: " << is.tokenIndex() << '/' << is.size()
+                // NB peekToken handles out-of-range
+                << " token: " << is.peekToken(is.tokenIndex()) << nl;
+
+            Info<< "==>";
+            for (const token& tok : is)
+            {
+                Info<< ' ' << tok;
+            }
+            Info<< nl << nl;
+        }
+    }
+    Info<< nl;
+}
+
+
+void testRemoveDict(const std::string& input, const int verbose)
+{
+    Info<< "tokens" << nl
+        << "====" << nl;
+    toString(Info, input)
+        << nl
+        << "====" << endl;
+
+    ITstream is(input);
+    Info<< is.size() << " tokens" << endl;
+
+    if (verbose)
+    {
+        for (is.rewind(); !is.eof(); is.skip())
+        {
+            printToken(is.tokenIndex(), is.currentToken());
+        }
+        Info<< nl;
+    }
+    else
+    {
+        Info<< "==>";
+        for (const token& tok : is)
+        {
+            Info<< ' ' << tok;
+        }
+        Info<< nl;
+    }
+
+    for (label pos = 0; pos < is.size(); /*nil*/)
+    {
+        labelRange slice
+        (
+            is.find(token::BEGIN_BLOCK, token::END_BLOCK, pos)
+        );
+
+        if (slice.good())
+        {
+            pos = slice.end_value();
+
+            tokenList::subList substream(is.slice(slice));
+
+            Info<< "  dict " << slice << " ==>";
+            for (const token& tok : substream)
+            {
+                Info<< ' ' << tok;
+            }
+            Info<< nl;
+        }
+        else
+        {
+            break;
+        }
+    }
+
+
+    Info<< nl
+        << "removing sub-dictionary tokens" << nl;
+
+    for (is.rewind(); !is.eof(); is.skip())
+    {
+        if (is.currentToken().isPunctuation(token::BEGIN_BLOCK))
+        {
+            labelRange slice
+            (
+                is.find(token::BEGIN_BLOCK, token::END_BLOCK, is.tokenIndex())
+            );
+
+            if (slice.good())
+            {
+                ITstream substream(is.extract(slice));
+
+                Info<< "got " << slice << " ==>";
+                for (const token& tok : substream)
+                {
+                    Info<< ' ' << tok;
+                }
+                Info<< nl;
+
+                dictionary dict(substream);
+
+                Info<< "tokenIndex: " << is.tokenIndex() << nl;
+                Info<< "sub-dict " << dict << nl;
+
+                Info<< "remove range: " << slice
+                    << " currentIndex: " << is.tokenIndex() << '/' << is.size()
+                    << " token: " << is.peekToken(is.tokenIndex()) << nl;
+
+                const label nRemoved = is.remove(slice);
+
+                Info<< "remove " << nRemoved
+                    << " new current: " << is.tokenIndex() << '/' << is.size()
+                    << " token: " << is.peekToken(is.tokenIndex()) << nl;
+
+                Info<< "==>";
+                for (const token& tok : is)
+                {
+                    Info<< ' ' << tok;
+                }
+                Info<< nl << nl;
+
+                // Reposition the parse point
+                is.seek(slice.start());
+                is.skip(-1);
+
+                Info<< "continue after " << is.tokenIndex()
+                    << " : " << is.peekToken(is.tokenIndex()) << nl;
+            }
+        }
+    }
+    Info<< nl;
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 // Main program:
 
 int main(int argc, char *argv[])
 {
-    const char* charInput =
-        "( const char input \"string\" to tokenize )\n"
-        "List<label> 5(0 1 2 3 4);";
+    argList::noBanner();
+    argList::noParallel();
+    argList::addVerboseOption("additional verbosity");
+    argList::addBoolOption("basic", "basic tests");
+    argList::addBoolOption("rewrite", "test rewriting only");
+    argList::addBoolOption("remove-dict", "test rewriting only");
 
-    string stringInput("( string     ;    input \"string\" to tokenize )");
+    argList args(argc, argv);
 
-    List<char> listInput
+    if
     (
-        ListOps::create<char>
+        !args.found("basic")
+     && !args.found("rewrite")
+     && !args.found("remove-dict")
+    )
+    {
+        Info<< "No test options specified!" << nl << nl;
+    }
+
+    if (args.found("basic"))
+    {
+        const char* charInput =
+            "( const char input \"string\" to tokenize )\n"
+            "List<label> 5(0 1 2 3 4);";
+
+        string stringInput("( string     ;    input \"string\" to tokenize )");
+
+        List<char> listInput
         (
-            stringInput.cbegin(),
-            stringInput.cend(),
-            Foam::identityOp{}
-        )
-    );
+            ListOps::create<char>
+            (
+                stringInput.cbegin(),
+                stringInput.cend(),
+                Foam::identityOp{}
+            )
+        );
 
-    doTest("empty", "", true, true);
+        doTest("empty", "", true, true);
 
-    doTest("char*", charInput, true, true);
-    doTest("string", stringInput, true);
-    doTest("List<char>", listInput, true);
+        doTest("char*", charInput, true, true);
+        doTest("string", stringInput, true);
+        doTest("List<char>", listInput, true);
 
-    reverse(listInput);
-    doTest("List<char>", listInput, true);
+        reverse(listInput);
+        doTest("List<char>", listInput, true);
+    }
+
+    if (args.found("rewrite"))
+    {
+        testWalk1
+        (
+            "std::string",
+            "( string ;    input \"string\" to tokenize )"
+            "{ other entry; value 100; value2 200; }"
+            , args.verbose()
+        );
+
+        testRewrite
+        (
+            "some entry ( string1 ; )"
+            "{ sub dict1; value 100; value2 200; }"
+            "other entry ( string2 ; )"
+            "{ sub dict2; value 100; value2 200; }"
+            "{ sub dict3; value 100; value2 200; }"
+            "trailing entry"
+            , args.verbose()
+        );
+    }
+
+    if (args.found("remove-dict"))
+    {
+        testRemoveDict
+        (
+            "some entry ( string1 ; )"
+            "{ sub dict1; value 100; value2 200; }"
+            "other entry ( string2 ; )"
+            "{ sub dict2; value 100; value2 200; }"
+            "{ sub dict3; value 100; value2 200; }"
+            "trailing entry"
+            , args.verbose()
+        );
+
+        testRemoveDict
+        (
+            "some entry no dictionary"
+            , args.verbose()
+        );
+        testRemoveDict
+        (
+            "{ leading dict; } last-stuff"
+            , args.verbose()
+        );
+        testRemoveDict
+        (
+            "first-stuff { trailing dict; }"
+            , args.verbose()
+        );
+    }
 
     Info<< "\nEnd\n" << endl;
 

applications/test/IndirectList/Test-IndirectList.C

@@ -183,9 +183,7 @@ int main(int argc, char *argv[])
             Pout<<"recv: " << flatOutput(recv) << endl;
         }
 
-        // MPI barrier
-        bool barrier = true;
-        Pstream::broadcast(barrier);
+        UPstream::barrier(UPstream::worldComm);
     }
 
 

applications/test/ListRead1/Make/files

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

applications/test/ListRead1/Make/options

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

applications/test/ListRead1/Test-ListRead1.C

@@ -0,0 +1,234 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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/>.
+
+Application
+    Test-ListRead1
+
+Description
+    List reading
+
+\*---------------------------------------------------------------------------*/
+
+#include "OSspecific.H"
+#include "argList.H"
+#include "wordRes.H"
+
+#include "IOstreams.H"
+#include "Fstream.H"
+#include "StringStream.H"
+#include "scalar.H"
+#include "vector.H"
+
+#include "labelRange.H"
+#include "scalarList.H"
+#include "HashOps.H"
+#include "ListOps.H"
+#include "IndirectList.H"
+#include "SubList.H"
+#include "SliceList.H"
+#include "ListPolicy.H"
+
+#include <list>
+#include <numeric>
+#include <functional>
+
+using namespace Foam;
+
+label chunkSize = 128;
+
+template<class T>
+bool readBracketList(List<T>& list, Istream& is)
+{
+    is.fatalCheck(FUNCTION_NAME);
+
+    token tok(is);
+
+    is.fatalCheck
+    (
+        "List<T>::readBracketList(Istream&) : reading first token"
+    );
+
+    if (!tok.isPunctuation(token::BEGIN_LIST))
+    {
+        is.putBack(tok);
+        return false;
+    }
+
+    {
+        // "(...)" : read element-wise.
+        // Uses chunk-wise reading to avoid too many re-allocations
+        // and avoids relocation of contiguous memory until all of the reading
+        // is completed. Chunks are wrapped as unique_ptr to ensure proper
+        // cleanup on failure.
+
+        // The choice of chunk-size is somewhat arbitrary...
+        // constexpr label chunkSize = 128;
+        typedef std::unique_ptr<List<T>> chunkType;
+
+        is >> tok;
+        is.fatalCheck(FUNCTION_NAME);
+
+        if (tok.isPunctuation(token::END_LIST))
+        {
+            // Trivial case, an empty list
+            list.clear();
+            return true;
+        }
+
+        // Use all storage
+        //private:// list.resize(list.capacity());
+
+        // Start with a few slots, recover current memory where possible
+        List<chunkType> chunks(16);
+        if (list.empty())
+        {
+            chunks[0] = chunkType(new List<T>(chunkSize));
+        }
+        else
+        {
+            chunks[0] = chunkType(new List<T>(std::move(list)));
+        }
+
+        label nChunks = 1;      // Active number of chunks
+        label totalCount = 0;   // Total number of elements
+        label localIndex = 0;   // Chunk-local index
+
+        InfoErr
+            << nl << "initial chunk: " << chunks[0]->size() << endl;
+
+        while (!tok.isPunctuation(token::END_LIST))
+        {
+            is.putBack(tok);
+
+            if (chunks[nChunks-1]->size() <= localIndex)
+            {
+                // Increase number of slots (doubling)
+                if (nChunks >= chunks.size())
+                {
+                    chunks.resize(2*chunks.size());
+                }
+
+                InfoErr<< "new chunk" << endl;
+                chunks[nChunks] = chunkType(new List<T>(chunkSize));
+                ++nChunks;
+                localIndex = 0;
+            }
+
+            is  >> chunks[nChunks-1]->operator[](localIndex);
+            ++localIndex;
+            ++totalCount;
+
+            InfoErr
+                << "    chunk=" << nChunks
+                << " index=" << localIndex
+                << " total=" << totalCount << nl;
+
+            is.fatalCheck
+            (
+                "List<T>::readBracketList(Istream&) : "
+                "reading entry"
+            );
+
+            is >> tok;
+            is.fatalCheck(FUNCTION_NAME);
+        }
+
+        // Simple case
+        if (nChunks == 1)
+        {
+            list = std::move(*(chunks[0]));
+            list.resize(totalCount);
+            return true;
+        }
+
+        // Destination
+        //private:// list.setCapacity_nocopy(totalCount);
+        list.resize_nocopy(totalCount);
+        auto dest = list.begin();
+
+        for (label chunki = 0; chunki < nChunks; ++chunki)
+        {
+            List<T> currChunk(std::move(*(chunks[chunki])));
+            chunks[chunki].reset(nullptr);
+
+            const label localLen = min(currChunk.size(), totalCount);
+
+            dest = std::move
+            (
+                currChunk.begin(),
+                currChunk.begin(localLen),
+                dest
+            );
+
+            totalCount -= localLen;
+        }
+    }
+
+    return true;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+//  Main program:
+
+int main(int argc, char *argv[])
+{
+    argList::noBanner();
+    argList::noParallel();
+    argList::noFunctionObjects();
+    argList::addOption("chunk-size",  "value", "change read chunk size");
+    argList::addArgument("file1 .. fileN");
+
+    argList args(argc, argv, false, true);
+
+    args.readIfPresent("chunk-size", chunkSize);
+
+    Info<< "chunk-size: " << chunkSize << nl;
+
+    if (args.size() <= 1)
+    {
+        InfoErr<< "Provide a file or files to test" << nl;
+    }
+    else
+    {
+        for (label argi=1; argi < args.size(); ++argi)
+        {
+            const auto input = args.get<fileName>(argi);
+            IFstream is(input);
+
+            while (!is.eof())
+            {
+                labelList list;
+
+                readBracketList(list, is);
+                Info<< "read: " << flatOutput(list) << endl;
+            }
+        }
+    }
+
+    return 0;
+}
+
+// ************************************************************************* //

applications/test/ListRead1/testLists1

@@ -0,0 +1,17 @@
+(
+    0 1 2 3 4 5 6 7 8 9
+    10 11 12 13 14 15 16 17 18 19
+    20 21 22 23 24 25 26 27 28 29
+    30 31 32 33 34 35 36 37 38 39
+    40 41 42 43 44 45 46 47 48 49
+)
+
+(
+    0 1 2 3 4 5 6 7 8 9
+    10 11 12 13 14 15 16 17 18 19
+    20 21 22 23 24 25 26 27 28 29
+    30 31 32 33 34 35 36 37 38 39
+    40 41 42 43 44 45 46 47 48 49
+)
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

applications/test/PtrList/Test-PtrList.C

@@ -47,43 +47,29 @@ class Scalar
 
 public:
 
-    Scalar()
-    :
-        data_(0)
-    {}
+    static bool verbose;
 
-    Scalar(scalar val)
-    :
-        data_(val)
-    {}
+    constexpr Scalar() noexcept : data_(0) {}
+    Scalar(scalar val) noexcept : data_(val) {}
 
     ~Scalar()
     {
-        Info<< "delete Scalar: " << data_ << endl;
+        if (verbose) Info<< "delete Scalar: " << data_ << endl;
     }
 
-    const scalar& value() const
-    {
-        return data_;
-    }
+    scalar value() const noexcept { return data_; }
+    scalar& value() noexcept { return data_; }
 
-    scalar& value()
-    {
-        return data_;
-    }
+    autoPtr<Scalar> clone() const { return autoPtr<Scalar>::New(data_); }
 
-    autoPtr<Scalar> clone() const
+    friend Ostream& operator<<(Ostream& os, const Scalar& item)
     {
-        return autoPtr<Scalar>::New(data_);
-    }
-
-    friend Ostream& operator<<(Ostream& os, const Scalar& val)
-    {
-        os  << val.data_;
+        os  << item.value();
         return os;
     }
 };
 
+bool Scalar::verbose = true;
 
 
 // As per
@@ -268,6 +254,22 @@ Ostream& report
 
 int main(int argc, char *argv[])
 {
+    #if 1
+    {
+        DLPtrList<Scalar> llist1;
+        Info<< "emplace_front: " << llist1.emplace_front(100) << nl;
+        Info<< "emplace_front: " << llist1.emplace_front(200) << nl;
+        Info<< "emplace_front: " << llist1.emplace_front(300) << nl;
+        Info<< "emplace_back:  " << llist1.emplace_back(500)  << nl;
+
+        Info<< "DLPtrList: " << llist1 << endl;
+
+        Scalar::verbose = false;
+        llist1.clear();
+        Scalar::verbose = true;
+    }
+    #endif
+
     #if 0
     {
         DLPtrList<Scalar> llist1;
@@ -349,6 +351,20 @@ int main(int argc, char *argv[])
         list2.emplace(i, (10 + 1.3*i));
     }
 
+    list2.release(5);
+    list2.release(10);
+
+    {
+        // Memory error (with fulldebug): const label len = (list2.size()+2);
+        const label len = list2.size();
+        Info<< "try_emplace " << len << " values" << nl;
+
+        for (label i = 0; i < len; ++i)
+        {
+            list2.try_emplace(i, (50 + 1.3*i));
+        }
+    }
+
     PtrList<Scalar> listApp;
     for (label i = 0; i < 5; ++i)
     {
@@ -639,7 +655,7 @@ int main(int argc, char *argv[])
         dynPlanes.set(6, new plane(vector(2,2,1), vector::one));
         dynPlanes.set(10, new plane(vector(4,5,6), vector::one));
 
-        Info<< "emplaced :"
+        Info<< "emplaced[12]: "
             << dynPlanes.emplace(12, vector(3,2,1), vector::one) << endl;
 
         dynPlanes.emplace_back(Zero, vector::one);

applications/test/PtrListDictionary/Test-PtrListDictionary.C

@@ -45,28 +45,29 @@ class Scalar
 
 public:
 
-    Scalar()
-    :
-        data_(0)
-    {}
+    static bool verbose;
 
-    Scalar(scalar val)
-    :
-        data_(val)
-    {}
+    constexpr Scalar() noexcept : data_(0) {}
+    Scalar(scalar val) noexcept : data_(val) {}
 
     ~Scalar()
     {
-        Info<<"delete Scalar: " << data_ << endl;
+        if (verbose) Info<< "delete Scalar: " << data_ << endl;
     }
 
-    friend Ostream& operator<<(Ostream& os, const Scalar& val)
+    const scalar& value() const noexcept { return data_; }
+    scalar& value() noexcept { return data_; }
+
+    autoPtr<Scalar> clone() const { return autoPtr<Scalar>::New(data_); }
+
+    friend Ostream& operator<<(Ostream& os, const Scalar& item)
     {
-        os  << val.data_;
+        os  << item.value();
         return os;
     }
 };
 
+bool Scalar::verbose = true;
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

applications/test/UDictionary/Test-UDictionary.C

@@ -51,10 +51,7 @@ public:
         i_(i)
     {}
 
-    const word& keyword() const
-    {
-        return keyword_;
-    }
+    const word& keyword() const noexcept { return keyword_; }
 
     friend Ostream& operator<<(Ostream& os, const ent& e)
     {
@@ -83,7 +80,7 @@ int main(int argc, char *argv[])
 
     dict.swapDown(dict.first());
 
-    forAllConstIter(UDictionary<ent>, dict, iter)
+    forAllConstIters(dict, iter)
     {
         Info<< "element : " << *iter;
     }

applications/test/autoPtr/Test-autoPtr.C

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018-2022 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -84,6 +84,20 @@ struct DerivedList : public List<T>
 };
 
 
+template<class T>
+void printInfo(const autoPtr<T>& item, const bool verbose = false)
+{
+    Info<< "autoPtr good:" << Switch::name(item.good())
+        << " addr: " << Foam::name(item.get());
+
+    if (verbose && item)
+    {
+        Info<< " content: " << item();
+    }
+    Info<< nl;
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 //  Main program:
 
@@ -112,6 +126,17 @@ int main(int argc, char *argv[])
 
         Info<<"move unique to autoPtr: " << *list3 << nl;
         Info<<"old is " << Switch(bool(list2)) << nl;
+
+        Info<< "before emplace: ";
+        printInfo(list, true);
+
+        list.emplace(4, label(-2));
+        Info<< "after emplace: ";
+        printInfo(list, true);
+
+        list.emplace(2, label(-4));
+        Info<< "after emplace: ";
+        printInfo(list, true);
     }
 
     // Confirm that forwarding with move construct actually works as expected

applications/test/charList/Test-charList.C

@@ -58,8 +58,8 @@ int main(int argc, char *argv[])
 
     #include "setRootCase.H"
 
-    Info<< "Known compound tokens: "
-        << token::compound::IstreamConstructorTablePtr_->sortedToc() << nl;
+    // Info<< "Known compound tokens: "
+    //     << token::compound::emptyConstructorTablePtr_->sortedToc() << nl;
 
     OStringStream ostr;
 
@@ -79,6 +79,13 @@ int main(int argc, char *argv[])
         List<char> alphabet(istr);
 
         Info<< "re-read: " << alphabet << nl;
+
+        // Can assign zero?
+//Fails:        alphabet = char(Zero);
+        alphabet = Foam::zero{};
+
+        // alphabet = '@';
+        Info<< "blanked: " << alphabet << nl;
     }
 
     return 0;

applications/test/compoundToken1/Make/files

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

applications/test/compoundToken1/Make/options

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

applications/test/compoundToken1/Test-compoundToken1.C

@@ -0,0 +1,307 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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
+    Test token construct assign etc.
+\*---------------------------------------------------------------------------*/
+
+#include "argList.H"
+#include "IOobject.H"
+#include "IOstreams.H"
+#include "IFstream.H"
+#include "StringStream.H"
+#include "cpuTime.H"
+#include "labelList.H"
+#include "DynamicList.H"
+
+namespace Foam
+{
+
+template<class OS>
+OS& printTypeCode(OS& os, char typeCode)
+{
+    os << int(static_cast<unsigned char>(typeCode));
+    return os;
+}
+
+
+/*---------------------------------------------------------------------------*\
+                          Class IFstream Declaration
+\*---------------------------------------------------------------------------*/
+
+bool test_pending = false;
+
+class IFstreamDelayed
+:
+    public IFstream
+{
+    virtual bool readCompoundToken(token& tok, const word& type)
+    {
+        auto& is = *this;
+
+        bool delay = true;
+
+        // Low-level: get next valid character (after comments)
+        // and branch based on it being a '{' or not
+
+        char c = 0;
+        if (is.read(c))
+        {
+            // Delay further reading?
+            delay = (c == token::BEGIN_BLOCK);
+            is.putback(c);
+
+            if (c)
+            {
+                cerr<< "nextChar:" << c << " : delay read: " << delay << nl;
+            }
+        }
+
+        // Caller already checked token::compound::isCompound(...)
+        // but use readCompoundToken anyhow for convenience
+
+        if (tok.readCompoundToken(type, is, !delay))
+        {
+            cerr<< "readCompound(" << type << ")\n";
+            cerr<< "typeCode: ";
+            printTypeCode(cerr, tok.compoundToken().typeCode()) << nl;
+
+            if (test_pending && delay)
+            {
+                InfoErr<< "pending read "
+                    << tok.compoundToken().type() << endl;
+
+                tok.refCompoundToken().pending(true);
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+
+
+public:
+
+    // Constructors
+    using IFstream::IFstream;
+
+    //- Destructor
+    ~IFstreamDelayed() = default;
+
+    // Testing deprecation warnings
+    FOAM_DEPRECATED_STRICT(2023-08, "direct calling")
+    Istream& operator()() const
+    {
+        return const_cast<IFstreamDelayed&>(*this);
+    }
+};
+
+
+} // End namespace Foam
+
+
+using namespace Foam;
+
+void populateCompound(token::compound& ct, const dictionary& dict)
+{
+    Info<< "populateCompound: " << nl;
+
+    // This is where runTime dispatch, eg based on transport type
+    // could be used...
+
+    switch (ct.typeCode())
+    {
+        #undef  fillComponents
+        #define fillComponents(Type, Variable, Value)          \
+        {                                                      \
+            ct.pending(false);                                 \
+            ct.resize(10);                                     \
+            UList<Type> Variable                               \
+            (                                                  \
+                reinterpret_cast<Type*>(ct.data_bytes()),      \
+                label(ct.size_bytes() / sizeof(Type))          \
+            );                                                 \
+            Variable = Value;                                  \
+        }
+
+        case token::tokenType::PUNCTUATION :
+        {
+            fillComponents(char, cmpts, '@');
+        }
+        break;
+
+        case token::tokenType::BOOL :
+        {
+            fillComponents(bool, cmpts, false);
+        }
+        break;
+
+        case token::tokenType::LABEL :
+        {
+            fillComponents(label, cmpts, 123);
+        }
+        break;
+
+        case token::tokenType::FLOAT :
+        {
+            fillComponents(float, cmpts, 2.7);
+        }
+        break;
+
+        case token::tokenType::DOUBLE :
+        {
+            fillComponents(double, cmpts, 3.1415);
+        }
+        break;
+
+        default:
+            break;
+
+        #undef fillComponents
+    }
+
+    if (!ct.pending())
+    {
+        Info<< "assigned values:" << endl;
+    }
+}
+
+
+void rewriteCompounds(ITstream& is)
+{
+    Info<< "rewrite: " << flatOutput(is) << endl;
+
+    for (label toki = 0; toki < is.size(); ++toki)
+    {
+        if (is[toki].isCompound() && is[toki].compoundToken().pending())
+        {
+            Info<< "replace : " << is[toki].info() << endl;
+
+            if (is.peekToken(toki+1).isPunctuation(token::BEGIN_BLOCK))
+            {
+                labelRange slice
+                (
+                    is.find(token::BEGIN_BLOCK, token::END_BLOCK, toki+1)
+                );
+
+                if (slice.good() && (slice.start() == toki+1))
+                {
+                    Info<< "Compound at:" << toki
+                        << " dict:" << slice << endl;
+
+                    ITstream substream(is.extract(slice));
+
+                    dictionary dict(substream);
+
+                    populateCompound(is[toki].refCompoundToken(), dict);
+                }
+            }
+        }
+    }
+}
+
+
+void rewriteDict(dictionary& dict)
+{
+    for (entry& e : dict)
+    {
+        if (e.isDict())
+        {
+            rewriteDict(e.dict());
+        }
+        else if (e.isStream())
+        {
+            rewriteCompounds(e.stream());
+        }
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+//  Main program:
+
+int main(int argc, char *argv[])
+{
+    argList::noBanner();
+    argList::noParallel();
+    argList::addBoolOption("std", "standard reading (no delayed compounds)");
+    argList::addBoolOption("pending", "read with pending");
+
+    argList args(argc, argv, false, true);
+
+    Info<< "typeCodes:" << nl;
+    Info<< "    bool=";
+    printTypeCode(Info, token::tokenType::BOOL) << nl;
+    Info<< "    label=";
+    printTypeCode(Info, token::tokenType::LABEL) << nl;
+    Info<< "    float=";
+    printTypeCode(Info, token::tokenType::FLOAT) << nl;
+    Info<< "    double=";
+    printTypeCode(Info, token::tokenType::DOUBLE) << nl;
+    Info<< nl;
+
+    if (args.found("pending"))
+    {
+        test_pending = true;
+    }
+
+    if (args.found("std"))
+    {
+        for (label argi = 1; argi < args.size(); ++argi)
+        {
+            Info<< "Read: " << args[argi] << endl;
+            IFstream is(args[argi]);
+
+            dictionary dict(is);
+
+            Info<< "read: " << dict << nl;
+        }
+    }
+    else
+    {
+        for (label argi = 1; argi < args.size(); ++argi)
+        {
+            Info<< "Read delay: " << args[argi] << endl;
+
+            IFstreamDelayed is(args[argi]);
+
+            // Trigger strict warning?
+            Info<< "stream: " << is().name() << nl;
+
+            dictionary dict(is);
+            Info<< "read: " << dict << nl;
+
+            rewriteDict(dict);
+
+            Info<< "modified: " << dict << nl;
+        }
+    }
+
+    return 0;
+}
+
+
+// ************************************************************************* //

applications/test/compoundToken1/testDict1

@@ -0,0 +1,24 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2312                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      dictionary;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+internalField   uniform 1;
+
+temperature  List<scalar> 10(270 271 272 273 274 275 276 277 278 279);
+
+pressure 1e5;
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

applications/test/compoundToken1/testDict2

@@ -0,0 +1,65 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2312                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      dictionary;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+internalField   uniform 1;
+
+// Regular syntax
+valuesT  List<scalar> (123 456 890);
+
+// Test some non-standard syntax
+temperature  List<scalar>
+{
+    transport adios;
+    length    10;
+    values    (270 271 272 273 274 275 276 277 278 279);
+};
+
+// Test some non-standard syntax
+velocity  List<vector>
+{
+    transport adios;
+    length    10;
+    values    (270 271 272 273 274 275 276 277 278 279);
+};
+
+// Test some non-standard syntax
+isGood  List<bool>
+{
+    transport adios;
+    length    10;
+    values    (true false true);
+};
+
+// Test some non-standard syntax
+master  List<label>
+{
+    transport adios;
+    length    10;
+    values    (0 100 35 50);
+};
+
+// Test some non-standard syntax
+edges  List<edge>
+{
+    transport adios;
+    length    10;
+    values    ((0 1) (2 1));
+};
+
+pressure 1e5;
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

applications/test/coordinateSystem/Test-coordinateSystem.C

@@ -61,7 +61,7 @@ void basicTests(const coordinateSystem& cs)
 
     if (const auto* cartptr = isA<coordSystem::cartesian>(cs))
     {
-        if (!cartptr->valid())
+        if (!cartptr->good())
         {
             Info<< "invalid cartesian = " << (*cartptr)
                 << " with: " << (*cartptr).R() << nl;

applications/test/exprTraits/Test-exprTraits.C

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2021 OpenCFD Ltd.
+    Copyright (C) 2021-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
@@ -17,8 +17,9 @@ Description
 
 #include "IOstreams.H"
 #include "ITstream.H"
-#include "exprTraits.H"
 #include "uLabel.H"
+
+#include "exprTraits.H"
 #include "error.H"
 #include "stringList.H"
 #include "exprScanToken.H"
@@ -27,16 +28,18 @@ using namespace Foam;
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-template<class T>
+template<class Type>
 void printTraits()
 {
-    const auto typeCode = exprTypeTraits<T>::value;
+    const auto typeCode = exprTypeTraits<Type>::value;
 
-    Info<< "type " << pTraits<T>::typeName
-        << " code:" << int(typeCode)
-        << " name:" << exprTypeTraits<T>::name;
+    Info<< "Type '" << pTraits<Type>::typeName
+        << "' = code:" << int(typeCode)
+        << " rank:" << exprTypeTraits<Type>::rank
+        << " cmpt:" << exprTypeTraits<Type>::nComponents
+        << " name:" << exprTypeTraits<Type>::name;
 
-    if (pTraits<T>::typeName != word(exprTypeTraits<T>::name))
+    if (pTraits<Type>::typeName != word(exprTypeTraits<Type>::name))
     {
         Info<< " (UNSUPPORTED)";
     }
@@ -45,6 +48,17 @@ void printTraits()
 }
 
 
+void print(const expressions::scanToken& tok)
+{
+    Info<< "    type:" << int(tok.type_);
+    if (tok.is_pointer())
+    {
+        Info<< " ptr:" << Foam::name(tok.name_);
+    }
+    Info<< nl;
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 int main()
@@ -56,6 +70,7 @@ int main()
     printTraits<bool>();
     printTraits<label>();
     printTraits<scalar>();
+    printTraits<complex>();
     printTraits<vector>();
     printTraits<tensor>();
     printTraits<symmTensor>();
@@ -71,33 +86,27 @@ int main()
     Info<< "Name of typeCode: "
         << getName(expressions::valueTypeCode::type_bool) << nl;
 
-
     {
-        expressions::scanToken tok;
-        expressions::scanToken tok2;
+        expressions::scanToken tok(expressions::scanToken::null());
+        expressions::scanToken tok2(expressions::scanToken::null());
 
         Info<< nl << "sizeof(scanToken): "
             << sizeof(tok) << nl;
 
-        Info<< "    type:" << int(tok.type_) << nl;
-        Info<< "    ptr:" << Foam::name(tok.name_) << nl;
-
-        Info<< "    type:" << int(tok2.type_) << nl;
-        Info<< "    ptr:" << Foam::name(tok2.name_) << nl;
+        print(tok);
+        print(tok2);
 
         tok.setWord("hello");
 
-        Info<< "    type:" << int(tok.type_) << nl;
-        Info<< "    ptr:" << Foam::name(tok.name_) << nl;
+        print(tok);
 
         tok2 = tok;
-        Info<< "    type:" << int(tok2.type_) << nl;
-        Info<< "    ptr:" << Foam::name(tok2.name_) << nl;
+        print(tok2);
 
         tok2.destroy();
 
-        Info<< "    type:" << int(tok2.type_) << nl;
-        Info<< "    ptr:" << Foam::name(tok2.name_) << nl;
+        print(tok);  // Not a leak, but old rubbish
+        print(tok2);
     }
 
     Info<< nl << "Done" << nl;

applications/test/exprValue/Make/files

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

applications/test/exprValue/Make/options

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

applications/test/exprValue/Test-exprValue.C

@@ -0,0 +1,141 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2021-2023 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
+
+Application
+    Test-exprValue
+
+Description
+    Test low-level polymorphic value container (exprValue)
+
+\*---------------------------------------------------------------------------*/
+
+#include "argList.H"
+#include "IOstreams.H"
+#include "ITstream.H"
+#include "exprValue.H"
+
+using namespace Foam;
+
+void printInfo(const expressions::exprValue& val)
+{
+    Info<< "Boxed type:" << int(val.typeCode())
+        << " (" << val.valueTypeName() << ") good:"
+        << val.good() << " => " << val << nl;
+}
+
+
+expressions::exprValue tryParse(const std::string& str)
+{
+    expressions::exprValue val, val2;
+
+    ITstream is(str);
+
+    const bool ok = val.read(is);
+
+    Info<< "read " << Foam::name(val.typeCode()) << " from " << str;
+
+    if (ok)
+    {
+        Info<< " trailing tokens:" << is.nRemainingTokens() << nl
+            << "value: " << val << nl;
+    }
+    else
+    {
+        Info<< " FAILED" << nl;
+    }
+
+    if (ok)
+    {
+        Info<< "Direct from string: ";
+        if (expressions::exprValue::read(str, val2))
+        {
+            Info<< "good" << nl;
+        }
+        else
+        {
+            Info<< "bad" << nl;
+        }
+    }
+    return val;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+int main(int argc, char *argv[])
+{
+    argList::noBanner();
+    argList::noParallel();
+
+    #include "setRootCase.H"
+
+    // Aborts
+    // expressions::exprValue value(std::string(""));
+
+    {
+        expressions::exprValue value;
+
+        // Nothing
+        printInfo(value);
+
+        value.set(scalar(100));
+        printInfo(value);
+
+        value.set(vector(1,2,3));
+        printInfo(value);
+
+        value = vector(4,5,6);
+        printInfo(value);
+
+        value = Zero;
+        printInfo(value);
+
+        value.clear();
+        printInfo(value);
+
+        value = 100 * vector(1,0,0);
+        printInfo(value);
+    }
+
+
+    {
+        Info<< nl << "Test parsing" << nl << nl;
+
+        for
+        (
+            const auto& input :
+            stringList
+            ({
+                "()",  // bad
+                "( 1 2  ",  // also bad
+                "(  ",  // really bad
+                "(1 16 12)",
+                "(1 bad)",
+                "(5)",
+                "1.2345",
+                "5.678 trailing",
+                "true",
+                "false",
+                " 1 ",
+                "  yes no "
+            })
+        )
+        {
+            (void) tryParse(input);
+        }
+    }
+
+    return 0;
+}
+
+
+// ************************************************************************* //

applications/test/fileNameOS/Test-fileNameOS.C

@@ -38,7 +38,6 @@ Description
 #include "OSspecific.H"
 #include "Switch.H"
 
-#include <csignal>
 #include <cstdlib>
 #include <iostream>
 

applications/test/foamToEnsight-check/foamToEnsight-check.C

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2022 OpenCFD Ltd.
+    Copyright (C) 2022-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -139,7 +139,7 @@ void printInfo(const ensightMesh& mesh, int verbose = 0)
     FixedList<label, 3> cellStats(Zero);
     FixedList<label, 3> faceStats(Zero);
 
-    for (const auto& iter : mesh.cellZoneParts().sorted())
+    for (const auto& iter : mesh.cellZoneParts().csorted())
     {
         FixedList<label, 3> stats = printPartInfo(iter.val(), verbose);
 
@@ -149,7 +149,7 @@ void printInfo(const ensightMesh& mesh, int verbose = 0)
         }
     }
 
-    for (const auto& iter : mesh.faceZoneParts().sorted())
+    for (const auto& iter : mesh.faceZoneParts().csorted())
     {
         FixedList<label, 3> stats = printPartInfo(iter.val(), verbose);
 
@@ -159,7 +159,7 @@ void printInfo(const ensightMesh& mesh, int verbose = 0)
         }
     }
 
-    for (const auto& iter : mesh.boundaryParts().sorted())
+    for (const auto& iter : mesh.boundaryParts().csorted())
     {
         FixedList<label, 3> stats = printPartInfo(iter.val(), verbose);
 

applications/test/globalIndex/Test-globalIndex.C

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

applications/test/gravityMeshObject/Test-gravityMeshObject.C

@@ -57,7 +57,7 @@ int main(int argc, char *argv[])
 
     Info<< "Found: " << objects << nl << endl;
 
-    for (const IOobject& io : objects.sorted<uniformDimensionedVectorField>())
+    for (const IOobject& io : objects.csorted<uniformDimensionedVectorField>())
     {
         if (io.name() == meshObjects::gravity::typeName)
         {

applications/test/objectRegistry/Test-objectRegistry.C

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2016-2022 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -78,8 +78,8 @@ void printRegistry
     Foam::label indent
 )
 {
-    UPtrList<const regIOobject> objects(obr.sorted());
-    wordList regNames(obr.sortedNames<objectRegistry>());
+    const UPtrList<const regIOobject> objects(obr.csorted());
+    const wordList regNames(obr.sortedNames<objectRegistry>());
 
     std::string prefix;
     for (label i=indent; i; --i)

applications/test/objectRegistry2/Test-objectRegistry2.C

@@ -145,8 +145,8 @@ void printRegistry
     Foam::label indent
 )
 {
-    UPtrList<const regIOobject> objects(obr.sorted());
-    wordList regNames(obr.sortedNames<objectRegistry>());
+    const UPtrList<const regIOobject> objects(obr.csorted());
+    const wordList regNames(obr.sortedNames<objectRegistry>());
 
     std::string prefix;
     for (label i=indent; i; --i)
@@ -315,7 +315,7 @@ int main(int argc, char *argv[])
 
         registryTests(mesh);
 
-        report(mesh.sorted<const volScalarField>());
+        report(mesh.csorted<volScalarField>());
         report(mesh.csorted<volVectorField>());
 
         Info<< nl;

applications/test/pTraits/Test-pTraits.C

@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -29,9 +30,12 @@ Description
 
 #include "IOstreams.H"
 #include "pTraits.H"
+#include "contiguous.H"
+#include "boolVector.H"  // A FixedList pretending to be a vector
 #include "vector.H"
 #include "tensor.H"
 #include "uLabel.H"
+#include "Switch.H"
 
 #include <type_traits>
 
@@ -40,14 +44,72 @@ using namespace Foam;
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 // Main program:
 
+//- Test if Type has typeName member
+template<class T, class = void>
+struct has_typeName : std::false_type {};
+
+//- Test if Type has typeName member
+
+template<class T>
+struct has_typeName<T, stdFoam::void_t<decltype(pTraits<T>::typeName)>>
+:
+    std::true_type
+{};
+
+
+template<class T>
+typename std::enable_if<has_typeName<T>::value, void>::type
+printTypeName()
+{
+    Info<< pTraits<T>::typeName;
+}
+
+template<class T>
+typename std::enable_if<!has_typeName<T>::value, void>::type
+printTypeName()
+{
+    Info<< typeid(T).name();
+}
+
+
+template<class T, class = void>
+struct has_zero_one : std::false_type {};
+
+template<class T>
+struct has_zero_one
+<
+    T,
+    stdFoam::void_t<decltype(pTraits<T>::zero), decltype(pTraits<T>::one)>
+> : std::true_type {};
+
+
+template<class T>
+typename std::enable_if<has_zero_one<T>::value, void>::type
+printMinMaxRange()
+{
+    Info<< " zero=" << pTraits<T>::zero
+        << " one=" << pTraits<T>::one;
+}
+
+template<class T>
+typename std::enable_if<!has_zero_one<T>::value, void>::type
+printMinMaxRange()
+{}
+
+
 template<class T>
 void printTraits()
 {
-    Info<< pTraits<T>::typeName
-        << ": zero=" << pTraits<T>::zero
-        << " one=" << pTraits<T>::one
-        << " integral=" << std::is_integral<T>::value
+    printTypeName<T>();
+    printMinMaxRange<T>();
+
+    Info<< " integral=" << std::is_integral<T>::value
         << " floating=" << std::is_floating_point<T>::value
+        << " rank=" << pTraits_rank<T>::value
+        << " nComponents=" << pTraits_nComponents<T>::value
+        << " vector-space=" << Switch::name(is_vectorspace<T>::value)
+        << " is_label=" << Switch::name(is_contiguous_label<T>::value)
+        << " is_scalar=" << Switch::name(is_contiguous_scalar<T>::value)
         << endl;
 }
 
@@ -69,6 +131,9 @@ int main()
     printTraits<scalar>();
     printTraits<vector>();
     printTraits<tensor>();
+    printTraits<boolVector>();
+    printTraits<word>();
+    printTraits<std::string>();
 
     {
         pTraits<bool> b(true);

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

@@ -39,6 +39,7 @@ Description
 #include "Tuple2.H"
 #include "IOstreams.H"
 #include "PstreamReduceOps.H"
+#include "bitSet.H"
 
 using namespace Foam;
 
@@ -87,7 +88,10 @@ int main(int argc, char *argv[])
 
     // Reductions (using MPI intrinsics)
     {
-        label val = Pstream::myProcNo(UPstream::commWorld());
+        const label myRank = UPstream::myProcNo(UPstream::commWorld());
+        const label nProcs = UPstream::nProcs(UPstream::commWorld());
+
+        label val = myRank;
 
         label worldVal = returnReduce
         (
@@ -108,6 +112,52 @@ int main(int argc, char *argv[])
         Pout<< "value " << val
             << " (world) reduced " << worldVal
             << " (self) reduced " << selfVal << nl;
+
+        // Identical size on all procs
+        bitSet procUsed(nProcs);
+
+        if ((myRank % 4) == 0)
+        {
+            procUsed.set(myRank);
+        }
+
+        Pout<< "local  procUsed " << procUsed << nl;
+        reduce
+        (
+            procUsed.data(),
+            procUsed.size_data(),
+            bitOrOp<unsigned int>()
+        );
+        Pout<< "reduce procUsed " << procUsed << nl;
+
+        // Identical size on all procs
+        // encode as 0:empty, 1:uniform, 2:nonuniform, 3:mixed
+        PackedList<2> uniformity(10);
+
+        if ((myRank % 2) == 0)
+        {
+            // Every second is uniform
+            uniformity.set(2, 1);
+            uniformity.set(4, 1);
+            uniformity.set(6, 1);
+            uniformity.set(8, 1);
+        }
+        else if ((myRank % 3) == 0)
+        {
+            // Every third is nonuniform
+            uniformity.set(3, 2);
+            uniformity.set(6, 2);
+            uniformity.set(9, 2);
+        }
+
+        Pout<< "local  uniform " << uniformity << nl;
+        reduce
+        (
+            uniformity.data(),
+            uniformity.size_data(),
+            bitOrOp<unsigned int>()
+        );
+        Pout<< "reduce uniform " << uniformity << nl;
     }
 
     // Reductions (not using MPI intrinsics)

applications/test/parallel-waitSome/Make/files

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

applications/test/parallel-waitSome/Make/options

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

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

@@ -0,0 +1,328 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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/>.
+
+Application
+    Test-parallel-waitSome
+
+Description
+    Test polling versus wait-all for processing receive data.
+    Will not see much difference between -wait-all and -no-polling though
+    since the master doesn't have enough other work.
+
+\*---------------------------------------------------------------------------*/
+
+#include "List.H"
+#include "argList.H"
+#include "Time.H"
+#include "IPstream.H"
+#include "OPstream.H"
+#include "IOstreams.H"
+#include "Switch.H"
+#include "clockTime.H"
+
+using namespace Foam;
+
+
+// The 'classic' waiting receive, but also only waiting for recv request
+template<class Type>
+void waitingReceive
+(
+    const labelRange& recvRequests,
+    const List<List<Type>>& recvBuffers,
+    const bool waitAll = false
+)
+{
+    clockTime waitTiming;
+
+    if (waitAll)
+    {
+        // Wait for send and recv (assumes recv followed by send)
+        UPstream::waitRequests(recvRequests.start(), -1);
+    }
+    else
+    {
+        // Wait for receives only
+        UPstream::waitRequests(recvRequests.start(), recvRequests.size());
+    }
+
+    double waited = waitTiming.timeIncrement();
+    if (waited > 1e-3)
+    {
+        Pout<< "waited: " << waited << " before processing" << endl;
+    }
+
+    forAll(recvBuffers, proci)
+    {
+        const auto& slice = recvBuffers[proci];
+
+        if (!slice.empty())
+        {
+            // Process data from proci
+            Pout<< "proc:" << proci
+                << ' ' << flatOutput(slice) << nl;
+        }
+    }
+}
+
+
+// Polling receive
+template<class Type>
+void pollingReceive
+(
+    const labelRange& recvRequests,
+    const UList<int>& recvProcs,
+    const List<List<Type>>& recvBuffers
+)
+{
+    clockTime waitTiming;
+
+    DynamicList<int> indices(recvRequests.size());
+
+    if (!recvRequests.empty()) Pout<< "..." << endl;
+
+    for
+    (
+        label loop = 0;
+        UPstream::waitSomeRequests
+        (
+            recvRequests.start(),
+            recvRequests.size(),
+            &indices
+        );
+        ++loop
+    )
+    {
+        double waited = waitTiming.timeIncrement();
+        if (waited <= 1e-3)
+        {
+            waited = 0;
+        }
+        Pout<< "loop:" << loop
+            << " waited: " << waited
+            << " before processing" << endl;
+
+        for (const int idx : indices)
+        {
+            const int proci = recvProcs[idx];
+            const auto& slice = recvBuffers[proci];
+
+            // Process data from proci
+            Pout<< "loop:" << loop << " polled:" << indices.size()
+                << " proc:" << proci
+                << ' ' << flatOutput(slice) << endl;
+        }
+        Pout<< "..." << endl;
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+int main(int argc, char *argv[])
+{
+    argList::noCheckProcessorDirectories();
+    argList::addVerboseOption("timings etc");
+    argList::addBoolOption("no-polling", "wait all instead of polling");
+    argList::addBoolOption("wait-all", "wait all instead of polling");
+    argList::addOption("sleep", "s", "change sleep (default: 5)");
+    argList::noCheckProcessorDirectories();
+
+    const label transferSize = 10;
+    label sleepSeconds = 5;
+
+    #include "setRootCase.H"
+
+    args.readIfPresent("sleep", sleepSeconds);
+    const bool waitAll = args.found("wait-all");
+    const bool nonPolling = args.found("no-polling");
+
+    if (!Pstream::parRun())
+    {
+        Info<< "\nWarning: not parallel - skipping further tests\n" << endl;
+        return 0;
+    }
+
+    Info<< "Calling with sleep=" << sleepSeconds
+        << ", polling=" << Switch::name(!nonPolling)
+        << ", wait-all=" << Switch::name(waitAll) << nl;
+
+    labelList sendBuffer;
+    List<labelList> recvBuffers;
+
+    if (UPstream::master())
+    {
+        recvBuffers.resize(UPstream::nProcs());
+    }
+    else
+    {
+        recvBuffers.resize(1);
+    }
+
+    clockTime timing;
+
+    const label startOfRequests = UPstream::nRequests();
+
+    // Setup receives
+    labelRange recvRequests(UPstream::nRequests(), 0);
+    DynamicList<int> recvProcs(UPstream::nProcs());
+
+    if (UPstream::master())
+    {
+        for (const int proci : UPstream::subProcs())
+        {
+            // The rank corresponding to the request
+            recvProcs.push_back(proci);
+            auto& slice = recvBuffers[proci];
+            slice.resize_nocopy(transferSize);
+
+            UIPstream::read
+            (
+                UPstream::commsTypes::nonBlocking,
+                proci,
+                slice
+            );
+        }
+    }
+    else
+    {
+        const int proci = UPstream::masterNo();
+
+        if ((UPstream::myProcNo() % 2) == 0)
+        {
+            recvProcs.push_back(proci);
+            auto& slice = recvBuffers[proci];
+            slice.resize_nocopy(transferSize);
+
+            UIPstream::read
+            (
+                UPstream::commsTypes::nonBlocking,
+                proci,
+                slice
+            );
+        }
+    }
+    // OR: recvRequests.size() = (UPstream::nRequests() - recvRequests.start());
+    recvRequests += recvProcs.size();
+
+
+    labelList overallRecvRequests
+    (
+        UPstream::listGatherValues<label>(recvRequests.size())
+    );
+
+    Info<< "Number of recv requests: "
+        << flatOutput(overallRecvRequests) << nl << nl;
+
+
+    // Setup sends
+    sendBuffer.resize_nocopy(transferSize);
+    sendBuffer = UPstream::myProcNo();
+
+    const auto startBufferSend = [&]() -> void
+    {
+        if (sleepSeconds > 0)
+        {
+            // Dispatch some immediately, others with a delay
+            if ((UPstream::myProcNo() % 2) == 0)
+            {
+                sleep(sleepSeconds);
+            }
+            else if ((UPstream::myProcNo() % 3) == 0)
+            {
+                sleep(1.5*sleepSeconds);
+            }
+        }
+
+        UOPstream::write
+        (
+            UPstream::commsTypes::nonBlocking,
+            UPstream::masterNo(),
+            sendBuffer
+        );
+    };
+
+
+    if (UPstream::master())
+    {
+        for (const int proci : UPstream::subProcs())
+        {
+            if ((UPstream::myProcNo() % 2) == 0)
+            {
+                UOPstream::write
+                (
+                    UPstream::commsTypes::nonBlocking,
+                    proci,
+                    sendBuffer
+                );
+            }
+        }
+    }
+    else if (waitAll)
+    {
+        startBufferSend();
+    }
+
+
+    // Some skulduggery to get a differential in timings...
+
+    const int nloops = (UPstream::master() ? 1 : 2);
+
+    for (int loopi = 0; loopi < nloops; ++loopi)
+    {
+        if (waitAll || nonPolling)
+        {
+            waitingReceive(recvRequests, recvBuffers, waitAll);
+        }
+        else
+        {
+            pollingReceive(recvRequests, recvProcs, recvBuffers);
+        }
+
+        // Timing for processing all the receives
+        if (args.verbose())
+        {
+            Pout<< "receive: " << timing.timeIncrement() << 's' << endl;
+        }
+
+        if (!UPstream::master() && loopi == 0 && !waitAll)
+        {
+            startBufferSend();
+        }
+    }
+
+    if (args.verbose())
+    {
+        Pout<< "timing: " << timing.elapsedTime() << 's' << endl;
+    }
+
+    // Final
+    UPstream::waitRequests(startOfRequests);
+
+    Info<< "End\n" << endl;
+    return 0;
+}
+
+
+// ************************************************************************* //

applications/test/refPtr/Test-refPtr.C

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2020-2022 OpenCFD Ltd.
+    Copyright (C) 2020-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
@@ -105,12 +105,21 @@ int main()
         Info<< nl << "Construct from reference" << nl;
 
         scalarField f2(10, Foam::sqrt(2.0));
-        printInfo(refPtr<scalarField>(f2), true);
+        refPtr<scalarField> tfld2(f2);
+        printInfo(tfld2, true);
+
+        Info<< nl << "emplaced:"<< nl;
+        tfld2.emplace(25, scalar(1));
+        printInfo(tfld2, true);
     }
 
     {
         Info<< nl << "Construct from New (is_pointer)" << nl;
-        auto tfld1 = refPtr<scalarField>::New(10, scalar(1));
+        auto tfld1 = refPtr<scalarField>::New(10, scalar(-1));
+        printInfo(tfld1, true);
+
+        Info<< nl << "emplaced:"<< nl;
+        tfld1.emplace(15, scalar(1));
         printInfo(tfld1, true);
 
         Info<< nl << "Dereferenced: " << *tfld1 << nl;

applications/test/tmp/Test-tmp.C

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018-2021 OpenCFD Ltd.
+    Copyright (C) 2018-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
@@ -78,7 +78,10 @@ int main()
     }
 
     {
-        auto tfld1 = tmp<scalarField>::New(20, Zero);
+        auto tfld1 = tmp<scalarField>::New(10, Zero);
+        printInfo(tfld1, true);
+
+        tfld1.emplace(20, Zero);
         printInfo(tfld1, true);
 
         // Hold on to the old content for a bit

applications/test/token/Test-token.C

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2017-2020 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -34,6 +34,7 @@ Description
 #include "StringStream.H"
 #include "cpuTime.H"
 #include "labelList.H"
+#include "scalarList.H"
 #include "DynamicList.H"
 
 using namespace Foam;
@@ -49,7 +50,7 @@ int main(int argc, char *argv[])
     argList args(argc, argv, false, true);
 
     token tok1;
-    Info<< "construct null: " << tok1.info() << endl;
+    Info<< "default construct: " << tok1.info() << endl;
 
     tok1 = double(3.14159);
     Info<< "assign double: " << tok1.info() << endl;
@@ -81,7 +82,8 @@ int main(int argc, char *argv[])
 
         token ctok1(new token::Compound<labelList>(identity(10)));
 
-        Info<< "compound token: " << ctok1.info() << nl << ctok1 << endl;
+        Info<< "compound from pointer: "
+            << ctok1.info() << nl << ctok1 << endl;
     }
 
     {
@@ -94,26 +96,155 @@ int main(int argc, char *argv[])
 
         token ctok1(ptr.release());  // release() not get()!
 
-        Info<< "compound token: " << ctok1.info() << nl << ctok1 << endl;
+        Info<< "compound from autoPtr: "
+            << ctok1.info() << nl << ctok1 << endl;
     }
 
-    #if 0
     {
-        // This version will segfault.
-        // The implicit pointer cast from autoPtr to pointer wracks havoc
-
-        autoPtr<token::Compound<labelList>> ptr
+        // Construct from pointer
+        autoPtr<token::compound> ptr
         (
-            new token::Compound<labelList>(identity(10))
+            token::compound::New("List<label>")
         );
 
-        token ctok1(ptr);
+        token ctok1(ptr.release());  // release() not get()!
 
-        Info<< "compound token: " << ctok1.info() << nl << ctok1 << endl;
+        Info<< "compound from New (via pointer): "
+            << ctok1.info() << nl << ctok1 << endl;
+    }
+
+    {
+        // Construct from autoPtr
+        autoPtr<token::compound> ptr
+        (
+            token::Compound<scalarList>::New(10, 1.0)
+        );
+
+        token ctok1(std::move(ptr));
+        Info<< "compound from autoPtr: "
+            << ctok1.info() << nl << ctok1 << endl;
+
+        // Shrink
+        ctok1.refCompoundToken().resize(5);
+
+        Info<< "resized: "
+            << ctok1.info() << nl << ctok1 << endl;
+
+        const scalarList* listptr = ctok1.compoundToken().isA<scalarList>();
+        if (listptr)
+        {
+            for (scalar& val : const_cast<scalarList&>(*listptr))
+            {
+                val *= 5;
+            }
+
+            Info<< "multiplied List<scalar>: "
+                << ctok1.info() << nl << ctok1 << endl;
+        }
+
+        listptr = ctok1.isCompound<scalarList>();
+        if (listptr)
+        {
+            for (scalar& val : const_cast<scalarList&>(*listptr))
+            {
+                val /= 2;
+            }
+
+            Info<< "divided List<scalar>: "
+                << ctok1.info() << nl << ctok1 << endl;
+        }
+
+        const labelList* listptr2 = ctok1.isCompound<labelList>();
+        if (listptr2)
+        {
+            for (label& val : const_cast<labelList&>(*listptr2))
+            {
+                val /= 2;
+            }
+
+            Info<< "divided List<label>: "
+                << ctok1.info() << nl << ctok1 << endl;
+        }
+        else
+        {
+            Info<< "compound is not List<label>" << nl;
+        }
+
+        Info<< "Before fill_zero: " << ctok1 << endl;
+
+        ctok1.refCompoundToken().fill_zero();
+
+        Info<< "After fill_zero: " << ctok1 << endl;
+
+
+        if (ctok1.isCompound())
+        {
+            auto& ct = ctok1.refCompoundToken();
+
+            ct.resize(20);
+            bool handled = true;
+
+            switch (ct.typeCode())
+            {
+                case token::tokenType::BOOL :
+                {
+                    UList<bool> cmpts
+                    (
+                        reinterpret_cast<bool*>(ct.data_bytes()),
+                        label(ct.size_bytes() / sizeof(bool))
+                    );
+                    cmpts = false;
+                }
+                break;
+
+                case token::tokenType::LABEL :
+                {
+                    UList<label> cmpts
+                    (
+                        reinterpret_cast<label*>(ct.data_bytes()),
+                        label(ct.size_bytes() / sizeof(label))
+                    );
+                    cmpts = 123;
+                }
+                break;
+
+                case token::tokenType::FLOAT :
+                {
+                    UList<float> cmpts
+                    (
+                        reinterpret_cast<float*>(ct.data_bytes()),
+                        label(ct.size_bytes() / sizeof(float))
+                    );
+                    cmpts = 2.7;
+                }
+                break;
+
+                case token::tokenType::DOUBLE :
+                {
+                    UList<double> cmpts
+                    (
+                        reinterpret_cast<double*>(ct.data_bytes()),
+                        label(ct.size_bytes() / sizeof(double))
+                    );
+                    cmpts = 3.1415;
+                }
+                break;
+
+                default:
+                    handled = false;
+                    break;
+            }
+
+
+            if (handled)
+            {
+                Info<< "assigned: " << ctok1 << nl;
+            }
+        }
     }
-    #endif
 
     return 0;
 }
 
+
 // ************************************************************************* //

applications/utilities/finiteArea/makeFaMesh/checkPatchTopology.H

@@ -30,12 +30,7 @@ Input
 
     const labelList patchIDs
     (
-        pbm.patchSet
-        (
-            polyPatchNames,
-            false,  // warnNotFound
-            true    // useGroups
-        ).sortedToc()
+        pbm.indices(polyPatchNames, true)  // useGroups
     );
 
     label nFaceLabels = 0;

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

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2016-2022 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -131,40 +131,56 @@ void modifyOrAddFace
 
 
 template<class Type>
-void subsetVolFields
+PtrList<GeometricField<Type, fvPatchField, volMesh>> subsetVolFields
 (
     const fvMeshSubset& subsetter,
     const IOobjectList& objects,
     const label patchi,
-    const Type& exposedValue,
-    PtrList<GeometricField<Type, fvPatchField, volMesh>>& subFields
+    const Type& exposedValue
 )
 {
     typedef GeometricField<Type, fvPatchField, volMesh> GeoField;
 
     const fvMesh& baseMesh = subsetter.baseMesh();
 
+    const UPtrList<const IOobject> fieldObjects
+    (
+        objects.csorted<GeoField>()
+    );
+
+    PtrList<GeoField> subFields(fieldObjects.size());
+
     label nFields = 0;
-
-    for (const word& fieldName : objects.sortedNames<GeoField>())
+    for (const IOobject& io : fieldObjects)
     {
-        const IOobject* ioptr = objects.findObject(fieldName);
-
         if (!nFields)
         {
-            Info<< "Subsetting " << GeoField::typeName << nl;
+            Info<< "Subsetting " << GeoField::typeName << " (";
         }
-        Info<< "    " << fieldName << endl;
+        else
+        {
+            Info<< ' ';
+        }
+        Info<< "    " << io.name() << endl;
 
-        GeoField origField(*ioptr, baseMesh);
+        // Read unregistered
+        IOobject rio(io, IOobjectOption::NO_REGISTER);
+        GeoField origField(rio, baseMesh);
 
         subFields.set(nFields, subsetter.interpolate(origField));
+        auto& subField = subFields[nFields];
+        ++nFields;
+
+
+        // Subsetting adds 'subset' prefix. Rename field to be like original.
+        subField.rename(io.name());
+        subField.writeOpt(IOobjectOption::AUTO_WRITE);
+
 
         // Explicitly set exposed faces (in patchi) to exposedValue.
         if (patchi >= 0)
         {
-            fvPatchField<Type>& fld =
-                subFields[nFields].boundaryFieldRef()[patchi];
+            fvPatchField<Type>& fld = subField.boundaryFieldRef()[patchi];
 
             const label newStart = fld.patch().patch().start();
             const label oldPatchi = subsetter.patchMap()[patchi];
@@ -195,48 +211,68 @@ void subsetVolFields
                     }
                 }
             }
-
-            ++nFields;
         }
     }
+
+    if (nFields)
+    {
+        Info<< ')' << nl;
+    }
+
+    return subFields;
 }
 
 
 template<class Type>
-void subsetSurfaceFields
+PtrList<GeometricField<Type, fvsPatchField, surfaceMesh>> subsetSurfaceFields
 (
     const fvMeshSubset& subsetter,
     const IOobjectList& objects,
     const label patchi,
-    const Type& exposedValue,
-    PtrList<GeometricField<Type, fvsPatchField, surfaceMesh>>& subFields
+    const Type& exposedValue
 )
 {
     typedef GeometricField<Type, fvsPatchField, surfaceMesh> GeoField;
 
     const fvMesh& baseMesh = subsetter.baseMesh();
 
+    const UPtrList<const IOobject> fieldObjects
+    (
+        objects.csorted<GeoField>()
+    );
+
+    PtrList<GeoField> subFields(fieldObjects.size());
+
     label nFields = 0;
-
-    for (const word& fieldName : objects.sortedNames<GeoField>())
+    for (const IOobject& io : fieldObjects)
     {
-        const IOobject* ioptr = objects.findObject(fieldName);
-
         if (!nFields)
         {
-            Info<< "Subsetting " << GeoField::typeName << nl;
+            Info<< "Subsetting " << GeoField::typeName << " (";
         }
-        Info<< "    " << fieldName << endl;
+        else
+        {
+            Info<< ' ';
+        }
+        Info<< io.name();
 
-        GeoField origField(*ioptr, baseMesh);
+        // Read unregistered
+        IOobject rio(io, IOobjectOption::NO_REGISTER);
+        GeoField origField(rio, baseMesh);
 
         subFields.set(nFields, subsetter.interpolate(origField));
+        auto& subField = subFields[nFields];
+        ++nFields;
+
+        // Subsetting adds 'subset' prefix. Rename field to be like original.
+        subField.rename(io.name());
+        subField.writeOpt(IOobjectOption::AUTO_WRITE);
+
 
         // Explicitly set exposed faces (in patchi) to exposedValue.
         if (patchi >= 0)
         {
-            fvsPatchField<Type>& fld =
-                subFields[nFields].boundaryFieldRef()[patchi];
+            fvsPatchField<Type>& fld = subField.boundaryFieldRef()[patchi];
 
             const label newStart = fld.patch().patch().start();
             const label oldPatchi = subsetter.patchMap()[patchi];
@@ -268,9 +304,14 @@ void subsetSurfaceFields
                 }
             }
         }
-
-        ++nFields;
     }
+
+    if (nFields)
+    {
+        Info<< ')' << nl;
+    }
+
+    return subFields;
 }
 
 
@@ -284,16 +325,9 @@ void initCreatedPatches
     const typename GeoField::value_type initValue
 )
 {
-    HashTable<const GeoField*> fields
-    (
-        mesh.objectRegistry::lookupClass<GeoField>()
-    );
-
-    forAllIters(fields, fieldIter)
+    for (const GeoField& field : mesh.objectRegistry::csorted<GeoField>())
     {
-        GeoField& field = const_cast<GeoField&>(*fieldIter());
-
-        auto& fieldBf = field.boundaryFieldRef();
+        auto& fieldBf = const_cast<GeoField&>(field).boundaryFieldRef();
 
         forAll(fieldBf, patchi)
         {
@@ -326,43 +360,36 @@ void subsetTopoSets
     PtrList<TopoSet> sets;
     ReadFields<TopoSet>(objects, sets);
 
-    subSets.resize(sets.size());
+    subSets.resize_null(sets.size());
+
     forAll(sets, seti)
     {
-        TopoSet& set = sets[seti];
+        const TopoSet& set = sets[seti];
 
-        Info<< "Subsetting " << set.type() << " " << set.name() << endl;
+        Info<< "Subsetting " << set.type() << ' ' << set.name() << endl;
+
+        labelHashSet subset(2*min(set.size(), map.size()));
 
         // Map the data
-        bitSet isSet(set.maxSize(mesh));
-        for (const label id : set)
+        forAll(map, i)
         {
-            isSet.set(id);
-        }
-
-        label nSet = 0;
-        for (const label id : map)
-        {
-            if (isSet.test(id))
+            if (set.contains(map[i]))
             {
-                ++nSet;
+                subset.insert(i);
             }
         }
 
         subSets.set
         (
             seti,
-            new TopoSet(subMesh, set.name(), nSet, IOobject::AUTO_WRITE)
+            new TopoSet
+            (
+                subMesh,
+                set.name(),
+                std::move(subset),
+                IOobjectOption::AUTO_WRITE
+            )
         );
-        TopoSet& subSet = subSets[seti];
-
-        forAll(map, i)
-        {
-            if (isSet.test(map[i]))
-            {
-                subSet.insert(i);
-            }
-        }
     }
 }
 
@@ -613,6 +640,7 @@ label findPatch(const polyBoundaryMesh& patches, const word& patchName)
 }
 
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 int main(int argc, char *argv[])
 {
@@ -844,138 +872,117 @@ int main(int argc, char *argv[])
             }
         }
     }
+
     // Read vol fields and subset.
-
-    wordList scalarNames(objects.sortedNames<volScalarField>());
-    PtrList<volScalarField> scalarFlds(scalarNames.size());
-    subsetVolFields
+    PtrList<volScalarField> scalarFlds
     (
-        subsetter,
-        objects,
-        defaultPatchi,
-        scalar(Zero),
-        scalarFlds
+        subsetVolFields<scalar>
+        (
+            subsetter,
+            objects,
+            defaultPatchi,
+            scalar(Zero)
+        )
     );
 
-    wordList vectorNames(objects.sortedNames<volVectorField>());
-    PtrList<volVectorField> vectorFlds(vectorNames.size());
-    subsetVolFields
+    PtrList<volVectorField> vectorFlds
     (
-        subsetter,
-        objects,
-        defaultPatchi,
-        vector(Zero),
-        vectorFlds
+        subsetVolFields<vector>
+        (
+            subsetter,
+            objects,
+            defaultPatchi,
+            vector(Zero)
+        )
     );
 
-    wordList sphTensorNames
-    (
-        objects.sortedNames<volSphericalTensorField>()
-    );
     PtrList<volSphericalTensorField> sphTensorFlds
     (
-        sphTensorNames.size()
-    );
-    subsetVolFields
-    (
-        subsetter,
-        objects,
-        defaultPatchi,
-        sphericalTensor(Zero),
-        sphTensorFlds
+        subsetVolFields<sphericalTensor>
+        (
+            subsetter,
+            objects,
+            defaultPatchi,
+            sphericalTensor(Zero)
+        )
     );
 
-    wordList symmTensorNames(objects.sortedNames<volSymmTensorField>());
-    PtrList<volSymmTensorField> symmTensorFlds(symmTensorNames.size());
-    subsetVolFields
+    PtrList<volSymmTensorField> symmTensorFlds
     (
-        subsetter,
-        objects,
-        defaultPatchi,
-        symmTensor(Zero),
-        symmTensorFlds
+        subsetVolFields<symmTensor>
+        (
+            subsetter,
+            objects,
+            defaultPatchi,
+            symmTensor(Zero)
+        )
     );
 
-    wordList tensorNames(objects.sortedNames<volTensorField>());
-    PtrList<volTensorField> tensorFlds(tensorNames.size());
-    subsetVolFields
+    PtrList<volTensorField> tensorFlds
     (
-        subsetter,
-        objects,
-        defaultPatchi,
-        tensor(Zero),
-        tensorFlds
+        subsetVolFields<tensor>
+        (
+            subsetter,
+            objects,
+            defaultPatchi,
+            tensor(Zero)
+        )
     );
 
     // Read surface fields and subset.
-
-    wordList surfScalarNames(objects.sortedNames<surfaceScalarField>());
-    PtrList<surfaceScalarField> surfScalarFlds(surfScalarNames.size());
-    subsetSurfaceFields
+    PtrList<surfaceScalarField> surfScalarFlds
     (
-        subsetter,
-        objects,
-        defaultPatchi,
-        scalar(Zero),
-        surfScalarFlds
+        subsetSurfaceFields<scalar>
+        (
+            subsetter,
+            objects,
+            defaultPatchi,
+            scalar(Zero)
+        )
     );
 
-    wordList surfVectorNames(objects.sortedNames<surfaceVectorField>());
-    PtrList<surfaceVectorField> surfVectorFlds(surfVectorNames.size());
-    subsetSurfaceFields
+    PtrList<surfaceVectorField> surfVectorFlds
     (
-        subsetter,
-        objects,
-        defaultPatchi,
-        vector(Zero),
-        surfVectorFlds
+        subsetSurfaceFields<vector>
+        (
+            subsetter,
+            objects,
+            defaultPatchi,
+            vector(Zero)
+        )
     );
 
-    wordList surfSphTensorNames
-    (
-        objects.sortedNames<surfaceSphericalTensorField>()
-    );
     PtrList<surfaceSphericalTensorField> surfSphericalTensorFlds
     (
-        surfSphTensorNames.size()
-    );
-    subsetSurfaceFields
-    (
-        subsetter,
-        objects,
-        defaultPatchi,
-        sphericalTensor(Zero),
-        surfSphericalTensorFlds
-    );
-
-    wordList surfSymmTensorNames
-    (
-        objects.sortedNames<surfaceSymmTensorField>()
+        subsetSurfaceFields<sphericalTensor>
+        (
+            subsetter,
+            objects,
+            defaultPatchi,
+            sphericalTensor(Zero)
+        )
     );
 
     PtrList<surfaceSymmTensorField> surfSymmTensorFlds
     (
-        surfSymmTensorNames.size()
+        subsetSurfaceFields<symmTensor>
+        (
+            subsetter,
+            objects,
+            defaultPatchi,
+            symmTensor(Zero)
+        )
     );
 
-    subsetSurfaceFields
+    PtrList<surfaceTensorField> surfTensorFlds
     (
-        subsetter,
-        objects,
-        defaultPatchi,
-        symmTensor(Zero),
-        surfSymmTensorFlds
-    );
-
-    wordList surfTensorNames(objects.sortedNames<surfaceTensorField>());
-    PtrList<surfaceTensorField> surfTensorFlds(surfTensorNames.size());
-    subsetSurfaceFields
-    (
-        subsetter,
-        objects,
-        defaultPatchi,
-        tensor(Zero),
-        surfTensorFlds
+        subsetSurfaceFields<tensor>
+        (
+            subsetter,
+            objects,
+            defaultPatchi,
+            tensor(Zero)
+        )
     );
 
 
@@ -1017,62 +1024,8 @@ int main(int argc, char *argv[])
         ++runTime;
     }
 
-    Info<< "Writing mesh without blockedCells to time " << runTime.value()
-        << endl;
-
-    // Subsetting adds 'subset' prefix. Rename field to be like original.
-    forAll(scalarFlds, i)
-    {
-        scalarFlds[i].rename(scalarNames[i]);
-        scalarFlds[i].writeOpt(IOobject::AUTO_WRITE);
-    }
-    forAll(vectorFlds, i)
-    {
-        vectorFlds[i].rename(vectorNames[i]);
-        vectorFlds[i].writeOpt(IOobject::AUTO_WRITE);
-    }
-    forAll(sphTensorFlds, i)
-    {
-        sphTensorFlds[i].rename(sphTensorNames[i]);
-        sphTensorFlds[i].writeOpt(IOobject::AUTO_WRITE);
-    }
-    forAll(symmTensorFlds, i)
-    {
-        symmTensorFlds[i].rename(symmTensorNames[i]);
-        symmTensorFlds[i].writeOpt(IOobject::AUTO_WRITE);
-    }
-    forAll(tensorFlds, i)
-    {
-        tensorFlds[i].rename(tensorNames[i]);
-        tensorFlds[i].writeOpt(IOobject::AUTO_WRITE);
-    }
-
-    // Surface ones.
-    forAll(surfScalarFlds, i)
-    {
-        surfScalarFlds[i].rename(surfScalarNames[i]);
-        surfScalarFlds[i].writeOpt(IOobject::AUTO_WRITE);
-    }
-    forAll(surfVectorFlds, i)
-    {
-        surfVectorFlds[i].rename(surfVectorNames[i]);
-        surfVectorFlds[i].writeOpt(IOobject::AUTO_WRITE);
-    }
-    forAll(surfSphericalTensorFlds, i)
-    {
-        surfSphericalTensorFlds[i].rename(surfSphTensorNames[i]);
-        surfSphericalTensorFlds[i].writeOpt(IOobject::AUTO_WRITE);
-    }
-    forAll(surfSymmTensorFlds, i)
-    {
-        surfSymmTensorFlds[i].rename(surfSymmTensorNames[i]);
-        surfSymmTensorFlds[i].writeOpt(IOobject::AUTO_WRITE);
-    }
-    forAll(surfTensorNames, i)
-    {
-        surfTensorFlds[i].rename(surfTensorNames[i]);
-        surfTensorFlds[i].writeOpt(IOobject::AUTO_WRITE);
-    }
+    Info<< "Writing mesh without blockedCells to time "
+        << runTime.value() << endl;
 
     subsetter.subMesh().write();
 

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

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -47,7 +47,7 @@ Description
 #include "Time.H"
 #include "polyMesh.H"
 #include "cellSet.H"
-#include "SortableList.H"
+#include "SortList.H"
 #include "labelIOList.H"
 #include "fvMesh.H"
 #include "volFields.H"
@@ -128,71 +128,54 @@ int main(int argc, char *argv[])
 
     const scalarField& vols = mesh.cellVolumes();
 
-    SortableList<scalar> sortedVols(vols);
+    SortList<scalar> sortedVols(vols);
 
     // All cell labels, sorted per bin.
     DynamicList<DynamicList<label>> bins;
 
     // Lower/upper limits
-    DynamicList<scalar> lowerLimits;
-    DynamicList<scalar> upperLimits;
+    DynamicList<scalarMinMax> limits;
 
     // Create bin0. Have upperlimit as factor times lowerlimit.
-    bins.append(DynamicList<label>());
-    lowerLimits.append(sortedVols[0]);
-    upperLimits.append(1.1 * lowerLimits.last());
+    bins.emplace_back();
+    limits.emplace_back(sortedVols[0], 1.1*sortedVols[0]);
 
     forAll(sortedVols, i)
     {
-        if (sortedVols[i] > upperLimits.last())
+        if (sortedVols[i] > limits.back().max())
         {
             // New value outside of current bin
-
-            // Shrink old bin.
-            DynamicList<label>& bin = bins.last();
-
-            bin.shrink();
-
-            Info<< "Collected " << bin.size() << " elements in bin "
-                << lowerLimits.last() << " .. "
-                << upperLimits.last() << endl;
+            Info<< "Collected " << bins.back() << " elements in bin "
+                << limits.back().min() << " .. "
+                << limits.back().max() << endl;
 
             // Create new bin.
-            bins.append(DynamicList<label>());
-            lowerLimits.append(sortedVols[i]);
-            upperLimits.append(1.1 * lowerLimits.last());
+            bins.emplace_back();
+            limits.emplace_back(sortedVols[i], 1.1 * sortedVols[i]);
 
-            Info<< "Creating new bin " << lowerLimits.last()
-                << " .. " << upperLimits.last()
-                << endl;
+            Info<< "Creating new bin "
+                << limits.back().min() << " .. "
+                << limits.back().max() << endl;
         }
 
-        // Append to current bin.
-        DynamicList<label>& bin = bins.last();
-
-        bin.append(sortedVols.indices()[i]);
+        // Add to current bin.
+        bins.back().push_back(sortedVols.indices()[i]);
     }
     Info<< endl;
 
-    bins.last().shrink();
-    bins.shrink();
-    lowerLimits.shrink();
-    upperLimits.shrink();
-
-
     //
     // Write to cellSets.
     //
 
     Info<< "Volume bins:" << nl;
-    forAll(bins, binI)
+    forAll(bins, bini)
     {
-        const DynamicList<label>& bin = bins[binI];
+        const auto& bin = bins[bini];
 
-        cellSet cells(mesh, "vol" + name(binI), bin.size());
+        cellSet cells(mesh, "vol" + Foam::name(bini), bin.size());
         cells.insert(bin);
 
-        Info<< "    " << lowerLimits[binI] << " .. " << upperLimits[binI]
+        Info<< "    " << limits[bini].min() << " .. " << limits[bini].max()
             << "  : writing " << bin.size() << " cells to cellSet "
             << cells.name() << endl;
 
@@ -294,13 +277,13 @@ int main(int argc, char *argv[])
     );
 
     // Set cell values
-    forAll(bins, binI)
+    forAll(bins, bini)
     {
-        const DynamicList<label>& bin = bins[binI];
+        const auto& bin = bins[bini];
 
         forAll(bin, i)
         {
-            refLevel[bin[i]] = bins.size() - binI - 1;
+            refLevel[bin[i]] = bins.size() - bini - 1;
             postRefLevel[bin[i]] = refLevel[bin[i]];
         }
     }

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

@@ -143,10 +143,10 @@ void Foam::fileFormats::ensightMeshReader::setHandedness
 //        if (((x ^ y) & z) < 0)
 //        {
 //            // Flipped hex
-//            Swap(verts[0], verts[4]);
-//            Swap(verts[1], verts[5]);
-//            Swap(verts[2], verts[6]);
-//            Swap(verts[3], verts[7]);
+//            std::swap(verts[0], verts[4]);
+//            std::swap(verts[1], verts[5]);
+//            std::swap(verts[2], verts[6]);
+//            std::swap(verts[3], verts[7]);
 //        }
 //    }
 
@@ -155,27 +155,27 @@ void Foam::fileFormats::ensightMeshReader::setHandedness
         if (verts.size() == 8)
         {
             // Flipped hex
-            Swap(verts[0], verts[4]);
-            Swap(verts[1], verts[5]);
-            Swap(verts[2], verts[6]);
-            Swap(verts[3], verts[7]);
+            std::swap(verts[0], verts[4]);
+            std::swap(verts[1], verts[5]);
+            std::swap(verts[2], verts[6]);
+            std::swap(verts[3], verts[7]);
         }
         else if (verts.size() == 4)
         {
             // Flipped tet. Change orientation of base
-            Swap(verts[0], verts[1]);
+            std::swap(verts[0], verts[1]);
         }
         else if (verts.size() == 5)
         {
             // Flipped pyr. Change orientation of base
-            Swap(verts[1], verts[3]);
+            std::swap(verts[1], verts[3]);
         }
         else if (verts.size() == 6)
         {
             // Flipped prism.
-            Swap(verts[0], verts[3]);
-            Swap(verts[1], verts[4]);
-            Swap(verts[2], verts[5]);
+            std::swap(verts[0], verts[3]);
+            std::swap(verts[1], verts[4]);
+            std::swap(verts[2], verts[5]);
         }
     }
 }

applications/utilities/mesh/generation/blockMesh/blockMesh.C

@@ -221,7 +221,7 @@ int main(int argc, char *argv[])
 
     blockMesh blocks(meshDict, regionName, strategy, args.verbose());
 
-    if (!blocks.valid())
+    if (!blocks.good())
     {
         // Could/should be Fatal?
 

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

@@ -54,56 +54,44 @@ Description
                 );
 
                 // An empty zone for cut points
-                pzs.append
+                pzs.emplace_back
                 (
-                    new pointZone
-                    (
-                        mergeName + "CutPointZone",
-                        pzs.size(),
-                        pzs
-                    )
+                    mergeName + "CutPointZone",
+                    pzs.size(),     // index
+                    pzs
                 );
-                cleanupPointZones.insert(pzs.last().name());
+                cleanupPointZones.insert(pzs.back().name());
 
                 // Coupling side 0 (master)
-                fzs.append
+                fzs.emplace_back
                 (
-                    new faceZone
-                    (
-                        mergeName + "Side0Zone",
-                        identity(patch0.range()),
-                        false, // none are flipped
-                        fzs.size(),
-                        fzs
-                    )
+                    mergeName + "Side0Zone",
+                    identity(patch0.range()),
+                    false,          // none are flipped
+                    fzs.size(),     // index
+                    fzs
                 );
-                cleanupFaceZones.insert(fzs.last().name());
+                cleanupFaceZones.insert(fzs.back().name());
 
                 // Coupling side 1 (slave)
-                fzs.append
+                fzs.emplace_back
                 (
-                    new faceZone
-                    (
-                        mergeName + "Side1Zone",
-                        identity(patch1.range()),
-                        false, // none are flipped
-                        fzs.size(),
-                        fzs
-                    )
+                    mergeName + "Side1Zone",
+                    identity(patch1.range()),
+                    false,          // none are flipped
+                    fzs.size(),     // index
+                    fzs
                 );
-                cleanupFaceZones.insert(fzs.last().name());
+                cleanupFaceZones.insert(fzs.back().name());
 
                 // An empty zone for cut faces
-                fzs.append
+                fzs.emplace_back
                 (
-                    new faceZone
-                    (
-                        mergeName + "CutFaceZone",
-                        fzs.size(),
-                        fzs
-                    )
+                    mergeName + "CutFaceZone",
+                    fzs.size(),     // index
+                    fzs
                 );
-                cleanupFaceZones.insert(fzs.last().name());
+                cleanupFaceZones.insert(fzs.back().name());
             }
         }
 

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

@@ -979,7 +979,7 @@ int main(int argc, char *argv[])
     // Change the front and back patch types as required
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-    word frontBackType(word::null);
+    word frontBackType;
 
     if (isType<extrudeModels::wedge>(model()))
     {

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

@@ -947,7 +947,7 @@ void addZoneSidePatches
 
     forAll(zoneSidePatch, zoneI)
     {
-        if (oneDPolyPatchType != word::null)
+        if (!oneDPolyPatchType.empty())
         {
             // Reuse single empty patch.
             word patchName;

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshI.H

@@ -47,7 +47,7 @@ void Foam::DelaunayMesh<Triangulation>::timeCheck
             << time().elapsedCpuTime() << " s, "
             << "delta " << time().cpuTimeIncrement()<< " s";
 
-        if (description != word::null)
+        if (!description.empty())
         {
             Info<< ", " << description << " ";
         }

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

@@ -33,7 +33,7 @@ template<class KeyType, class DataType>
 Foam::PrintTable<KeyType, DataType>::PrintTable()
 :
     table_(),
-    title_(string::null)
+    title_()
 {}
 
 

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H

@@ -468,8 +468,8 @@ inline Foam::List<Foam::label> Foam::conformalVoronoiMesh::processorsAttached
 
     forAll(c1Procs, aPI)
     {
-        procsAttached.appendUniq(c1Procs[aPI]);
-        procsAttached.appendUniq(c2Procs[aPI]);
+        procsAttached.push_uniq(c1Procs[aPI]);
+        procsAttached.push_uniq(c2Procs[aPI]);
     }
 
     return List<label>(procsAttached);

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

@@ -65,7 +65,7 @@ void Foam::conformalVoronoiMesh::timeCheck
             << runTime.elapsedCpuTime() << " s, "
             << "delta " << runTime.cpuTimeIncrement()<< " s";
 
-        if (description != word::null)
+        if (!description.empty())
         {
             Info<< ", " << description << " ";
         }
@@ -78,7 +78,7 @@ void Foam::conformalVoronoiMesh::timeCheck
 
         memInfo m;
 
-        if (m.valid())
+        if (m.good())
         {
             PrintTable<word, label> memoryTable
             (

applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/shortEdgeFilter2D.C

@@ -46,8 +46,8 @@ void Foam::shortEdgeFilter2D::assignBoundaryPointRegions
         const edge& e = iter.key();
         const label regi = iter.val();
 
-        boundaryPointRegions[e.start()].appendUniq(regi);
-        boundaryPointRegions[e.end()].appendUniq(regi);
+        boundaryPointRegions[e.first()].push_uniq(regi);
+        boundaryPointRegions[e.second()].push_uniq(regi);
     }
 }
 
@@ -66,7 +66,7 @@ void Foam::shortEdgeFilter2D::updateEdgeRegionMap
     const edgeList& edges = surfMesh.edges();
     const labelList& meshPoints = surfMesh.meshPoints();
 
-    patchSizes.setSize(patchNames_.size(), 0);
+    patchSizes.resize_nocopy(patchNames_.size());
     patchSizes = 0;
 
     forAll(edges, edgeI)
@@ -78,15 +78,13 @@ void Foam::shortEdgeFilter2D::updateEdgeRegionMap
 
         const edge& e = edges[edgeI];
 
-        const label startI = meshPoints[e[0]];
-        const label endI = meshPoints[e[1]];
-
         label region = -1;
 
-        const DynamicList<label> startPtRegions =
-            boundaryPtRegions[surfPtToBoundaryPt[startI]];
-        const DynamicList<label> endPtRegions =
-            boundaryPtRegions[surfPtToBoundaryPt[endI]];
+        const DynamicList<label>& startPtRegions =
+            boundaryPtRegions[surfPtToBoundaryPt[meshPoints[e.first()]]];
+
+        const DynamicList<label>& endPtRegions =
+            boundaryPtRegions[surfPtToBoundaryPt[meshPoints[e.second()]]];
 
         if (startPtRegions.size() > 1 && endPtRegions.size() > 1)
         {

applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2015-2022 OpenCFD Ltd.
+    Copyright (C) 2015-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -52,6 +52,7 @@ Description
 #include "snapParameters.H"
 #include "layerParameters.H"
 #include "vtkCoordSetWriter.H"
+#include "vtkSurfaceWriter.H"
 #include "faceSet.H"
 #include "motionSmoother.H"
 #include "polyTopoChange.H"
@@ -859,19 +860,36 @@ int main(int argc, char *argv[])
     // Writer for writing lines
     autoPtr<coordSetWriter> setFormatter;
     {
-        const word setFormat
+        const word writerType
         (
             meshDict.getOrDefault<word>
             (
                 "setFormat",
-                coordSetWriters::vtkWriter::typeName  // Default: "vtk"
+                coordSetWriters::vtkWriter::typeName    // Default: "vtk"
             )
         );
 
         setFormatter = coordSetWriter::New
         (
-            setFormat,
-            meshDict.subOrEmptyDict("formatOptions").optionalSubDict(setFormat)
+            writerType,
+            meshDict.subOrEmptyDict("formatOptions").optionalSubDict(writerType)
+        );
+    }
+    // Writer for writing surfaces
+    refPtr<surfaceWriter> surfFormatter;
+    {
+        const word type
+        (
+            meshDict.getOrDefault<word>
+            (
+                "surfaceFormat",
+                surfaceWriters::vtkWriter::typeName      // Default: "vtk"
+            )
+        );
+        surfFormatter = surfaceWriter::New
+        (
+            type,
+            meshDict.subOrEmptyDict("formatOptions").optionalSubDict(type)
         );
     }
 
@@ -1774,6 +1792,7 @@ int main(int argc, char *argv[])
             globalToMasterPatch,
             globalToSlavePatch,
             setFormatter(),
+            surfFormatter,
             dryRun
         );
 

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

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2015-2017 OpenFOAM Foundation
-    Copyright (C) 2015-2022 OpenCFD Ltd.
+    Copyright (C) 2015-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -233,58 +233,15 @@ void Foam::mergeAndWrite
     const fileName& outputDir
 )
 {
-    if (Pstream::parRun())
-    {
-        labelList pointToGlobal;
-        labelList uniqueMeshPointLabels;
-        autoPtr<globalIndex> globalPoints;
-        autoPtr<globalIndex> globalFaces;
-        faceList mergedFaces;
-        pointField mergedPoints;
-        Foam::PatchTools::gatherAndMerge
-        (
-            mesh,
-            setPatch.localFaces(),
-            setPatch.meshPoints(),
-            setPatch.meshPointMap(),
+    writer.open
+    (
+        setPatch.localPoints(),
+        setPatch.localFaces(),
+        (outputDir / name)
+    );
 
-            pointToGlobal,
-            uniqueMeshPointLabels,
-            globalPoints,
-            globalFaces,
-
-            mergedFaces,
-            mergedPoints
-        );
-
-        // Write
-        if (Pstream::master())
-        {
-            writer.open
-            (
-                mergedPoints,
-                mergedFaces,
-                (outputDir / name),
-                false  // serial - already merged
-            );
-
-            writer.write();
-            writer.clear();
-        }
-    }
-    else
-    {
-        writer.open
-        (
-            setPatch.localPoints(),
-            setPatch.localFaces(),
-            (outputDir / name),
-            false  // serial - already merged
-        );
-
-        writer.write();
-        writer.clear();
-    }
+    writer.write();
+    writer.clear();
 }
 
 

applications/utilities/mesh/manipulation/createBaffles/createBaffles.C

@@ -87,11 +87,7 @@ label addPatch
             )
         );
         auto& pp = *ppPtr;
-
-        if (!groupName.empty())
-        {
-            pp.inGroups().appendUniq(groupName);
-        }
+        pp.addGroup(groupName);
 
 
         // Add patch, create calculated everywhere

applications/utilities/mesh/manipulation/createPatch/createPatch.C

@@ -148,21 +148,15 @@ void matchPatchFaces
                 // Mesh 0
                 //~~~~~~~
 
-                interfaceMesh0.append(labelList());
-                auto& intMesh0 = interfaceMesh0.last();
-                intMesh0.setSize(nSourcei, -1);
+                auto& intMesh0 = interfaceMesh0.emplace_back(nSourcei, -1);
                 intMesh0[sourcei] = meshi;
 
-                interfaceSource0.append(sourcei);
+                interfaceSource0.push_back(sourcei);
 
-                interfacePatch0.append(labelList());
-                auto& intPatch0 = interfacePatch0.last();
-                intPatch0.setSize(nSourcei, -1);
+                auto& intPatch0 = interfacePatch0.emplace_back(nSourcei, -1);
                 intPatch0[sourcei] = ppi.index();
 
-                interfaceNames0.append(wordList());
-                auto& intNames0 = interfaceNames0.last();
-                intNames0.setSize(nSourcei);
+                auto& intNames0 = interfaceNames0.emplace_back(nSourcei);
                 intNames0[sourcei] =
                     patchName(entryName, meshes[meshi], meshes[meshj]);
 
@@ -170,33 +164,23 @@ void matchPatchFaces
                 // Mesh 1
                 //~~~~~~~
 
-                interfaceMesh1.append(labelList());
-                auto& intMesh1 = interfaceMesh1.last();
-                intMesh1.setSize(nSourcej, -1);
+                auto& intMesh1 = interfaceMesh1.emplace_back(nSourcej, -1);
                 intMesh1[sourcej] = meshj;
 
-                interfaceSource1.append(sourcej);
+                interfaceSource1.push_back(sourcej);
 
-                interfacePatch1.append(labelList());
-                auto& intPatch1 = interfacePatch1.last();
-                intPatch1.setSize(nSourcej, -1);
+                auto& intPatch1 = interfacePatch1.emplace_back(nSourcej, -1);
                 intPatch1[sourcej] = ppj.index();
 
-                interfaceNames1.append(wordList());
-                auto& intNames1 = interfaceNames1.last();
-                intNames1.setSize(nSourcej);
+                auto& intNames1 = interfaceNames1.emplace_back(nSourcej);
                 intNames1[sourcej] =
                     patchName(entryName, meshes[meshj], meshes[meshi]);
 
-                interfaceFaces0.append(List<DynamicList<label>>());
-                auto& intFaces0 = interfaceFaces0.last();
-                intFaces0.setSize(nSourcei);
+                auto& intFaces0 = interfaceFaces0.emplace_back(nSourcei);
                 DynamicList<label>& faces0 = intFaces0[sourcei];
                 faces0.setCapacity(ppi.size());
 
-                interfaceFaces1.append(List<DynamicList<label>>());
-                auto& intFaces1 = interfaceFaces1.last();
-                intFaces1.setSize(nSourcej);
+                auto& intFaces1 = interfaceFaces1.emplace_back(nSourcej);
                 DynamicList<label>& faces1 = intFaces1[sourcej];
                 faces1.setCapacity(ppj.size());
 
@@ -249,7 +233,7 @@ void matchPatchFaces
                     {
                         if (weights[facei] > 0.5 || sourceMask[facei] > SMALL)
                         {
-                            faces0.append(ppi.start()+facei);
+                            faces0.push_back(ppi.start()+facei);
                         }
                     }
                 }
@@ -259,7 +243,7 @@ void matchPatchFaces
                     {
                         if (weights[facei] > 0.5 || targetMask[facei] > SMALL)
                         {
-                            faces1.append(ppj.start()+facei);
+                            faces1.push_back(ppj.start()+facei);
                         }
                     }
                 }
@@ -825,7 +809,7 @@ int main(int argc, char *argv[])
 
             if (pDict.get<word>("constructFrom") == "autoPatch")
             {
-                interRegionSources[meshi].append(sourcei);
+                interRegionSources[meshi].push_back(sourcei);
             }
         }
     }

applications/utilities/mesh/manipulation/mergeOrSplitBaffles/mergeOrSplitBaffles.C

@@ -357,7 +357,7 @@ int main(int argc, char *argv[])
                 dict.subDict("merge").get<wordRes>("patches")
             ).sortedToc();
 
-            Info<< "Detecting baffles on " << mergePatchIDs.size()
+            Info<< "Merge baffles on " << mergePatchIDs.size()
                 << " patches with "
                 << returnReduce(patchSize(mesh, mergePatchIDs), sumOp<label>())
                 << " faces" << endl;
@@ -369,7 +369,7 @@ int main(int argc, char *argv[])
                 dict.subDict("split").get<wordRes>("patches")
             ).sortedToc();
 
-            Info<< "Detecting baffles on " << splitPatchIDs.size()
+            Info<< "Split baffles on " << splitPatchIDs.size()
                 << " patches with "
                 << returnReduce(patchSize(mesh, splitPatchIDs), sumOp<label>())
                 << " faces" << endl;

applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.C

@@ -518,7 +518,7 @@ void Foam::meshDualiser::createFacesAroundEdge
 
                 if (startDual != -1)
                 {
-                    verts.appendUniq(startDual);
+                    verts.push_uniq(startDual);
                 }
             }
             break;

applications/utilities/mesh/manipulation/rotateMesh/rotateMesh.C

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2019-2022 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -55,12 +55,9 @@ void ReadAndRotateFields
     const dimensionedTensor& rotT
 )
 {
-    // Objects of field type
-    IOobjectList fields(objects.lookupClass<GeoField>());
-
-    forAllConstIters(fields, fieldIter)
+    for (const IOobject& io : objects.csorted<GeoField>())
     {
-        GeoField fld(*fieldIter(), mesh);
+        GeoField fld(io, mesh);
         Info<< "    Rotating " << fld.name() << endl;
         transform(fld, rotT, fld);
         fld.write();

applications/utilities/mesh/manipulation/setSet/setSet.C

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2018 OpenFOAM Foundation
-    Copyright (C) 2017-2022 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -158,7 +158,7 @@ void printSets(Ostream& os, const IOobjectList& objects)
 {
     label n = 0;
 
-    for (const IOobject& io : objects.sorted<SetType>())
+    for (const IOobject& io : objects.csorted<SetType>())
     {
         SetType set(io);
         if (!n++) os << SetType::typeName << "s:" << nl;

applications/utilities/mesh/manipulation/setsToZones/setsToZones.C

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2021-2022 OpenCFD Ltd.
+    Copyright (C) 2021-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -105,7 +105,7 @@ int main(int argc, char *argv[])
         << endl;
 
 
-    for (const IOobject& io : objects.sorted<pointSet>())
+    for (const IOobject& io : objects.csorted<pointSet>())
     {
         // Not in memory. Load it.
         pointSet set(io);
@@ -137,7 +137,7 @@ int main(int argc, char *argv[])
 
     wordHashSet slaveCellSets;
 
-    for (const IOobject& io : objects.sorted<faceSet>())
+    for (const IOobject& io : objects.csorted<faceSet>())
     {
         // Not in memory. Load it.
         faceSet set(io);
@@ -259,7 +259,7 @@ int main(int argc, char *argv[])
 
 
 
-    for (const IOobject& io : objects.sorted<cellSet>())
+    for (const IOobject& io : objects.csorted<cellSet>())
     {
         if (!slaveCellSets.found(io.name()))
         {

applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2015-2022 OpenCFD Ltd.
+    Copyright (C) 2015-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -164,14 +164,8 @@ void subsetVolFields
 {
     const labelList patchMap(identity(mesh.boundaryMesh().size()));
 
-    HashTable<const GeoField*> fields
-    (
-        mesh.objectRegistry::lookupClass<GeoField>()
-    );
-    forAllConstIters(fields, iter)
+    for (const GeoField& fld : mesh.objectRegistry::csorted<GeoField>())
     {
-        const GeoField& fld = *iter.val();
-
         Info<< "Mapping field " << fld.name() << endl;
 
         tmp<GeoField> tSubFld
@@ -192,8 +186,7 @@ void subsetVolFields
         {
             if (addedPatches.found(patchi))
             {
-                tSubFld.ref().boundaryFieldRef()[patchi] ==
-                    typename GeoField::value_type(Zero);
+                tSubFld.ref().boundaryFieldRef()[patchi] == Zero;
             }
         }
 
@@ -218,14 +211,8 @@ void subsetSurfaceFields
 {
     const labelList patchMap(identity(mesh.boundaryMesh().size()));
 
-    HashTable<const GeoField*> fields
-    (
-        mesh.objectRegistry::lookupClass<GeoField>()
-    );
-    forAllConstIters(fields, iter)
+    for (const GeoField& fld : mesh.objectRegistry::csorted<GeoField>())
     {
-        const GeoField& fld = *iter.val();
-
         Info<< "Mapping field " << fld.name() << endl;
 
         tmp<GeoField> tSubFld
@@ -246,8 +233,7 @@ void subsetSurfaceFields
         {
             if (addedPatches.found(patchi))
             {
-                tSubFld.ref().boundaryFieldRef()[patchi] ==
-                    typename GeoField::value_type(Zero);
+                tSubFld.ref().boundaryFieldRef()[patchi] == Zero;
             }
         }
 

applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2016-2022 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -70,7 +70,7 @@ label getExposedPatchId(const polyMesh& mesh, const word& patchName)
 
     Info<< "Adding exposed internal faces to "
         << (patchId == -1 ? "new" : "existing")
-        << " patch \"" << patchName << "\"" << nl << endl;
+        << " patch: " << patchName << nl << endl;
 
     return patchId;
 }
@@ -149,178 +149,127 @@ labelList nearestPatch(const polyMesh& mesh, const labelList& patchIDs)
 
 
 //
-// Subset field-type, availability information cached
-// in the availableFields hashtable.
+// Subset DimensionedField/GeometricField
 //
-template<class Type, template<class> class PatchField, class GeoMesh>
-void subsetFields
+template<class FieldType>
+PtrList<FieldType> subsetFields
 (
     const fvMeshSubset& subsetter,
-    HashTable<wordHashSet>& availableFields,
-    PtrList<GeometricField<Type, PatchField, GeoMesh>>& subFields
+    const IOobjectList& objects
 )
 {
-    typedef GeometricField<Type, PatchField, GeoMesh> FieldType;
-    const word fieldType = FieldType::typeName;
-
-    const wordList fieldNames = availableFields(fieldType).sortedToc();
-    subFields.setSize(fieldNames.size());
-
     const fvMesh& baseMesh = subsetter.baseMesh();
 
+    const UPtrList<const IOobject> fieldObjects
+    (
+        objects.csorted<FieldType>()
+    );
+
+    PtrList<FieldType> subFields(fieldObjects.size());
+
     label nFields = 0;
-    for (const word& fieldName : fieldNames)
+    for (const IOobject& io : fieldObjects)
     {
         if (!nFields)
         {
-            Info<< "Subsetting " << fieldType << " (";
+            Info<< "Subsetting " << FieldType::typeName << " (";
         }
         else
         {
             Info<< ' ';
         }
-        Info<< fieldName;
+        Info<< io.name();
 
         FieldType fld
         (
             IOobject
             (
-                fieldName,
+                io.name(),
                 baseMesh.time().timeName(),
                 baseMesh,
-                IOobject::MUST_READ,
-                IOobject::NO_WRITE
+                IOobjectOption::MUST_READ,
+                IOobjectOption::NO_WRITE,
+                IOobjectOption::NO_REGISTER
             ),
             baseMesh
         );
 
         subFields.set(nFields, subsetter.interpolate(fld));
+        auto& subField = subFields[nFields];
+        ++nFields;
 
         // Subsetting adds 'subset' prefix - rename to match original.
-        subFields[nFields].rename(fieldName);
-
-        ++nFields;
+        subField.rename(io.name());
     }
 
     if (nFields)
     {
         Info<< ')' << nl;
     }
+
+    return subFields;
 }
 
 
-template<class Type>
-void subsetPointFields
+// Subset point fields
+template<class FieldType>
+PtrList<FieldType> subsetFields
 (
     const fvMeshSubset& subsetter,
-    const pointMesh& pMesh,
-    HashTable<wordHashSet>& availableFields,
-    PtrList<GeometricField<Type, pointPatchField, pointMesh>>& subFields
+    const IOobjectList& objects,
+    const pointMesh& pMesh
 )
 {
-    typedef GeometricField<Type, pointPatchField, pointMesh> FieldType;
-    const word fieldType = FieldType::typeName;
-
-    const wordList fieldNames = availableFields(fieldType).sortedToc();
-    subFields.setSize(fieldNames.size());
-
     const fvMesh& baseMesh = subsetter.baseMesh();
 
+    const UPtrList<const IOobject> fieldObjects
+    (
+        objects.csorted<FieldType>()
+    );
+
+    PtrList<FieldType> subFields(fieldObjects.size());
+
     label nFields = 0;
-    for (const word& fieldName : fieldNames)
+    for (const IOobject& io : fieldObjects)
     {
         if (!nFields)
         {
-            Info<< "Subsetting " << fieldType << " (";
+            Info<< "Subsetting " << FieldType::typeName << " (";
         }
         else
         {
             Info<< ' ';
         }
-        Info<< fieldName;
+        Info<< io.name();
 
         FieldType fld
         (
             IOobject
             (
-                fieldName,
+                io.name(),
                 baseMesh.time().timeName(),
                 baseMesh,
-                IOobject::MUST_READ,
-                IOobject::NO_WRITE
+                IOobjectOption::MUST_READ,
+                IOobjectOption::NO_WRITE,
+                IOobjectOption::NO_REGISTER
             ),
             pMesh
         );
 
         subFields.set(nFields, subsetter.interpolate(fld));
+        auto& subField = subFields[nFields];
+        ++nFields;
 
         // Subsetting adds 'subset' prefix - rename to match original.
-        subFields[nFields].rename(fieldName);
-
-        ++nFields;
+        subField.rename(io.name());
     }
 
     if (nFields)
     {
         Info<< ')' << nl;
     }
-}
 
-
-template<class Type>
-void subsetDimensionedFields
-(
-    const fvMeshSubset& subsetter,
-    HashTable<wordHashSet>& availableFields,
-    PtrList<DimensionedField<Type, volMesh>>& subFields
-)
-{
-    typedef DimensionedField<Type, volMesh> FieldType;
-    const word fieldType = FieldType::typeName;
-
-    const wordList fieldNames = availableFields(fieldType).sortedToc();
-    subFields.setSize(fieldNames.size());
-
-    const fvMesh& baseMesh = subsetter.baseMesh();
-
-    label nFields = 0;
-    for (const word& fieldName : fieldNames)
-    {
-        if (!nFields)
-        {
-            Info<< "Subsetting " << fieldType << " (";
-        }
-        else
-        {
-            Info<< ' ';
-        }
-        Info<< fieldName;
-
-        FieldType fld
-        (
-            IOobject
-            (
-                fieldName,
-                baseMesh.time().timeName(),
-                baseMesh,
-                IOobject::MUST_READ,
-                IOobject::NO_WRITE
-            ),
-            baseMesh
-        );
-
-        subFields.set(nFields, subsetter.interpolate(fld));
-
-        // Subsetting adds 'subset' prefix - rename to match original.
-        subFields[nFields].rename(fieldName);
-
-        ++nFields;
-    }
-
-    if (nFields)
-    {
-        Info<< ')' << nl;
-    }
+    return subFields;
 }
 
 
@@ -338,7 +287,8 @@ void subsetTopoSets
     PtrList<TopoSet> sets;
     ReadFields<TopoSet>(objects, sets);
 
-    subSets.setSize(sets.size());
+    subSets.resize_null(sets.size());
+
     forAll(sets, seti)
     {
         const TopoSet& set = sets[seti];
@@ -347,6 +297,7 @@ void subsetTopoSets
 
         labelHashSet subset(2*min(set.size(), map.size()));
 
+        // Map the data
         forAll(map, i)
         {
             if (set.found(map[i]))
@@ -363,13 +314,14 @@ void subsetTopoSets
                 subMesh,
                 set.name(),
                 std::move(subset),
-                IOobject::AUTO_WRITE
+                IOobjectOption::AUTO_WRITE
             )
         );
     }
 }
 
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 int main(int argc, char *argv[])
 {
@@ -405,6 +357,12 @@ int main(int argc, char *argv[])
         "Add exposed internal faces to closest of specified patches"
         " instead of \"oldInternalFaces\""
     );
+    argList::addOption
+    (
+        "exclude-patches",
+        "wordRes",
+        "Exclude single or multiple patches from the -patches selection"
+    );
     argList::addBoolOption
     (
         "zone",
@@ -448,36 +406,59 @@ int main(int argc, char *argv[])
     // Default exposed patch id
     labelList exposedPatchIDs(one{}, -1);
 
-    if (args.found("patches"))
+    wordRes includePatches, excludePatches;
+
+    if (!args.readListIfPresent<wordRe>("patches", includePatches))
     {
-        const wordRes patchNames(args.getList<wordRe>("patches"));
-
-        if (patchNames.size() == 1 && patchNames.first().isLiteral())
+        if (args.found("patch"))
         {
-            exposedPatchIDs.first() =
-                getExposedPatchId(mesh, patchNames.first());
-        }
-        else
-        {
-            exposedPatchIDs =
-                mesh.boundaryMesh().patchSet(patchNames).sortedToc();
-
-            Info<< "Adding exposed internal faces to nearest of patches "
-                << flatOutput(patchNames) << nl << endl;
-
-            if (exposedPatchIDs.empty())
-            {
-                FatalErrorInFunction
-                    << nl << "No patches matched. Patches: "
-                    << mesh.boundaryMesh().names() << nl
-                    << exit(FatalError);
-            }
+            includePatches.resize(1);
+            includePatches.front() = args.get<word>("patch");
         }
     }
-    else if (args.found("patch"))
+    args.readListIfPresent<wordRe>("exclude-patches", excludePatches);
+
+    if (includePatches.size() == 1 && includePatches.front().isLiteral())
     {
-        exposedPatchIDs.first() =
-            getExposedPatchId(mesh, args.get<word>("patch"));
+        // Select a single patch - no exclude possible
+        exposedPatchIDs.front() =
+            getExposedPatchId(mesh, includePatches.front());
+    }
+    else if (!includePatches.empty())
+    {
+        // Patches selected (sorted order)
+        exposedPatchIDs =
+            mesh.boundaryMesh().indices(includePatches, excludePatches);
+
+        // Only retain initial, non-processor patches
+        const label nNonProcessor
+        (
+            mesh.boundaryMesh().nNonProcessor()
+        );
+
+        forAll(exposedPatchIDs, i)
+        {
+            if (exposedPatchIDs[i] > nNonProcessor)
+            {
+                exposedPatchIDs.resize(i);
+                break;
+            }
+        }
+
+        const wordList allPatchNames(mesh.boundaryMesh().names());
+
+        Info<< "Adding exposed internal faces to nearest of patches:" << nl
+            << "    include: " << flatOutput(includePatches) << nl
+            << "    exclude: " << flatOutput(excludePatches) << nl
+            << nl;
+
+        if (exposedPatchIDs.empty())
+        {
+            FatalErrorInFunction
+                << nl << "No patches matched. Patches: "
+                << flatOutput(allPatchNames) << nl
+                << exit(FatalError);
+        }
     }
     else
     {
@@ -513,7 +494,7 @@ int main(int argc, char *argv[])
 
         Info<< "Using cellSet " << selectionName << nl << endl;
 
-        cellSetPtr = autoPtr<cellSet>::New(mesh, selectionName);
+        cellSetPtr.emplace(mesh, selectionName);
     }
 
 
@@ -531,7 +512,7 @@ int main(int argc, char *argv[])
         if (exposedPatchIDs.size() == 1)
         {
             // Single patch for exposed faces (syncPar)
-            subsetter.reset(selectedCells, exposedPatchIDs.first(), true);
+            subsetter.reset(selectedCells, exposedPatchIDs.front(), true);
         }
         else
         {
@@ -552,54 +533,51 @@ int main(int argc, char *argv[])
             );
         }
 
-        Info<< "Subset "
-            << returnReduce(subsetter.subMesh().nCells(), sumOp<label>())
-            << " of "
-            << returnReduce(mesh.nCells(), sumOp<label>())
+        FixedList<label, 2> cellCount;
+        cellCount[0] = subsetter.subMesh().nCells();
+        cellCount[1] = mesh.nCells();
+        reduce(cellCount, sumOp<label>());
+
+        Info<< "Subset " << cellCount[0] << " of " << cellCount[1]
             << " cells" << nl << nl;
     }
 
 
     IOobjectList objects(mesh, runTime.timeName());
-    HashTable<wordHashSet> availableFields = objects.classes();
+
+
+    // Read fields and subset
+    #undef  createSubsetFields
+    #define createSubsetFields(FieldType, Variable)             \
+    PtrList<FieldType> Variable                                 \
+    (                                                           \
+        subsetFields<FieldType>(subsetter, objects)             \
+    );
 
 
     // Read vol fields and subset
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    PtrList<volScalarField> vScalarFlds;
-    subsetFields(subsetter, availableFields, vScalarFlds);
-
-    PtrList<volVectorField> vVectorFlds;
-    subsetFields(subsetter, availableFields, vVectorFlds);
-
-    PtrList<volSphericalTensorField> vSphTensorFlds;
-    subsetFields(subsetter, availableFields, vSphTensorFlds);
-
-    PtrList<volSymmTensorField> vSymmTensorFlds;
-    subsetFields(subsetter, availableFields, vSymmTensorFlds);
-
-    PtrList<volTensorField> vTensorFlds;
-    subsetFields(subsetter, availableFields, vTensorFlds);
-
+    createSubsetFields(volScalarField, vScalarFlds);
+    createSubsetFields(volVectorField, vVectorFlds);
+    createSubsetFields(volSphericalTensorField, vSphTensorFlds);
+    createSubsetFields(volSymmTensorField, vSymmTensorFlds);
+    createSubsetFields(volTensorField, vTensorFlds);
 
     // Read surface fields and subset
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    createSubsetFields(surfaceScalarField, sScalarFlds);
+    createSubsetFields(surfaceVectorField, sVectorFlds);
+    createSubsetFields(surfaceSphericalTensorField, sSphTensorFlds);
+    createSubsetFields(surfaceSymmTensorField, sSymmTensorFlds);
+    createSubsetFields(surfaceTensorField, sTensorFlds);
 
-    PtrList<surfaceScalarField> sScalarFlds;
-    subsetFields(subsetter, availableFields, sScalarFlds);
-
-    PtrList<surfaceVectorField> sVectorFlds;
-    subsetFields(subsetter, availableFields, sVectorFlds);
-
-    PtrList<surfaceSphericalTensorField> sSphTensorFlds;
-    subsetFields(subsetter, availableFields, sSphTensorFlds);
-
-    PtrList<surfaceSymmTensorField> sSymmTensorFlds;
-    subsetFields(subsetter, availableFields, sSymmTensorFlds);
-
-    PtrList<surfaceTensorField> sTensorFlds;
-    subsetFields(subsetter, availableFields, sTensorFlds);
+    // Read dimensioned fields and subset
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    createSubsetFields(volScalarField::Internal, dScalarFlds);
+    createSubsetFields(volVectorField::Internal, dVectorFlds);
+    createSubsetFields(volSphericalTensorField::Internal, dSphTensorFlds);
+    createSubsetFields(volSymmTensorField::Internal, dSymmTensorFlds);
+    createSubsetFields(volTensorField::Internal, dTensorFlds);
 
 
     // Read point fields and subset
@@ -607,39 +585,20 @@ int main(int argc, char *argv[])
 
     const pointMesh& pMesh = pointMesh::New(mesh);
 
-    PtrList<pointScalarField> pScalarFlds;
-    subsetPointFields(subsetter, pMesh, availableFields, pScalarFlds);
+    #undef  createSubsetFields
+    #define createSubsetFields(FieldType, Variable)             \
+    PtrList<FieldType> Variable                                 \
+    (                                                           \
+        subsetFields<FieldType>(subsetter, objects, pMesh)      \
+    );
 
-    PtrList<pointVectorField> pVectorFlds;
-    subsetPointFields(subsetter, pMesh, availableFields, pVectorFlds);
+    createSubsetFields(pointScalarField, pScalarFlds);
+    createSubsetFields(pointVectorField, pVectorFlds);
+    createSubsetFields(pointSphericalTensorField, pSphTensorFlds);
+    createSubsetFields(pointSymmTensorField, pSymmTensorFlds);
+    createSubsetFields(pointTensorField, pTensorFlds);
 
-    PtrList<pointSphericalTensorField> pSphTensorFlds;
-    subsetPointFields(subsetter, pMesh, availableFields, pSphTensorFlds);
-
-    PtrList<pointSymmTensorField> pSymmTensorFlds;
-    subsetPointFields(subsetter, pMesh, availableFields, pSymmTensorFlds);
-
-    PtrList<pointTensorField> pTensorFlds;
-    subsetPointFields(subsetter, pMesh, availableFields, pTensorFlds);
-
-
-    // Read dimensioned fields and subset
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    PtrList<volScalarField::Internal> dScalarFlds;
-    subsetDimensionedFields(subsetter, availableFields, dScalarFlds);
-
-    PtrList<volVectorField::Internal> dVectorFlds;
-    subsetDimensionedFields(subsetter, availableFields, dVectorFlds);
-
-    PtrList<volSphericalTensorField::Internal> dSphTensorFlds;
-    subsetDimensionedFields(subsetter, availableFields, dSphTensorFlds);
-
-    PtrList<volSymmTensorField::Internal> dSymmTensorFlds;
-    subsetDimensionedFields(subsetter, availableFields, dSymmTensorFlds);
-
-    PtrList<volTensorField::Internal> dTensorFlds;
-    subsetDimensionedFields(subsetter, availableFields, dTensorFlds);
+    #undef createSubsetFields
 
 
     // Read topoSets and subset
@@ -719,13 +678,6 @@ int main(int argc, char *argv[])
     for (const auto& fld : sSymmTensorFlds) { fld.write(); }
     for (const auto& fld : sTensorFlds)     { fld.write(); }
 
-    // Point fields
-    for (const auto& fld : pScalarFlds)     { fld.write(); }
-    for (const auto& fld : pVectorFlds)     { fld.write(); }
-    for (const auto& fld : pSphTensorFlds)  { fld.write(); }
-    for (const auto& fld : pSymmTensorFlds) { fld.write(); }
-    for (const auto& fld : pTensorFlds)     { fld.write(); }
-
     // Dimensioned fields
     for (const auto& fld : dScalarFlds)     { fld.write(); }
     for (const auto& fld : dVectorFlds)     { fld.write(); }
@@ -733,6 +685,13 @@ int main(int argc, char *argv[])
     for (const auto& fld : dSymmTensorFlds) { fld.write(); }
     for (const auto& fld : dTensorFlds)     { fld.write(); }
 
+    // Point fields
+    for (const auto& fld : pScalarFlds)     { fld.write(); }
+    for (const auto& fld : pVectorFlds)     { fld.write(); }
+    for (const auto& fld : pSphTensorFlds)  { fld.write(); }
+    for (const auto& fld : pSymmTensorFlds) { fld.write(); }
+    for (const auto& fld : pTensorFlds)     { fld.write(); }
+
     Info<< "\nEnd\n" << endl;
 
     return 0;

applications/utilities/miscellaneous/foamDictionary/foamDictionary.C

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016-2017 OpenFOAM Foundation
-    Copyright (C) 2017-2022 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -78,23 +78,23 @@ Usage
 
       - Change solver:
         \verbatim
-           foamDictionary system/fvSolution -entry solvers.p.solver -set PCG
+           foamDictionary system/fvSolution -entry solvers/p/solver -set PCG
         \endverbatim
 
       - Print bc type:
         \verbatim
-           foamDictionary 0/U -entry boundaryField.movingWall.type
+           foamDictionary 0/U -entry boundaryField/movingWall/type
         \endverbatim
 
       - Change bc parameter:
         \verbatim
-           foamDictionary 0/U -entry boundaryField.movingWall.value \
+           foamDictionary 0/U -entry boundaryField/movingWall/value \
              -set "uniform (2 0 0)"
         \endverbatim
 
       - Change whole bc type:
         \verbatim
-          foamDictionary 0/U -entry boundaryField.movingWall \
+          foamDictionary 0/U -entry boundaryField/movingWall \
             -set "{type uniformFixedValue; uniformValue (2 0 0);}"
         \endverbatim
 
@@ -113,7 +113,7 @@ Usage
       - Change patch type:
         \verbatim
           foamDictionary constant/polyMesh/boundary \
-            -entry entry0.fixedWalls.type -set patch
+            -entry entry0/fixedWalls/type -set patch
         \endverbatim
         This uses special parsing of Lists which stores these in the
         dictionary with keyword 'entryDDD' where DDD is the position
@@ -140,21 +140,31 @@ using namespace Foam;
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-//- Convert older ':' scope syntax to newer '.' scope syntax,
+//- Convert very old ':' scope syntax to less old '.' scope syntax,
 //  but leave anything with '/' delimiters untouched
 bool upgradeScope(word& entryName)
 {
-    if (!entryName.contains('/') && entryName.contains(':'))
+    if (entryName.contains(':') && !entryName.contains('/'))
     {
-        const wordList names(fileName(entryName).components(':'));
+        InfoErr
+            << "Warning: upgrading very old ':' scope syntax: \""
+            << entryName << '"' << endl;
 
-        entryName.resize(0);
+        // Make copy - cannot use stringOps::split
+        const wordList cmpts(fileName(entryName).components(':'));
 
-        for (const word& name : names)
+        entryName.clear();
+
+        bool addSep = false;
+
+        for (const word& cmpt : cmpts)
         {
-            if (entryName.size()) entryName.append(".");
-
-            entryName.append(name);
+            if (addSep) entryName += '.';
+            if (!cmpt.empty())
+            {
+                addSep = true;
+                entryName += cmpt;
+            }
         }
 
         return true;
@@ -176,12 +186,12 @@ public:
     dictAndKeyword(const word& scopedName)
     {
         auto i = scopedName.rfind('/');
-        if (i == string::npos)
+        if (i == std::string::npos)
         {
             i = scopedName.rfind('.');
         }
 
-        if (i != string::npos)
+        if (i != std::string::npos)
         {
             dict_ = scopedName.substr(0, i);
             key_  = scopedName.substr(i+1);
@@ -192,15 +202,9 @@ public:
         }
     }
 
-    inline const word& dict() const
-    {
-        return dict_;
-    }
+    const word& dict() const noexcept { return dict_; }
 
-    inline const word& key() const
-    {
-        return key_;
-    }
+    const word& key() const noexcept { return key_; }
 };
 
 
@@ -347,10 +351,7 @@ int main(int argc, char *argv[])
     if (disableEntries)
     {
         // Report on stderr (once) to avoid polluting the output
-        if (Pstream::master())
-        {
-            Serr<< "Not expanding variables or dictionary directives" << endl;
-        }
+        InfoErr<< "Not expanding variables or dictionary directives" << endl;
         entry::disableFunctionEntries = true;
     }
 
@@ -359,11 +360,7 @@ int main(int argc, char *argv[])
         const unsigned prec = args.getOrDefault<unsigned>("precision", 0u);
         if (prec)
         {
-            // if (Pstream::master())
-            // {
-            //     Serr<< "Output write precision set to " << prec << endl;
-            // }
-
+            // InfoErr<< "Output write precision set to " << prec << endl;
             IOstream::defaultPrecision(prec);
             Sout.precision(prec);
         }
@@ -479,12 +476,12 @@ int main(int argc, char *argv[])
             }
             changed = true;
 
-            // Print the changed entry
             const auto finder = dict.csearchScoped(scopedName, keyType::REGEX);
 
+            // Print the changed entry to stderr
             if (finder.good())
             {
-                Info<< finder.ref();
+                InfoErr<< finder.ref();
             }
         }
         else if (args.found("remove"))
@@ -539,6 +536,7 @@ int main(int argc, char *argv[])
             }
             else if (args.found("keywords"))
             {
+                // Report keywords to stdout
                 for (const entry& e : finder.dict())
                 {
                     Info<< e.keyword() << endl;
@@ -546,32 +544,36 @@ int main(int argc, char *argv[])
             }
             else if (args.found("value"))
             {
+                // Report value to stdout
                 if (finder.isDict())
                 {
                     Info<< finder.dict();
                 }
                 else if (finder.ref().isStream())
                 {
+                    bool addSep = false;
+
                     const tokenList& tokens = finder.ref().stream();
-                    forAll(tokens, i)
+
+                    for (const token& tok : tokens)
                     {
-                        Info<< tokens[i];
-                        if (i < tokens.size() - 1)
-                        {
-                            Info<< token::SPACE;
-                        }
+                        if (addSep) Info<< token::SPACE;
+                        addSep = true;
+                        Info<< tok;
                     }
                     Info<< endl;
                 }
             }
             else
             {
+                // Report entry to stdout
                 Info<< finder.ref();
             }
         }
     }
     else if (args.found("keywords"))
     {
+        // Report keywords to stdout
         for (const entry& e : dict)
         {
             Info<< e.keyword() << endl;
@@ -579,11 +581,13 @@ int main(int argc, char *argv[])
     }
     else if (optDiff)
     {
+        // Report difference to stdout
         removeDict(dict, diffDict);
         dict.write(Info, false);
     }
     else
     {
+        // Report dictionary to stdout
         dict.write(Info, false);
     }
 

applications/utilities/miscellaneous/foamHelp/helpTypes/helpBoundary/helpBoundary.C

@@ -92,8 +92,8 @@ void Foam::helpTypes::helpBoundary::execute
 {
     setEnv("FOAM_ABORT", "", true);
 
-    word condition(word::null);
-    word fieldName(word::null);
+    word condition;
+    word fieldName;
 
     if (args.readIfPresent("browse", condition))
     {

applications/utilities/miscellaneous/foamHelp/helpTypes/helpFunctionObject/helpFunctionObject.C

@@ -72,7 +72,7 @@ void Foam::helpTypes::helpFunctionObject::execute
     const fvMesh& mesh
 )
 {
-    word function(word::null);
+    word function;
 
     if (args.readIfPresent("browse", function))
     {

applications/utilities/miscellaneous/foamHelp/helpTypes/helpSolver/helpSolver.C

@@ -80,7 +80,7 @@ void Foam::helpTypes::helpSolver::execute
     const fvMesh& mesh
 )
 {
-    word solver(word::null);
+    word solver;
 
     if (args.readIfPresent("browse", solver))
     {

applications/utilities/miscellaneous/patchSummary/patchSummary.C

@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -89,50 +90,41 @@ int main(int argc, char *argv[])
                 << endl;
         }
 
-        const wordList objNames
-        (
-            IOobjectList(mesh, runTime.timeName()).sortedNames()
+        const IOobjectList objects(mesh, runTime.timeName());
+
+        Info<< "Reading fields:" << endl;
+
+        // Read fields
+        #undef  createFields
+        #define createFields(FieldType, Variable)                   \
+        PtrList<FieldType> Variable                                 \
+        (                                                           \
+            readFields<FieldType>(objects, mesh)                    \
         );
 
-        PtrList<volScalarField> vsf(objNames.size());
-        PtrList<volVectorField> vvf(objNames.size());
-        PtrList<volSphericalTensorField> vsptf(objNames.size());
-        PtrList<volSymmTensorField> vsytf(objNames.size());
-        PtrList<volTensorField> vtf(objNames.size());
+        createFields(volScalarField, vsf);
+        createFields(volVectorField, vvf);
+        createFields(volSphericalTensorField, vsptf);
+        createFields(volSymmTensorField, vsytf);
+        createFields(volTensorField, vtf);
 
-        PtrList<pointScalarField> psf(objNames.size());
-        PtrList<pointVectorField> pvf(objNames.size());
-        PtrList<pointSphericalTensorField> psptf(objNames.size());
-        PtrList<pointSymmTensorField> psytf(objNames.size());
-        PtrList<pointTensorField> ptf(objNames.size());
+        // Point fields
+        const pointMesh& pMesh = pointMesh::New(mesh);
 
-        Info<< "Valid fields:" << endl;
+        #undef  createFields
+        #define createFields(FieldType, Variable)                   \
+        PtrList<FieldType> Variable                                 \
+        (                                                           \
+            readFields<FieldType>(objects, pMesh)                   \
+        );
 
-        forAll(objNames, objI)
-        {
-            IOobject obj
-            (
-                objNames[objI],
-                runTime.timeName(),
-                mesh,
-                IOobject::MUST_READ
-            );
+        createFields(pointScalarField, psf);
+        createFields(pointVectorField, pvf);
+        createFields(pointSphericalTensorField, psptf);
+        createFields(pointSymmTensorField, psytf);
+        createFields(pointTensorField, ptf);
 
-            if (obj.typeHeaderOk<volScalarField>(false))
-            {
-                addToFieldList(vsf, obj, objI, mesh);
-                addToFieldList(vvf, obj, objI, mesh);
-                addToFieldList(vsptf, obj, objI, mesh);
-                addToFieldList(vsytf, obj, objI, mesh);
-                addToFieldList(vtf, obj, objI, mesh);
-
-                addToFieldList(psf, obj, objI, pointMesh::New(mesh));
-                addToFieldList(pvf, obj, objI, pointMesh::New(mesh));
-                addToFieldList(psptf, obj, objI, pointMesh::New(mesh));
-                addToFieldList(psytf, obj, objI, pointMesh::New(mesh));
-                addToFieldList(ptf, obj, objI, pointMesh::New(mesh));
-            }
-        }
+        #undef createFields
 
         Info<< endl;
 
@@ -144,6 +136,7 @@ int main(int argc, char *argv[])
             forAll(bm, patchi)
             {
                 Info<< bm[patchi].type() << "\t: " << bm[patchi].name() << nl;
+
                 outputFieldList(vsf, patchi);
                 outputFieldList(vvf, patchi);
                 outputFieldList(vsptf, patchi);
@@ -167,6 +160,7 @@ int main(int argc, char *argv[])
             DynamicList<HashTable<word>> fieldToTypes(bm.size());
             // Per 'group' the patches
             DynamicList<DynamicList<label>> groupToPatches(bm.size());
+
             forAll(bm, patchi)
             {
                 HashTable<word> fieldToType;
@@ -208,40 +202,39 @@ int main(int argc, char *argv[])
                     labelHashSet nonGroupPatches;
                     bm.matchGroups(patchIDs, groups, nonGroupPatches);
 
-                    const labelList sortedPatches(nonGroupPatches.sortedToc());
-                    forAll(sortedPatches, i)
+                    for (const label patchi : nonGroupPatches.sortedToc())
                     {
-                        Info<< bm[sortedPatches[i]].type()
-                            << "\t: " << bm[sortedPatches[i]].name() << nl;
+                        Info<< bm[patchi].type()
+                            << "\t: " << bm[patchi].name() << nl;
                     }
-                    if (groups.size())
+                    for (const word& groupName : groups)
                     {
-                        forAll(groups, i)
-                        {
-                            Info<< "group\t: " << groups[i] << nl;
-                        }
+                        Info<< "group\t: " << groupName << nl;
                     }
-                    outputFieldList(vsf, patchIDs[0]);
-                    outputFieldList(vvf, patchIDs[0]);
-                    outputFieldList(vsptf, patchIDs[0]);
-                    outputFieldList(vsytf, patchIDs[0]);
-                    outputFieldList(vtf, patchIDs[0]);
 
-                    outputFieldList(psf, patchIDs[0]);
-                    outputFieldList(pvf, patchIDs[0]);
-                    outputFieldList(psptf, patchIDs[0]);
-                    outputFieldList(psytf, patchIDs[0]);
-                    outputFieldList(ptf, patchIDs[0]);
+                    const label patchi = patchIDs[0];
+
+                    outputFieldList(vsf, patchi);
+                    outputFieldList(vvf, patchi);
+                    outputFieldList(vsptf, patchi);
+                    outputFieldList(vsytf, patchi);
+                    outputFieldList(vtf, patchi);
+
+                    outputFieldList(psf, patchi);
+                    outputFieldList(pvf, patchi);
+                    outputFieldList(psptf, patchi);
+                    outputFieldList(psytf, patchi);
+                    outputFieldList(ptf, patchi);
                     Info<< endl;
                 }
                 else
                 {
                     // No group.
-                    forAll(patchIDs, i)
+                    for (const label patchi : patchIDs)
                     {
-                        label patchi = patchIDs[i];
                         Info<< bm[patchi].type()
                             << "\t: " << bm[patchi].name() << nl;
+
                         outputFieldList(vsf, patchi);
                         outputFieldList(vvf, patchi);
                         outputFieldList(vsptf, patchi);

applications/utilities/miscellaneous/patchSummary/patchSummaryTemplates.C

@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -31,30 +32,49 @@ License
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class GeoField>
-void Foam::addToFieldList
+Foam::PtrList<GeoField> Foam::readFields
 (
-    PtrList<GeoField>& fieldList,
-    const IOobject& obj,
-    const label fieldi,
+    const IOobjectList& objects,
     const typename GeoField::Mesh& mesh
 )
 {
-    if (obj.isHeaderClass<GeoField>())
+    const UPtrList<const IOobject> fieldObjects
+    (
+        objects.csorted<GeoField>()
+    );
+
+    PtrList<GeoField> fields(fieldObjects.size());
+
+    label nFields = 0;
+    for (const IOobject& io : fieldObjects)
     {
-        fieldList.set
-        (
-            fieldi,
-            new GeoField(obj, mesh)
-        );
-        Info<< "    " << GeoField::typeName << tab << obj.name() << endl;
+        if (!nFields)
+        {
+            Info<< "    " << GeoField::typeName << " (";
+        }
+        else
+        {
+            Info<< ' ';
+        }
+        Info<< io.name();
+
+        fields.emplace_set(nFields, io, mesh);
+        ++nFields;
     }
+
+    if (nFields)
+    {
+        Info<< ')' << nl;
+    }
+
+    return fields;
 }
 
 
 template<class GeoField>
 void Foam::outputFieldList
 (
-    const PtrList<GeoField>& fieldList,
+    const UPtrList<GeoField>& fieldList,
     const label patchi
 )
 {
@@ -74,7 +94,7 @@ void Foam::outputFieldList
 template<class GeoField>
 void Foam::collectFieldList
 (
-    const PtrList<GeoField>& fieldList,
+    const UPtrList<GeoField>& fieldList,
     const label patchi,
     HashTable<word>& fieldToType
 )

applications/utilities/miscellaneous/patchSummary/patchSummaryTemplates.H

@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -25,39 +26,39 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef patchSummaryTemplates_H
-#define patchSummaryTemplates_H
+#ifndef Foam_patchSummaryTemplates_H
+#define Foam_patchSummaryTemplates_H
 
-#include "fvCFD.H"
 #include "volFields.H"
+#include "IOobjectList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-    template<class GeoField>
-    void addToFieldList
-    (
-        PtrList<GeoField>& fieldList,
-        const IOobject& obj,
-        const label fieldi,
-        const typename GeoField::Mesh& mesh
-    );
 
-    template<class GeoField>
-    void outputFieldList
-    (
-        const PtrList<GeoField>& fieldList,
-        const label patchi
-    );
+template<class GeoField>
+PtrList<GeoField> readFields
+(
+    const IOobjectList& objects,
+    const typename GeoField::Mesh& mesh
+);
+
+template<class GeoField>
+void outputFieldList
+(
+    const UPtrList<GeoField>& fieldList,
+    const label patchi
+);
+
+template<class GeoField>
+void collectFieldList
+(
+    const UPtrList<GeoField>& fieldList,
+    const label patchi,
+    HashTable<word>& fieldToType
+);
 
-    template<class GeoField>
-    void collectFieldList
-    (
-        const PtrList<GeoField>& fieldList,
-        const label patchi,
-        HashTable<word>& fieldToType
-    );
 } // End namespace Foam
 
 

applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2019-2022 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -186,26 +186,17 @@ bool Foam::domainDecomposition::writeDecomposition(const bool decomposeSets)
     {
         // Read sets
         IOobjectList objects(*this, facesInstance(), "polyMesh/sets");
+        for (const IOobject& io : objects.csorted<cellSet>())
         {
-            IOobjectList sets(objects.lookupClass<cellSet>());
-            forAllConstIters(sets, iter)
-            {
-                cellSets.append(new cellSet(*(iter.val())));
-            }
+            cellSets.emplace_back(io);
         }
+        for (const IOobject& io : objects.csorted<faceSet>())
         {
-            IOobjectList sets(objects.lookupClass<faceSet>());
-            forAllConstIters(sets, iter)
-            {
-                faceSets.append(new faceSet(*(iter.val())));
-            }
+            faceSets.emplace_back(io);
         }
+        for (const IOobject& io : objects.csorted<pointSet>())
         {
-            IOobjectList sets(objects.lookupClass<pointSet>());
-            forAllConstIters(sets, iter)
-            {
-                pointSets.append(new pointSet(*(iter.val())));
-            }
+            pointSets.emplace_back(io);
         }
     }
 
@@ -219,9 +210,9 @@ bool Foam::domainDecomposition::writeDecomposition(const bool decomposeSets)
             facesInstance(),
             polyMesh::meshSubDir,
             *this,
-            IOobject::READ_IF_PRESENT,
-            IOobject::NO_WRITE,
-            IOobject::NO_REGISTER
+            IOobjectOption::READ_IF_PRESENT,
+            IOobjectOption::NO_WRITE,
+            IOobjectOption::NO_REGISTER
         )
     );
 

applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2015-2022 OpenCFD Ltd.
+    Copyright (C) 2015-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -597,19 +597,19 @@ int main(int argc, char *argv[])
                         polyMesh::meshSubDir/"sets"
                     );
 
-                    for (const word& setName : objects.sortedNames<cellSet>())
+                    for (const IOobject& io : objects.csorted<cellSet>())
                     {
-                        cSetNames.insert(setName, cSetNames.size());
+                        cSetNames.insert(io.name(), cSetNames.size());
                     }
 
-                    for (const word& setName : objects.sortedNames<faceSet>())
+                    for (const IOobject& io : objects.csorted<faceSet>())
                     {
-                        fSetNames.insert(setName, fSetNames.size());
+                        fSetNames.insert(io.name(), fSetNames.size());
                     }
 
-                    for (const word& setName : objects.sortedNames<pointSet>())
+                    for (const IOobject& io : objects.csorted<pointSet>())
                     {
-                        pSetNames.insert(setName, pSetNames.size());
+                        pSetNames.insert(io.name(), pSetNames.size());
                     }
                 }
 
@@ -653,7 +653,7 @@ int main(int argc, char *argv[])
                         const labelList& cellMap =
                             procMeshes.cellProcAddressing()[proci];
 
-                        for (const IOobject& io : objects.sorted<cellSet>())
+                        for (const IOobject& io : objects.csorted<cellSet>())
                         {
                             // Load cellSet
                             const cellSet procSet(io);
@@ -684,7 +684,7 @@ int main(int argc, char *argv[])
                         const labelList& faceMap =
                             procMeshes.faceProcAddressing()[proci];
 
-                        for (const IOobject& io : objects.sorted<faceSet>())
+                        for (const IOobject& io : objects.csorted<faceSet>())
                         {
                             // Load faceSet
                             const faceSet procSet(io);
@@ -714,7 +714,7 @@ int main(int argc, char *argv[])
                         const labelList& pointMap =
                             procMeshes.pointProcAddressing()[proci];
 
-                        for (const IOobject& io : objects.sorted<pointSet>())
+                        for (const IOobject& io : objects.csorted<pointSet>())
                         {
                             // Load pointSet
                             const pointSet procSet(io);

applications/utilities/parallelProcessing/redistributePar/parFvFieldDistributorTemplates.C

@@ -405,20 +405,20 @@ Foam::label Foam::parFvFieldDistributor::distributeInternalFields
 {
     typedef DimensionedField<Type, volMesh> fieldType;
 
-    // Available fields, sorted order
-    const wordList fieldNames =
-    (
-        selectedFields.empty()
-      ? objects.sortedNames<fieldType>()
-      : objects.sortedNames<fieldType>(selectedFields)
-    );
-
     label nFields = 0;
-    for (const word& fieldName : fieldNames)
+    for
+    (
+        const IOobject& io :
+        (
+            selectedFields.empty()
+          ? objects.csorted<fieldType>()
+          : objects.csorted<fieldType>(selectedFields)
+        )
+    )
     {
-        if ("cellDist" == fieldName)
+        if ("cellDist" == io.name())
         {
-            // There is an odd chance this is an internal field
+            // Ignore cellDist (internal or volume) field
             continue;
         }
         if (verbose_)
@@ -428,13 +428,13 @@ Foam::label Foam::parFvFieldDistributor::distributeInternalFields
                 Info<< "    Reconstructing "
                     << fieldType::typeName << "s\n" << nl;
             }
-            Info<< "        " << fieldName << nl;
+            Info<< "        " << io.name() << nl;
         }
         ++nFields;
 
         tmp<fieldType> tfld
         (
-            distributeInternalField<Type>(*(objects[fieldName]))
+            distributeInternalField<Type>(io)
         );
 
         if (isWriteProc_.good())
@@ -470,19 +470,20 @@ Foam::label Foam::parFvFieldDistributor::distributeVolumeFields
 {
     typedef GeometricField<Type, fvPatchField, volMesh> fieldType;
 
-    // Available fields, sorted order
-    const wordList fieldNames =
-    (
-        selectedFields.empty()
-      ? objects.sortedNames<fieldType>()
-      : objects.sortedNames<fieldType>(selectedFields)
-    );
-
     label nFields = 0;
-    for (const word& fieldName : fieldNames)
+    for
+    (
+        const IOobject& io :
+        (
+            selectedFields.empty()
+          ? objects.csorted<fieldType>()
+          : objects.csorted<fieldType>(selectedFields)
+        )
+    )
     {
-        if ("cellDist" == fieldName)
+        if ("cellDist" == io.name())
         {
+            // Ignore cellDist (internal or volume) field
             continue;
         }
         if (verbose_)
@@ -492,13 +493,13 @@ Foam::label Foam::parFvFieldDistributor::distributeVolumeFields
                 Info<< "    Reconstructing "
                     << fieldType::typeName << "s\n" << nl;
             }
-            Info<< "        " << fieldName << nl;
+            Info<< "        " << io.name() << nl;
         }
         ++nFields;
 
         tmp<fieldType> tfld
         (
-            distributeVolumeField<Type>(*(objects[fieldName]))
+            distributeVolumeField<Type>(io)
         );
 
         if (isWriteProc_.good())
@@ -534,16 +535,16 @@ Foam::label Foam::parFvFieldDistributor::distributeSurfaceFields
 {
     typedef GeometricField<Type, fvsPatchField, surfaceMesh> fieldType;
 
-    // Available fields, sorted order
-    const wordList fieldNames =
-    (
-        selectedFields.empty()
-      ? objects.sortedNames<fieldType>()
-      : objects.sortedNames<fieldType>(selectedFields)
-    );
-
     label nFields = 0;
-    for (const word& fieldName : fieldNames)
+    for
+    (
+        const IOobject& io :
+        (
+            selectedFields.empty()
+          ? objects.csorted<fieldType>()
+          : objects.csorted<fieldType>(selectedFields)
+        )
+    )
     {
         if (verbose_)
         {
@@ -552,13 +553,13 @@ Foam::label Foam::parFvFieldDistributor::distributeSurfaceFields
                 Info<< "    Reconstructing "
                     << fieldType::typeName << "s\n" << nl;
             }
-            Info<< "        " << fieldName << nl;
+            Info<< "        " << io.name() << nl;
         }
         ++nFields;
 
         tmp<fieldType> tfld
         (
-            distributeSurfaceField<Type>(*(objects[fieldName]))
+            distributeSurfaceField<Type>(io)
         );
 
         if (isWriteProc_.good())

applications/utilities/parallelProcessing/redistributePar/parLagrangianDistributor.C

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2015 OpenFOAM Foundation
-    Copyright (C) 2015-2022 OpenCFD Ltd.
+    Copyright (C) 2015-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -82,7 +82,7 @@ void Foam::parLagrangianDistributor::findClouds
         )
     );
 
-    cloudNames.setSize(localCloudDirs.size());
+    cloudNames.resize_nocopy(localCloudDirs.size());
     forAll(localCloudDirs, i)
     {
         cloudNames[i] = localCloudDirs[i];
@@ -144,10 +144,10 @@ Foam::parLagrangianDistributor::distributeLagrangianPositions
 
     const label oldLpi = lpi.size();
 
-    labelListList subMap;
+    labelListList sendMap;
 
-    // Allocate transfer buffers
-    PstreamBuffers pBufs(Pstream::commsTypes::nonBlocking);
+    // Transfer buffers
+    PstreamBuffers pBufs(UPstream::commsTypes::nonBlocking);
 
     {
         // List of lists of particles to be transferred for all of the
@@ -173,7 +173,7 @@ Foam::parLagrangianDistributor::distributeLagrangianPositions
 
 
         // Per processor the indices of the particles to send
-        subMap = invertOneToMany(Pstream::nProcs(), destProc);
+        sendMap = invertOneToMany(UPstream::nProcs(), destProc);
 
 
         // Stream into send buffers
@@ -282,29 +282,12 @@ Foam::parLagrangianDistributor::distributeLagrangianPositions
         lpi.rename(cloudName);
     }
 
-    // Until now (FEB-2023) we have always used processor ordering for the
-    // construct map (whereas mapDistribute has local transfers first),
-    // so we'll stick with that for now, but can likely just use the subMap
-    // directly with mapDistribute and have it determine the constructMap.
-
-    labelList recvSizes;
-    Pstream::exchangeSizes(subMap, recvSizes);
-
-    label constructSize = 0;
-    labelListList constructMap(Pstream::nProcs());
-
-    forAll(constructMap, proci)
-    {
-        const label len = recvSizes[proci];
-        constructMap[proci] = identity(len, constructSize);
-        constructSize += len;
-    }
 
+    // The constructMap is in linear (processor) order
     return autoPtr<mapDistributeBase>::New
     (
-        constructSize,
-        std::move(subMap),
-        std::move(constructMap)
+        mapDistributeBase::layoutTypes::linear,
+        std::move(sendMap)
     );
 }