ENH: improve OpenFOAM I/O for std::vector container

- input: added support (similar to DynamicList)
- output: redirect through UList output, which enables binary etc

- these changes enable support for broadcast and other parallel IO
  for std::vector

ENH: support SubList of std::vector (entire length)

- allows a 'glue' layer for re-casting std::vector to UList etc

CONTRIBUTORS.md

@@ -5,17 +5,22 @@ It is likely incomplete...
 
 ## Contributors (alphabetical by surname)
 
+- Horacio Aguerre
+- Yu Ankun
 - Tetsuo Aoyagi
 - Akira Azami
 - William Bainbridge
 - Gabriel Barajas
 - Kutalmis Bercin
+- Julius Bergmann
 - Ivor Clifford
 - Greg Collecutt
 - Jonathan Cranford
+- Santiago Marquez Damian
 - Sergio Ferraris
 - Matej Forman
 - Marian Fuchs
+- Gabriel Gerlero
 - Pawan Ghildiyal
 - Chris Greenshields
 - Bernhard Gschaider
@@ -50,8 +55,11 @@ It is likely incomplete...
 - Gavin Tabor
 - Zeljko Tukovic
 - Eugene De Villiers
+- Louis Vittoz
+- Vuko Vukcevic
 - Yi Wang
 - Norbert Weber
+- Volker Weissmann
 - Henry Weller
 - Niklas Wikstrom
 - Guanyang Xue

META-INFO/api-info

@@ -1,2 +1,2 @@
-api=2306
+api=2307
 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/Make/files

@@ -1,5 +1,5 @@
 derivedFvPatchFields/turbulentTemperatureTwoPhaseRadCoupledMixed/turbulentTemperatureTwoPhaseRadCoupledMixedFvPatchScalarField.C
-../solid/solidRegionDiffNo.C
+solid/solidRegionDiffNo.C
 chtMultiRegionTwoPhaseEulerFoam.C
 
 EXE = $(FOAM_APPBIN)/chtMultiRegionTwoPhaseEulerFoam

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/chtMultiRegionTwoPhaseEulerFoam/solid/solidRegionDiffNo.C

@@ -0,0 +1 @@
+../../solid/solidRegionDiffNo.C

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/solvers/stressAnalysis/solidDisplacementFoam/tractionDisplacement/tractionDisplacementFvPatchVectorField.C

@@ -47,7 +47,7 @@ tractionDisplacementFvPatchVectorField
     traction_(p.size(), Zero),
     pressure_(p.size(), Zero)
 {
-    fvPatchField<vector>::patchInternalField(*this);
+    extrapolateInternal();
     gradient() = Zero;
 }
 
@@ -79,7 +79,7 @@ tractionDisplacementFvPatchVectorField
     traction_("traction", dict, p.size()),
     pressure_("pressure", dict, p.size())
 {
-    fvPatchField<vector>::patchInternalField(*this);
+    extrapolateInternal();
     gradient() = Zero;
 }
 

applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/tractionDisplacementCorrection/tractionDisplacementCorrectionFvPatchVectorField.C

@@ -47,7 +47,7 @@ tractionDisplacementCorrectionFvPatchVectorField
     traction_(p.size(), Zero),
     pressure_(p.size(), Zero)
 {
-    fvPatchField<vector>::patchInternalField(*this);
+    extrapolateInternal();
     gradient() = Zero;
 }
 
@@ -79,7 +79,7 @@ tractionDisplacementCorrectionFvPatchVectorField
     traction_("traction", dict, p.size()),
     pressure_("pressure", dict, p.size())
 {
-    fvPatchField<vector>::patchInternalField(*this);
+    extrapolateInternal();
     gradient() = Zero;
 }
 

applications/test/00-dummy/library/mpi/dummyMpiLib.cpp

@@ -27,6 +27,14 @@ License
 
 #include "dummyLib.H"
 #include <iostream>
+
+// Include MPI without any C++ bindings
+#ifndef MPICH_SKIP_MPICXX
+#define MPICH_SKIP_MPICXX
+#endif
+#ifndef OMPI_SKIP_MPICXX
+#define OMPI_SKIP_MPICXX
+#endif
 #include <mpi.h>
 
 // * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * * //

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/Function1/case1/constant/function1Properties

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/

applications/test/Function1/case1/system/controlDict

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/

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/Hashing2/hashingTests

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/

applications/test/ICharStream1/Make/files

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

applications/test/ICharStream1/Test-ICharStream1.C

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2017-2018 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -27,14 +27,46 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#include "ListStream.H"
-#include "UListStream.H"
+#include "SpanStream.H"
 #include "wordList.H"
 #include "IOstreams.H"
 #include "argList.H"
 
+#include <cctype>
+#include <cstdio>
+
 using namespace Foam;
 
+Ostream& writeList(Ostream& os, const UList<char>& list)
+{
+    char buf[4];
+    os << list.size() << '(';
+    for (const char c : list)
+    {
+        if (isprint(c))
+        {
+            os << c;
+        }
+        else if (c == '\t')
+        {
+            os << "\\t";
+        }
+        else if (c == '\n')
+        {
+            os << "\\n";
+        }
+        else
+        {
+            ::snprintf(buf, 4, "%02X", c);
+            os << "\\x" << buf;
+        }
+    }
+    os << ')';
+
+    return os;
+}
+
+
 Ostream& toString(Ostream& os, const UList<char>& list)
 {
     os << '"';
@@ -93,7 +125,7 @@ int main(int argc, char *argv[])
     // Buffer storage
     DynamicList<char> storage(16);
 
-    OListStream obuf(std::move(storage));
+    OCharStream obuf(std::move(storage));
     obuf << 1002 << " " << "abcd" << " " << "def" << " " << 3.14159 << ";\n";
 
     // Move contents to output buffer
@@ -104,9 +136,9 @@ int main(int argc, char *argv[])
 
     Info<< "transfer contents to a List" << endl;
 
-    IListStream ibuf;
+    ICharStream ibuf;
 
-    // Reclaim data storage from OListStream -> IListStream
+    // Reclaim data storage from OCharStream -> ICharStream
     {
         List<char> data;
         obuf.swap(data);
@@ -161,6 +193,43 @@ int main(int argc, char *argv[])
     Info<<nl << "swapped out:";
     printInfo(newvalues);
 
+    {
+        iliststream is(std::move(newvalues));
+
+        char c = 0;
+
+        Info<< nl
+            << "getting values from iliststream of "
+            << is.list() << endl;
+
+        // Info<< " (" << is.tellg() << " " << is.remaining() << ")";
+        // Info<< "get:";
+        while (is.get(c))
+        {
+            Info<< ' ' << c;
+            // Info<< " (" << is.tellg() << " " << is.remaining() << ")";
+        }
+        Info<< " - end" << nl;
+
+        // Info<< "remaining: " << is.list() << endl;
+        // Info<< "remaining: " << is.remaining() << endl;
+
+        // Manipulate the list view
+        {
+            UList<char> chars(is.list());
+            Foam::reverse(chars);
+        }
+
+        is.rewind();
+
+        Info<< "get:";
+        while (is.get(c))
+        {
+            Info<< ' ' << c;
+        }
+        Info<< " - end" << nl;
+    }
+
     Info<< "\nEnd\n" << endl;
 
     return 0;

applications/test/IFstream/Test-IFstream.C

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -33,6 +33,7 @@ Description
 
 #include "argList.H"
 #include "Fstream.H"
+#include "OSspecific.H"
 #include "etcFiles.H"
 
 using namespace Foam;
@@ -44,11 +45,14 @@ int main(int argc, char *argv[])
 {
     argList::noBanner();
     argList::noParallel();
+    argList::noParallel();
+    argList::addOption("ignore", "file", "Test readRaw with ignore");
 
     #include "setRootCase.H"
 
     // Test with etc/controlDict (mandatory, from distribution)
 
+    if (!args.found("ignore"))
     {
         const fileName inputFile
         (
@@ -97,6 +101,43 @@ int main(int argc, char *argv[])
         }
     }
 
+    fileName testFile;
+    if (args.readIfPresent("ignore", testFile))
+    {
+        if (testFile.has_ext("gz"))
+        {
+            testFile.remove_ext();
+            Info<< "stripping extraneous .gz ending" << endl;
+        }
+
+        IFstream is(testFile);
+        auto& stdStream = is.stdStream();
+
+        List<char> buffer(1000);
+
+        Info<< "Test readRaw with: " << is.name()
+            << " compressed:" << int(is.compression())
+            << " file-size:" << is.fileSize() << nl;
+
+        for (int iter = 0; is.good() && iter < 1000; ++iter)
+        {
+            Info<< "iter:" << iter;
+            if (iter % 2)
+            {
+                Info<< " [read]  ";
+                is.readRaw(buffer.data(), buffer.size());
+            }
+            else
+            {
+                Info<< " [ignore]";
+                is.readRaw(nullptr, buffer.size() / 2);
+            }
+
+            Info<< " : " << stdStream.gcount() << endl;
+        }
+    }
+
+
     Info<< "\nEnd\n" << endl;
     return 0;
 }

applications/test/IListStream/Make/files

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

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,8 +27,7 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#include "ListStream.H"
-#include "UListStream.H"
+#include "argList.H"
 #include "wordList.H"
 #include "IOstreams.H"
 #include "argList.H"
@@ -155,35 +154,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/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/OCharStream1/Make/files

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

applications/test/OCharStream1/Test-OCharStream1.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,13 +27,46 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#include "ListStream.H"
+#include "SpanStream.H"
 #include "wordList.H"
 #include "IOstreams.H"
 #include "argList.H"
 
+#include <cctype>
+#include <cstdio>
+
 using namespace Foam;
 
+Ostream& writeList(Ostream& os, const UList<char>& list)
+{
+    char buf[4];
+    os << list.size() << '(';
+    for (const char c : list)
+    {
+        if (isprint(c))
+        {
+            os << c;
+        }
+        else if (c == '\t')
+        {
+            os << "\\t";
+        }
+        else if (c == '\n')
+        {
+            os << "\\n";
+        }
+        else
+        {
+            ::snprintf(buf, 4, "%02X", c);
+            os << "\\x" << buf;
+        }
+    }
+    os << ')';
+
+    return os;
+}
+
+
 Ostream& toString(Ostream& os, const UList<char>& list)
 {
     os << '"';
@@ -91,12 +124,12 @@ void outputDict(OS& os)
 
 int main(int argc, char *argv[])
 {
+    #include "setRootCase.H"
+
     // Buffer storage
     DynamicList<char> storage(16);
 
-    OListStream obuf(std::move(storage));
-
-    obuf.setBlockSize(100);
+    OCharStream obuf(std::move(storage));
 
     printInfo(obuf);
 
@@ -140,10 +173,10 @@ int main(int argc, char *argv[])
     Info<<"after overwrite" << nl;
     printInfo(obuf);
 
-    Info<< "transfer contents to a List or IListStream" << nl;
+    Info<< "transfer contents to a List or ICharStream" << nl;
 
-    IListStream ibuf;
-    // Reclaim data storage from OListStream -> IListStream
+    ICharStream ibuf;
+    // Reclaim data storage from OCharStream -> ICharStream
     {
         List<char> data;
         obuf.swap(data);
@@ -169,7 +202,7 @@ int main(int argc, char *argv[])
         Info<<"input:";
         toString(Info, list) << endl;
 
-        OListStream buf1(std::move(list));
+        OCharStream buf1(std::move(list));
 
         Info<<"orig:";
         toString(Info, list) << endl;
@@ -204,7 +237,7 @@ int main(int argc, char *argv[])
 
     Info<< nl << "Test dictionary" << nl;
     {
-        OListStream os1;
+        OCharStream os1;
 
         outputDict(os1);
 
@@ -213,7 +246,7 @@ int main(int argc, char *argv[])
     }
 
     {
-        OListStream os2;
+        OCharStream os2;
         os2.indentSize(0);
 
         outputDict(os2);

applications/test/OCountStream/Test-OCountStream.C

@@ -74,7 +74,7 @@ int main(int argc, char *argv[])
 
     Info<< "counter state: " << (cnt.stdStream().rdstate()) << nl
         << "via string-stream: " << str.str().size() << " chars" << nl
-        << "via ocountstream: " << plain.size() << " chars" << endl;
+        << "via ocountstream: " << plain.count() << " chars" << endl;
 
     fileName outputName;
     args.readIfPresent("write", outputName);

applications/test/OListStream/Make/files

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

applications/test/PDRblockMesh/box0/system/PDRblockMeshDict

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/

applications/test/PDRblockMesh/box0/system/controlDict

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/

applications/test/PDRblockMesh/box0/system/fvSchemes

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/

applications/test/PDRblockMesh/box0/system/fvSolution

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/

applications/test/PatchFunction1/function1Properties

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/

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/SpanStream1/Make/files

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

applications/test/SpanStream1/Make/options

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

applications/test/SpanStream1/Test-SpanStream1.C

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2017-2018 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -27,16 +27,48 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#include "UListStream.H"
+#include "SpanStream.H"
 #include "wordList.H"
 #include "IOstreams.H"
 #include "argList.H"
 
+#include <cctype>
+#include <cstdio>
 #include <sstream>
 #include <vector>
 
 using namespace Foam;
 
+Ostream& writeList(Ostream& os, const UList<char>& list)
+{
+    char buf[4];
+    os << list.size() << '(';
+    for (const char c : list)
+    {
+        if (isprint(c))
+        {
+            os << c;
+        }
+        else if (c == '\t')
+        {
+            os << "\\t";
+        }
+        else if (c == '\n')
+        {
+            os << "\\n";
+        }
+        else
+        {
+            ::snprintf(buf, 4, "%02X", c);
+            os << "\\x" << buf;
+        }
+    }
+    os << ')';
+
+    return os;
+}
+
+
 Ostream& toString(Ostream& os, const UList<char>& list)
 {
     os << '"';
@@ -108,7 +140,7 @@ int main(int argc, char *argv[])
     // Buffer storage
     DynamicList<char> storage(1000);
 
-    UOListStream obuf(storage);
+    OSpanStream obuf(storage);
     obuf << 1002 << "\n" << "abcd" << "\n" << "def" << "\n" << 3.14159 << ";\n";
 
     obuf.print(Info);
@@ -120,7 +152,7 @@ int main(int argc, char *argv[])
 
     // Attach input buffer - could also do without previous resize
     {
-        UIListStream ibuf(storage);
+        ISpanStream ibuf(storage);
 
         printTokens(ibuf);
 
@@ -135,13 +167,21 @@ int main(int argc, char *argv[])
     {
         Info<< "parse as std::istream\n";
 
-        uiliststream is(storage.cdata(), storage.size());
+        ispanstream is(storage.cdata(), storage.size());
+
+        Info<< "input: ";
+        writeList(Info, is.list()) << endl;
+
+        Info<< "where: "  << is.tellg() << endl;
+        Info<< "capacity: " << is.capacity() << endl;
+        Info<< "total: " << is.capacity() << endl;
 
         string tok;
 
         while (std::getline(is, tok))
         {
             std::cerr << "tok: " << tok << nl;
+            Info<< "where: "  << is.tellg() << endl;
         }
 
         Info<< nl << "Repeat..." << endl;
@@ -170,7 +210,7 @@ int main(int argc, char *argv[])
         toString(Info, chars);
         Info<< "----" << nl;
 
-        uiliststream is(chars.data(), chars.size());
+        ispanstream is(chars.data(), chars.size());
         string tok;
         std::cerr<< nl << "Parsed..." << nl;
         while (std::getline(is, tok))

applications/test/SubField/Test-SubField.C

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -37,6 +37,7 @@ Description
 #include "scalarField.H"
 #include "SubField.H"
 #include "labelRange.H"
+#include "ListOps.H"
 #include <numeric>
 
 using namespace Foam;
@@ -57,26 +58,26 @@ int main(int argc, char *argv[])
     argList::noFunctionObjects();
 
     {
-        List<scalar> ident(25);
+        List<label> ident(25);
         std::iota(ident.begin(), ident.end(), 0);
 
         print(ident);
 
-        SubList<scalar>(ident, 10) = -10;
+        SubList<label>(ident, 10) = -10;
         print(ident);
 
-        SubField<scalar>(ident, 10) = 10;
+        SubField<label>(ident, 10) = 10;
         print(ident);
 
-        SubField<scalar>(ident, 10) += 10;
+        SubField<label>(ident, 10) += 10;
         print(ident);
 
-        SubField<scalar>{ident, 10, 10} *= 5;
+        SubField<label>{ident, 10, 10} *= 5;
         print(ident);
 
 
         // NOTE: Need {} instead of ()
-        // SubList<scalar>(ident) = 100;
+        // SubList<label>(ident) = 100;
 
         // GCC
         // error: conflicting declaration 'Foam::SubList<double> ident'
@@ -85,7 +86,30 @@ int main(int argc, char *argv[])
         // warning: parentheses were disambiguated as redundant parentheses
         // around declaration of variable named 'ident' [-Wvexing-parse]
 
-        SubList<scalar>{ident} = 100;
+        SubList<label>{ident} = 100;
+        print(ident);
+
+        SubList<label> sub(ident);
+        sub = 1;
+        print(sub);
+
+        sub.reset(ident, labelRange(4, 5)) = 5;
+        print(sub);
+        print(ident);
+
+        sub.reset(ident, labelRange(14, 5)) = 15;
+        print(sub);
+        print(ident);
+
+        // Cryptic, probably not a great idea to write this
+        sub.reset(ident, {20, 3}) = -1;
+        print(sub);
+        print(ident);
+
+        // This is also possible since we hold a concrete pointer/size
+        // and not an intermediate
+        ListOps::identity(sub.reset(ident, 8, 8));
+        print(sub);
         print(ident);
     }
 

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/UIListStream/Make/files

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

applications/test/argList/Test-argList.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.
@@ -124,6 +124,9 @@ int main(int argc, char *argv[])
     argList::addDryRunOption("Just for testing");
     argList::addVerboseOption("Increase verbosity");
 
+    // Check -verbose before initialisation
+    UPstream::debug = argList::verbose(argc, argv);
+
     #include "setRootCase.H"
 
     Pout<< "command-line ("

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/codeStream/codeStreamDict1

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/

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/coordinateSystem/testCase0/constant/coordinateSystems

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/

applications/test/coordinateSystem/testCase0/system/controlDict

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/

applications/test/coordinateSystem/testCase1/constant/coordinateSystems

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/

applications/test/coordinateSystem/testCase1/system/controlDict

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/

applications/test/coordinateSystem/testCsys1

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/

applications/test/coordinateSystem/testCsys2

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/

applications/test/dictionary/blockMeshDict1.calc

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/

applications/test/dictionary/blockMeshDict1.eval

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/

applications/test/dictionary/testDict

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/

applications/test/dictionary/testDict2

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/

applications/test/dictionary/testDictAPI

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/

applications/test/dictionary/testDictCalc1

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/

applications/test/dictionary/testDictEval1

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/

applications/test/dictionary/testDictEval2

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/

applications/test/dictionary/testDictEval3

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/

applications/test/dictionary/testDictEval4

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/

applications/test/dictionary/testDictList

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/

applications/test/dictionary/testDictRegex

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/

applications/test/dictionary/testPrimitiveEntry

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/

applications/test/dictionary/testSubkeyword

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/

applications/test/dictionaryCopy/testDictCopy

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/

applications/test/exprEntry/testDict1

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2212                                 |
+|  \\    /   O peration     | Version:  v2306                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/