ENH: AMI caching - addeduser-selectable stride

Applicable to rotational cases:

- stores AMI weights and addressing on the first revolution
- cached evaluations performed on subsequent revolutions to reduce computational
  costs

Cached values are stored in angular bins, specified using the [optional]
`cacheSize` entry when defining the patch in the polyMesh/boundary file, e.g.

    AMI1
    {
        type            cyclicAMI;
        AMIMethod       faceAreaWeightAMI;
        neighbourPatch  AMI2;

        cacheSize       360; // New entry
        transform       rotational;
        rotationAxis    (0 0 1);
        rotationCentre  (0 0 0);
    }

Note that the transform must also be set to rotational; the additional
`rotationAxis` and `rotationCentre` entries are used to construct a local AMI
co-ordinate system to determine the rotation angle as the mesh moves.

360 bins are created in the example above, equating to a uniform bin width
of 1 degree.

.gitignore

@@ -11,6 +11,7 @@
 
 # File-browser settings - anywhere
 .directory
+.DS_Store   # OSX app store 
 
 # Backup/recovery versions - anywhere
 .#*
@@ -38,6 +39,8 @@ linux*Gcc*/
 linux*Icc*/
 solaris*Gcc*/
 SunOS*Gcc*/
+darwin*Clang*/
+darwin*Gcc*/
 platforms/
 
 # Top-level build directories

.gitlab/issue_templates/bug.md

@@ -49,7 +49,7 @@
 
 <!--
   Providing details of your set-up can help us identify any issues, e.g.
-  OpenFOAM version : v2412|v2406|v2312|v2306|v2212 etc
+  OpenFOAM version : v2506|v2412|v2406|v2312|v2306 etc
   Operating system : ubuntu|openSUSE|RedHat etc
   Hardware info    : any info that may help?
   Compiler         : gcc|clang etc

Allwmake-modules

@@ -1,13 +1,15 @@
 #!/bin/sh
+cd "${0%/*}" || exit            # Run from this directory
+set -- -all="${0##*/}" "$@"     # Execute this instead of ./Allwmake
+
 # Run from OPENFOAM top-level directory only
-cd "${0%/*}" || exit
 wmake -check-dir "$WM_PROJECT_DIR" 2>/dev/null || {
     echo "Error (${0##*/}) : not located in \$WM_PROJECT_DIR"
     echo "    Check your OpenFOAM environment and installation"
     exit 1
 }
 if [ -f "$WM_PROJECT_DIR"/wmake/scripts/AllwmakeParseArguments ]
-then  . "$WM_PROJECT_DIR"/wmake/scripts/AllwmakeParseArguments -no-recursion "$@" || \
+then  . "$WM_PROJECT_DIR"/wmake/scripts/AllwmakeParseArguments || \
     echo "Argument parse error"
 else
     echo "Error (${0##*/}) : WM_PROJECT_DIR appears to be incorrect"
@@ -31,7 +33,7 @@ case "$FOAM_MODULE_PREFIX" in
     ;;
 (*)
     # Use wmake -all instead of Allwmake to allow for overrides
-    ( cd "$WM_PROJECT_DIR/modules" 2>/dev/null && wmake -all )
+    ( cd "$WM_PROJECT_DIR/modules" 2>/dev/null && wmake -all $* )
 esac
 
 #------------------------------------------------------------------------------

Allwmake-plugins

@@ -1,13 +1,15 @@
 #!/bin/sh
+cd "${0%/*}" || exit            # Run from this directory
+set -- -all="${0##*/}" "$@"     # Execute this instead of ./Allwmake
+
 # Run from OPENFOAM top-level directory only
-cd "${0%/*}" || exit
 wmake -check-dir "$WM_PROJECT_DIR" 2>/dev/null || {
     echo "Error (${0##*/}) : not located in \$WM_PROJECT_DIR"
     echo "    Check your OpenFOAM environment and installation"
     exit 1
 }
 if [ -f "$WM_PROJECT_DIR"/wmake/scripts/AllwmakeParseArguments ]
-then  . "$WM_PROJECT_DIR"/wmake/scripts/AllwmakeParseArguments -no-recursion "$@" || \
+then  . "$WM_PROJECT_DIR"/wmake/scripts/AllwmakeParseArguments || \
     echo "Argument parse error"
 else
     echo "Error (${0##*/}) : WM_PROJECT_DIR appears to be incorrect"
@@ -31,7 +33,7 @@ case "$FOAM_MODULE_PREFIX" in
     ;;
 (*)
     # Use wmake -all instead of Allwmake to allow for overrides
-    ( cd "$WM_PROJECT_DIR/plugins" 2>/dev/null && wmake -all )
+    ( cd "$WM_PROJECT_DIR/plugins" 2>/dev/null && wmake -all $* )
 esac
 
 #------------------------------------------------------------------------------

META-INFO/api-info

@@ -1,2 +1,2 @@
-api=2501
+api=2507
 patch=0

README.md

@@ -40,9 +40,9 @@ Violations of the Trademark are monitored, and will be duly prosecuted.
 
 If OpenFOAM has already been compiled on your system, simply source
 the appropriate `etc/bashrc` or `etc/cshrc` file and get started.
-For example, for the OpenFOAM-v2412 version:
+For example, for the OpenFOAM-v2506 version:
 ```
-source /installation/path/OpenFOAM-v2412/etc/bashrc
+source /installation/path/OpenFOAM-v2506/etc/bashrc
 ```
 
 ## Compiling OpenFOAM
@@ -127,8 +127,8 @@ These 3rd-party sources are normally located in a directory parallel
 to the OpenFOAM directory. For example,
 ```
 /path/parent
-|-- OpenFOAM-v2412
-\-- ThirdParty-v2412
+|-- OpenFOAM-v2506
+\-- ThirdParty-v2506
 ```
 There are, however, many cases where this simple convention is inadequate:
 
@@ -156,9 +156,9 @@ when locating the ThirdParty directory with the following precedence:
 2. PREFIX/ThirdParty-VERSION
    * this corresponds to the traditional approach
 3. PREFIX/ThirdParty-vAPI
-   * allows for an updated value of VERSION, *eg*, `v2412-myCustom`,
+   * allows for an updated value of VERSION, *eg*, `v2506-myCustom`,
      without requiring a renamed ThirdParty. The API value would still
-     be `2412` and the original `ThirdParty-v2412/` would be found.
+     be `2412` and the original `ThirdParty-v2506/` would be found.
 4. PREFIX/ThirdParty-API
    * same as the previous example, but using an unadorned API value.
 5. PREFIX/ThirdParty-common

applications/solvers/basic/potentialFoam/createFields.H

@@ -13,7 +13,13 @@ volVectorField U
 );
 
 // Initialise the velocity internal field to zero
-U = dimensionedVector(U.dimensions(), Zero);
+// Note: explicitly bypass evaluation of contraint patch overrides
+//       (e.g. swirlFanVelocity might lookup phi,rho)
+//U = Zero;
+{
+    U.internalFieldRef() = Zero;
+    U.boundaryFieldRef() = Zero;
+}
 
 surfaceScalarField phi
 (

applications/solvers/lagrangian/kinematicParcelFoam/UEqn.H

@@ -6,7 +6,7 @@
       + MRF.DDt(U)
       + turbulence->divDevReff(U)
      ==
-        parcels.SU(U, true)
+        invRhoInf*parcels.SU(U)
       + fvOptions(U)
     );
 

applications/solvers/lagrangian/kinematicParcelFoam/createFields.H

@@ -39,6 +39,11 @@ dimensionedScalar rhoInfValue
     laminarTransport
 );
 
+const dimensionedScalar invRhoInf
+(
+    dimless/dimDensity, scalar(1)/rhoInfValue.value()
+);
+
 volScalarField rhoInf
 (
     IOobject

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

@@ -1086,7 +1086,7 @@ void Foam::multiphaseMixtureThermo::solveAlphas
 
     MULES::limitSum(alphaPhiCorrs);
 
-    rhoPhi_ = dimensionedScalar(dimensionSet(1, 0, -1, 0, 0), Zero);
+    rhoPhi_ = Zero;
 
     volScalarField sumAlpha
     (

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

@@ -63,23 +63,11 @@ Foam::DTRMParticle::DTRMParticle
         {
             is >> p0_ >> p1_ >> I0_ >> I_ >> dA_ >> transmissiveId_;
         }
-        else if (!is.checkLabelSize<>() || !is.checkScalarSize<>())
-        {
-            // Non-native label or scalar size
-
-            is.beginRawRead();
-
-            readRawScalar(is, p0_.data(), vector::nComponents);
-            readRawScalar(is, p1_.data(), vector::nComponents);
-            readRawScalar(is, &I0_);
-            readRawScalar(is, &I_);
-            readRawScalar(is, &dA_);
-            readRawLabel(is, &transmissiveId_);
-
-            is.endRawRead();
-        }
         else
         {
+            // No non-native streaming
+            is.fatalCheckNativeSizes(FUNCTION_NAME);
+
             is.read(reinterpret_cast<char*>(&p0_), sizeofFields_);
         }
     }

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

@@ -557,7 +557,7 @@ void Foam::radiation::laserDTRM::calculate()
 
 
     // Reset the field
-    Q_ == dimensionedScalar(Q_.dimensions(), Zero);
+    Q_ == Zero;
 
     a_ = absorptionEmission_->a();
     e_ = absorptionEmission_->e();

applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H

@@ -232,7 +232,7 @@
             surfaceScalarField mSfGradp("mSfGradp", pEqnIncomp.flux()/rAUf);
 
             phasei = 0;
-            phi = dimensionedScalar("phi", phi.dimensions(), Zero);
+            phi = Zero;
 
             for (phaseModel& phase : fluid.phases())
             {
@@ -261,7 +261,7 @@
 
             mSfGradp = pEqnIncomp.flux()/rAUf;
 
-            U = dimensionedVector("U", dimVelocity, Zero);
+            U = Zero;
 
             phasei = 0;
             for (phaseModel& phase : fluid.phases())

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

@@ -626,7 +626,7 @@ void Foam::multiphaseMixture::solveAlphas
 
     MULES::limitSum(alphaPhiCorrs);
 
-    rhoPhi_ = dimensionedScalar(dimMass/dimTime, Zero);
+    rhoPhi_ = Zero;
 
     volScalarField sumAlpha
     (

applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/kineticEnergyLimiter.H

@@ -14,6 +14,6 @@ if (!(runTime.timeIndex() % 5))
     if (smi < -SMALL)
     {
         Info<< "Resetting Dcorr to 0" << endl;
-        Dcorr == dimensionedVector(Dcorr.dimensions(), Zero);
+        Dcorr == Zero;
     }
 }

applications/test/00-dummy/library/Allwclean-mpi

@@ -1,6 +1,6 @@
 #!/bin/sh
-cd "${0%/*}" || exit                                # Run from this directory
-. ${WM_PROJECT_DIR:?}/wmake/scripts/wmakeFunctions  # Require wmake functions
+cd "${0%/*}" || exit            # Run from this directory
+. "${WM_PROJECT_DIR:?}"/wmake/scripts/wmakeFunctions  # Need wmake functions
 
 #------------------------------------------------------------------------------
 

applications/test/00-dummy/library/Allwmake-mpi

@@ -1,7 +1,9 @@
 #!/bin/sh
-cd "${0%/*}" || exit                                # Run from this directory
-. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments -no-recursion "$@"
-. ${WM_PROJECT_DIR:?}/wmake/scripts/wmakeFunctions  # Require wmake functions
+cd "${0%/*}" || exit            # Run from this directory
+set -- -all="${0##*/}" "$@"     # Execute this instead of ./Allwmake
+
+. "${WM_PROJECT_DIR:?}"/wmake/scripts/AllwmakeParseArguments
+. "${WM_PROJECT_DIR:?}"/wmake/scripts/wmakeFunctions  # Need wmake functions
 
 #------------------------------------------------------------------------------
 # Environment

applications/test/CompactIOList/Make/files

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

applications/test/CompactIOList/Test-CompactIOList.cxx

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2020-2022 OpenCFD Ltd.
+    Copyright (C) 2020-2025 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -25,7 +25,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Application
-    testCompactIOList
+    Test-CompactIOList
 
 Description
     Simple demonstration and test application for the CompactIOList container
@@ -46,13 +46,20 @@ using namespace Foam;
 
 int main(int argc, char *argv[])
 {
+    argList::addBoolOption("ascii", "use ascii format");
+    argList::addOption("count", "number of faces");
+
     #include "setRootCase.H"
     #include "createTime.H"
 
     IOstreamOption streamOpt(IOstreamOption::BINARY);
-    // IOstreamOption streamOpt(IOstreamOption::ASCII);
 
-    const label size = 20000000;
+    if (args.found("ascii"))
+    {
+        streamOpt.format(IOstreamOption::ASCII);
+    }
+
+    const label size = args.getOrDefault<label>("count", 20000000);
 
     // Old format
     // ~~~~~~~~~~
@@ -63,39 +70,50 @@ int main(int argc, char *argv[])
         (
             IOobject
             (
-                "faces2",
+                "faces2-plain",
                 runTime.constant(),
                 polyMesh::meshSubDir,
                 runTime,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
                 IOobject::NO_REGISTER
-            ),
-            size
+            )
         );
 
-        const face f(identity(4));
+        faces2.resize(size, face(identity(4)));
 
-        forAll(faces2, i)
-        {
-            faces2[i] = f;
-        }
-
-        Info<< "Constructed faceList in = "
-            << runTime.cpuTimeIncrement() << " s" << nl << endl;
+        Info<< "Plain format faceList " << faces2.objectRelPath() << nl;
+        Info<< "    constructed in = " << runTime.cpuTimeIncrement()
+            << " s" << endl;
 
 
         faces2.writeObject(streamOpt, true);
 
-        Info<< "Written old format faceList in = "
-            << runTime.cpuTimeIncrement() << " s" << nl << endl;
+        Info<< "    wrote in = "
+            << runTime.cpuTimeIncrement() << " s" << endl;
 
-        // Read
-        faceIOList faces3
+        // Read (size only)
+        label count = faceIOList::readContentsSize
         (
             IOobject
             (
-                "faces2",
+                "faces2-plain",
+                runTime.constant(),
+                polyMesh::meshSubDir,
+                runTime,
+                IOobject::MUST_READ
+            )
+        );
+
+        Info<< "    counted " << count << " faces on disk in = "
+            << runTime.cpuTimeIncrement() << " s" << endl;
+
+        // Read
+        faceIOList faces2b
+        (
+            IOobject
+            (
+                "faces2-plain",
                 runTime.constant(),
                 polyMesh::meshSubDir,
                 runTime,
@@ -105,7 +123,7 @@ int main(int argc, char *argv[])
             )
         );
 
-        Info<< "Read old format " << faces3.size() << " faceList in = "
+        Info<< "    read " << faces2b.size() << " faces in = "
             << runTime.cpuTimeIncrement() << " s" << nl << endl;
     }
 
@@ -114,44 +132,54 @@ int main(int argc, char *argv[])
     // ~~~~~~~~~~
 
     {
-        // Construct big faceList in new format
+        // Construct big faceList in compact format
         faceCompactIOList faces2
         (
             IOobject
             (
-                "faces2",
+                "faces2-compact",
                 runTime.constant(),
                 polyMesh::meshSubDir,
                 runTime,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
                 IOobject::NO_REGISTER
-            ),
-            size
+            )
         );
 
-        const face f(identity(4));
+        faces2.resize(size, face(identity(4)));
 
-        forAll(faces2, i)
-        {
-            faces2[i] = f;
-        }
-
-        Info<< "Constructed new format faceList in = "
-            << runTime.cpuTimeIncrement() << " s" << nl << endl;
+        Info<< "Compact format faceList" << faces2.objectRelPath() << nl;
+        Info<< "    constructed in = "
+            << runTime.cpuTimeIncrement() << " s" << endl;
 
 
         faces2.writeObject(streamOpt, true);
 
-        Info<< "Written new format faceList in = "
-            << runTime.cpuTimeIncrement() << " s" << nl << endl;
+        Info<< "    wrote in = "
+            << runTime.cpuTimeIncrement() << " s" << endl;
 
-        // Read
-        faceCompactIOList faces3
+        // Read (size only)
+        label count = faceCompactIOList::readContentsSize
         (
             IOobject
             (
-                "faces2",
+                "faces2-compact",
+                runTime.constant(),
+                polyMesh::meshSubDir,
+                runTime,
+                IOobject::MUST_READ
+            )
+        );
+        Info<< "    counted " << count << " faces on disk in = "
+            << runTime.cpuTimeIncrement() << " s" << endl;
+
+        // Read
+        faceCompactIOList faces2b
+        (
+            IOobject
+            (
+                "faces2-compact",
                 runTime.constant(),
                 polyMesh::meshSubDir,
                 runTime,
@@ -161,7 +189,7 @@ int main(int argc, char *argv[])
             )
         );
 
-        Info<< "Read new format " << faces3.size() << " faceList in = "
+        Info<< "    read " << faces2b.size() << " faces in = "
             << runTime.cpuTimeIncrement() << " s" << nl << endl;
     }
 

applications/test/Function1/case1/constant/function1Properties

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2412                                 |
+|  \\    /   O peration     | Version:  v2506                                 |
 |   \\  /    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:  v2412                                 |
+|  \\    /   O peration     | Version:  v2506                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/

applications/test/HashPtrTable/Make/files

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

applications/test/HashPtrTable/Test-HashPtrTable.cxx

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
-    Copyright (C) 2017-2022 OpenCFD Ltd.
+    Copyright (C) 2017-2025 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -42,33 +42,55 @@ Description
 
 using namespace Foam;
 
-class Scalar
+bool verbosity = true;
+
+// Gratuitous class inheritance
+template<class T>
+class BoxedType
 {
-    scalar data_;
+    T data_;
 
 public:
 
     static bool verbose;
 
-    constexpr Scalar() noexcept : data_(0) {}
-    Scalar(scalar val) noexcept : data_(val) {}
+    constexpr BoxedType() noexcept : data_(0) {}
+    BoxedType(T val) noexcept : data_(val) {}
+
+    ~BoxedType()
+    {
+        if (verbosity) Info<< "    [delete BoxedType: " << value() << ']' << nl;
+    }
+
+    T value() const noexcept { return data_; }
+    T& value() noexcept { return data_; }
+
+    auto clone() const { return autoPtr<BoxedType<T>>::New(*this); }
+};
+
+template<class T> Ostream& operator<<(Ostream& os, const BoxedType<T>& item)
+{
+    return (os << " -> " << item.value());
+}
+
+
+class Scalar : public BoxedType<scalar>
+{
+public:
+
+    using BoxedType<scalar>::BoxedType;
 
     ~Scalar()
     {
-        if (verbose) Info<< "delete Scalar: " << data_ << endl;
-    }
-
-    const scalar& value() const noexcept { return data_; }
-    scalar& value() noexcept { return data_; }
-
-    friend Ostream& operator<<(Ostream& os, const Scalar& item)
-    {
-        os  << item.value();
-        return os;
+        if (verbosity) Info<< "delete Scalar: " << value() << nl;
     }
+    auto clone() const { return autoPtr<Scalar>::New(*this); }
 };
 
-bool Scalar::verbose = true;
+Ostream& operator<<(Ostream& os, const Scalar& item)
+{
+    return (os << item.value());
+}
 
 
 template<class T>

applications/test/HashTable2/Make/files

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

applications/test/HashTable3/Make/files

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

applications/test/Hashing2/hashingTests

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

applications/test/ICharStream1/Test-ICharStream1.cxx

@@ -89,12 +89,6 @@ Ostream& printView(Ostream& os, std::string_view s)
 }
 
 
-Ostream& printView(Ostream& os, stdFoam::span<char> s)
-{
-    return printView(os, s.begin(), s.end());
-}
-
-
 Ostream& printView(Ostream& os, const UList<char>& list)
 {
     return printView(os, list.begin(), list.end());

applications/test/IOobjectList/Make/files

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

applications/test/ISLList/Make/files

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

applications/test/IStringStream/Make/files

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

applications/test/List/Test-List.cxx

@@ -51,6 +51,7 @@ See also
 #include "IndirectList.H"
 #include "SubList.H"
 #include "SliceList.H"
+#include "SubField.H"
 #include "ListPolicy.H"
 
 #include <list>
@@ -105,7 +106,7 @@ void printMyString(const UList<string>& lst)
 {
     MyStrings slist2(lst);
 
-    Info<<slist2 << nl;
+    Info<< slist2 << nl;
 }
 
 
@@ -203,16 +204,6 @@ int main(int argc, char *argv[])
             Info<<" " << *iter;
         }
         Info<< nl;
-
-        Info<< "data:" << Foam::name(ident.cdata())
-            << " size:" << ident.size() << nl;
-
-
-        Info<< "resize_unsafe(10)" << nl;
-        ident.resize_unsafe(10);
-
-        Info<< "data:" << Foam::name(ident.cdata())
-            << " size:" << ident.size() << nl;
     }
 
     if (false)
@@ -281,6 +272,33 @@ int main(int argc, char *argv[])
     };
     Info<< "list4: " << list4 << endl;
 
+    {
+        List<scalar> list4Mag = ListOps::create<scalar>
+        (
+            list4,
+            [](const auto& a){ return a.mag(); }
+        );
+
+        const auto equalMag = [](const auto& a, const auto& b)
+        {
+            return (Foam::mag(a) == Foam::mag(b));
+        };
+
+        Info<< "list4 (mag): " << list4Mag << endl;
+
+        bool same = ListOps::equal(list4, list4Mag, equalMag);
+        Info<< "mag(list4) == list4(mag): " << same << nl;
+
+        SubField<scalar>(list4Mag) *= -1;
+        same = ListOps::equal(list4, list4Mag, equalMag);
+        Info<< "mag(list4) == list4(mag): " << same << nl;
+
+        SubField<scalar>(list4Mag) *= 1.1;
+        same = ListOps::equal(list4, list4Mag, equalMag);
+        Info<< "mag(list4) == list4(mag): " << same << nl;
+    }
+
+
     List<vector> list5
     {
         {5, 3, 1},
@@ -342,7 +360,7 @@ int main(int argc, char *argv[])
         auto shrtList = ListOps::create<short>
         (
             longLabelList,
-            [](const label& val){ return val; }
+            [](label val){ return val; }
         );
 
         printListOutputType<short>("short") << nl;
@@ -539,7 +557,7 @@ int main(int argc, char *argv[])
             auto scalars = ListOps::create<scalar>
             (
                 labels,
-                [](const label& val){ return scalar(1.5*val); }
+                [](label val){ return scalar(1.5*val); }
             );
             Info<< "scalars: " << flatOutput(scalars) << endl;
         }
@@ -548,7 +566,7 @@ int main(int argc, char *argv[])
             auto vectors = ListOps::create<vector>
             (
                 labels,
-                [](const label& val){ return vector(1.2*val, -1.2*val, 0); }
+                [](label val){ return vector(1.2*val, -1.2*val, 0); }
             );
             Info<< "vectors: " << flatOutput(vectors) << endl;
         }
@@ -557,7 +575,7 @@ int main(int argc, char *argv[])
             auto longs = ListOps::create<long>
             (
                 labels,
-                [](const label& val){ return val; }
+                [](label val){ return val; }
             );
             Info<< "longs: " << flatOutput(longs) << endl;
         }
@@ -575,7 +593,7 @@ int main(int argc, char *argv[])
             (
                 labelRange().cbegin(),
                 labelRange(15).cend(),
-                [](const label& val){ return scalar(-1.125*val); }
+                [](label val){ return scalar(-1.125*val); }
             );
             Info<< "scalars: " << flatOutput(scalars) << endl;
         }

applications/test/OCharStream1/Test-OCharStream1.cxx

@@ -89,12 +89,6 @@ Ostream& printView(Ostream& os, std::string_view s)
 }
 
 
-Ostream& printView(Ostream& os, stdFoam::span<char> s)
-{
-    return printView(os, s.begin(), s.end());
-}
-
-
 Ostream& printView(Ostream& os, const UList<char>& list)
 {
     return printView(os, list.begin(), list.end());
@@ -189,12 +183,25 @@ int main(int argc, char *argv[])
     printInfo(obuf);
 
     // Overwrite at some position
-    obuf.stdStream().rdbuf()->pubseekpos(0.60 * obuf.size());
-    obuf << "<" << nl << "OVERWRITE" << nl;
+    if (auto i = obuf.view().find("item5"); i != std::string::npos)
+    {
+        // obuf.seek(0.60 * obuf.size());
+        obuf.seek(i);
+        obuf << "<OVERWRITE>" << nl;
+    }
 
     Info<<"after overwrite" << nl;
     printInfo(obuf);
 
+    // Truncate
+    {
+        constexpr float fraction = 0.90;
+        Info<<"truncated at " << (100*fraction) << "% ["
+            << int(fraction*obuf.size()) << " chars]" << nl;
+        obuf.seek(fraction*obuf.size());
+        printInfo(obuf);
+    }
+
     Info<< "transfer contents to a List or ICharStream" << nl;
 
     // Reclaim data storage from OCharStream -> ICharStream

applications/test/OCharStream2/Make/files

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

applications/test/OCharStream2/Make/options

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

applications/test/OCharStream2/Test-OCharStream2.cxx

@@ -0,0 +1,473 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2025 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
+
+\*---------------------------------------------------------------------------*/
+
+#include "SpanStream.H"
+#include "wordList.H"
+#include "IOstreams.H"
+#include "argList.H"
+
+#include <charconv>
+#include <cctype>
+#include <cstdio>
+#include <limits>
+#include <iomanip>
+
+using namespace Foam;
+
+Ostream& printString(Ostream& os, const char* first, const char* last)
+{
+    os << '"';
+    for (; first != last; (void)++first)
+    {
+        os << *first;
+    }
+    os << '"';
+
+    return os;
+}
+
+
+Ostream& printView(Ostream& os, const char* first, const char* last)
+{
+    char buf[4];
+    os << label(last-first) << '(';
+
+    for (; first != last; (void)++first)
+    {
+        const char c = *first;
+
+        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& printView(Ostream& os, std::string_view s)
+{
+    return printView(os, s.begin(), s.end());
+}
+
+
+Ostream& printView(Ostream& os, const UList<char>& list)
+{
+    return printView(os, list.begin(), list.end());
+}
+
+
+Ostream& writeList(Ostream& os, const UList<char>& list)
+{
+    return printView(os, list);
+}
+
+
+Ostream& toString(Ostream& os, const UList<char>& list)
+{
+    return printString(os, list.begin(), list.end());
+}
+
+
+Ostream& toString(Ostream& os, std::string_view s)
+{
+    return printString(os, s.begin(), s.end());
+}
+
+
+template<class BufType>
+void printInfo(const BufType& buf)
+{
+    Info<< nl << "=========================" << endl;
+    buf.print(Info);
+    Info<< "addr: " << Foam::name(buf.view().data()) << nl;
+    toString(Info, buf.view());
+    Info<< nl << "=========================" << endl;
+}
+
+
+// Return a left-padded integer as "word"
+template<class IntType>
+std::string leftpadded(IntType val, char fillch = ' ')
+{
+    std::string buf;
+    buf.resize((std::numeric_limits<IntType>::digits10+1), fillch);
+
+    auto first = (buf.data());
+    auto last  = (buf.data() + buf.size());
+
+    auto result = std::to_chars(first, last, val);
+
+    if (result.ec == std::errc{})
+    {
+        auto* iter = result.ptr;
+        int count = std::distance(iter, last);
+
+        std::cout << "did not fill: " << count << " chars\n";
+
+        // With two spaces before comments
+        if (count > 0) { *iter++ = ' '; --count; }
+        if (count > 0) { *iter++ = ' '; --count; }
+        for (char c = (count >= 2 ? '/' : ' '); count > 0; --count)
+        {
+            *iter++ = c;
+        }
+    }
+
+    return buf;
+}
+
+
+template<class IntType>
+void leftpad(std::ostream& os, IntType val, char fillch = ' ')
+{
+    // set fill char and width
+    os.setf(std::ios_base::left, std::ios_base::adjustfield);
+    fillch = os.fill(fillch);
+    os.width(std::numeric_limits<IntType>::digits10+1);
+    os  << val;
+    // restore fill char
+    os.fill(fillch);
+}
+
+
+template<class IntType>
+void rightpad(std::ostream& os, IntType val, char fillch = ' ')
+{
+    // set fill char and width
+    os.setf(std::ios_base::right, std::ios_base::adjustfield);
+    fillch = os.fill(fillch);
+    os.width(std::numeric_limits<IntType>::digits10+1);
+    os  << val;
+    // restore fill char
+    os.fill(fillch);
+}
+
+
+// Left-padded value with trailing comment slashes
+template<class IntType>
+void leftpad(ocharstream& os, IntType val)
+{
+    const auto beg = os.tellp();
+    os << val;
+    int count = (std::numeric_limits<IntType>::digits10+1) - (os.tellp() - beg);
+
+    // With two spaces before comments
+    if (count > 0) { os << ' '; --count; }
+    if (count > 0) { os << ' '; --count; }
+    for (const char c = (count >= 2 ? '/' : ' '); count > 0; --count)
+    {
+        os << c;
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// Main program:
+
+int main(int argc, char *argv[])
+{
+    argList::noBanner();
+    argList::noParallel();
+    argList::addBoolOption("fake-zerosize", "Fake overwriting with zero data");
+    argList::addBoolOption("dict-format", "Format as dictionary entry");
+
+    #include "setRootCase.H"
+
+    const bool optFakeZerosize = args.found("fake-zerosize");
+    const bool isDictFormat = args.found("dict-format");
+
+    // const constexpr int width = (std::numeric_limits<label>::digits10+1);
+
+    // experiment with to_chars instead of streaming
+    {
+        // Some value
+        label val(1234);
+
+        auto fixed = leftpadded(val);
+        Info<< "leftpadded " << val << " : " << fixed << nl;
+    }
+
+    ocharstream labelbuf;
+    labelbuf.reserve_exact(32);
+
+    // Some value
+    labelbuf.rewind();
+    rightpad(labelbuf, label(10));
+
+    printInfo(labelbuf);
+
+    OCharStream obuf;
+    obuf.reserve_exact(48);
+
+    printInfo(obuf);
+
+    obuf.push_back('>');
+    obuf.append(" string_view ");
+    obuf.push_back('<');
+    printInfo(obuf);
+
+    obuf.pop_back(8);
+    printInfo(obuf);
+
+    obuf.pop_back(100);
+    printInfo(obuf);
+
+
+    // Fill with some content
+    for (int i = 0; i < 26; ++i)
+    {
+        obuf<< char('A' + i);
+    }
+
+    // Change letter 'O' to '_'
+    if (auto i = obuf.view().find('O'); i != std::string::npos)
+    {
+        obuf.overwrite(i, '_');
+    }
+
+    // append and push_back some content
+    obuf.append(5, '<');
+    obuf.push_back('#');
+    obuf.append(5, '>');
+
+    printInfo(obuf);
+
+    obuf.pop_back(8);
+    printInfo(obuf);
+
+    // Slightly silly test
+    {
+        const auto list = obuf.list();
+        Info<< "list content:" << list << nl;
+        Info<< "view content:" << nl << list.view() << nl;
+    }
+
+    obuf.overwrite(4, labelbuf.view());
+    printInfo(obuf);
+
+    obuf.overwrite(20, "####");
+    printInfo(obuf);
+
+    Info<< "operation Ignored..." << nl;
+    obuf.overwrite(45, "????");
+    printInfo(obuf);
+
+    // Update with new value
+    {
+        labelbuf.rewind();
+        rightpad(labelbuf, label(200), '.');
+        obuf.overwrite(4, labelbuf.view());
+
+        printInfo(obuf);
+    }
+
+    // With yet another value (non-fixed width)
+    {
+        labelbuf.rewind();
+        labelbuf << label(15);
+        obuf.overwrite(4, labelbuf.view());
+
+        printInfo(obuf);
+    }
+
+    // Slightly harder test
+    {
+        std::string chars(26, '?');
+
+        for (int i = 0; i < 26; ++i)
+        {
+            chars[i] = char('A' + i);
+        }
+
+        auto& os = obuf;
+        os.rewind();
+
+        const word procName("processor0");
+
+        // Write as primitiveEntry or commented content
+        // // constexpr bool isDictFormat = true;
+
+        // if constexpr (isDictFormat)
+        if (isDictFormat)
+        {
+            // Like writeKeyword() with compoundToken
+            os << nl << procName << ' ' << word("List<char>") << nl;
+        }
+        else
+        {
+            // Human-readable comments
+            os << nl << "// " << procName << nl;
+        }
+
+        // This is the code we want to have, but assume we don't know
+        // the size or data beforehand.
+        //
+        // if (str && len > 0)
+        // {
+        //     // Special treatment for char data (binary I/O only)
+        //     const auto oldFmt = os.format(IOstreamOption::BINARY);
+        //
+        //     os << label(len) << nl;
+        //     os.write(str, len);
+        //     os << nl;
+        //
+        //     os.format(oldFmt);
+        // }
+        // else
+        // {
+        //     os << label(0) << nl;
+        // }
+
+        // Position before writing the label
+        const auto labelBegin = os.tellp();
+
+        // Replace: os << label(len) << nl;
+        // with a fixed-length version
+        {
+            labelbuf.rewind();
+            rightpad(labelbuf, 0);
+
+            os.append(labelbuf.view());
+            os << nl;
+        }
+
+        constexpr bool testUnknown = true;
+
+        label dataCount = 0;
+
+        if constexpr (testUnknown)
+        {
+            // Pretend we don't know the number of characters a priori
+
+            const auto oldFmt = os.format(IOstreamOption::BINARY);
+
+            const auto lineNumber = os.lineNumber();
+
+            // count is unknown but irrelevant for serial
+            os.beginRawWrite(0);
+
+            // Position before raw binary data
+            const auto dataBegin = os.tellp();
+
+            // Some type of output, streaming etc
+            os.writeRaw(chars.data(), chars.size());
+
+            // How many chars of binary data written?
+            dataCount = (os.tellp() - dataBegin);
+
+            os.endRawWrite();
+            os.lineNumber() = lineNumber;
+            os << nl;
+
+            os.format(oldFmt);
+        }
+        else
+        {
+            // If we had all data collected a priori
+
+            dataCount = chars.size();
+
+            const auto oldFmt = os.format(IOstreamOption::BINARY);
+
+            if (dataCount > 0)
+            {
+                os.write(chars.data(), chars.size());
+                os << nl;
+            }
+            os.format(oldFmt);
+        }
+
+        if (optFakeZerosize)
+        {
+            dataCount = 0;  // fake zero-size
+        }
+
+        printInfo(os);
+
+        // Update the data count with the correct value
+
+        if (dataCount > 0)
+        {
+            labelbuf.rewind();
+            leftpad(labelbuf, label(dataCount));
+
+            os.overwrite(labelBegin, labelbuf.view());
+        }
+        else
+        {
+            os.seek(int64_t(labelBegin)-1);
+
+            // if constexpr (isDictFormat)
+            if (isDictFormat)
+            {
+                os << ' ' << label(0);
+            }
+            else
+            {
+                os << nl << label(0) << nl;
+            }
+        }
+
+        // if constexpr (isDictFormat)
+        if (isDictFormat)
+        {
+            os.endEntry();
+        }
+
+        printInfo(os);
+
+        Info<< "view: " << os.view(4, 8) << nl;
+        Info<< "view: " << os.view(32) << nl;
+        // Ignores out-of-range
+        Info<< "view: " << os.view(1000) << nl;
+    }
+
+    Info<< "\nEnd\n" << endl;
+
+    return 0;
+}
+
+
+// ************************************************************************* //

applications/test/OCountStream/Test-OCountStream.cxx

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2017-2023 OpenCFD Ltd.
+    Copyright (C) 2017-2025 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -65,7 +65,6 @@ int main(int argc, char *argv[])
 
     OCountStream cnt;
     OCharStream cstr;
-    OStringStream sstr;
     ocountstream plain;
 
     generateOutput(cstr);
@@ -77,7 +76,6 @@ int main(int argc, char *argv[])
 
     Info<< "counter state: " << (cnt.stdStream().rdstate()) << nl
         << "via char-stream: " << label(cstr.view().size()) << " chars" << nl
-        << "via string-stream: " << label(sstr.count()) << " chars" << nl
         << "via ocountstream: " << plain.count() << " chars" << endl;
 
     fileName outputName;

applications/test/OStringStream/Make/files

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

applications/test/PDRblockMesh/box0/system/PDRblockMeshDict

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2412                                 |
+|  \\    /   O peration     | Version:  v2506                                 |
 |   \\  /    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:  v2412                                 |
+|  \\    /   O peration     | Version:  v2506                                 |
 |   \\  /    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:  v2412                                 |
+|  \\    /   O peration     | Version:  v2506                                 |
 |   \\  /    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:  v2412                                 |
+|  \\    /   O peration     | Version:  v2506                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/

applications/test/PackedList/Make/files

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

applications/test/PatchFunction1/function1Properties

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

applications/test/PtrDictionary1/Make/files

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

applications/test/PtrDictionary1/Test-PtrDictionary1.cxx

@@ -42,6 +42,8 @@ Description
 
 using namespace Foam;
 
+bool verbosity = true;
+
 class ent
 :
     public Dictionary<ent>::link
@@ -73,14 +75,12 @@ class Scalar
 
 public:
 
-    static bool verbose;
-
     constexpr Scalar() noexcept : data_(0) {}
     Scalar(scalar val) noexcept : data_(val) {}
 
     ~Scalar()
     {
-        if (verbose) Info<< "delete Scalar: " << data_ << endl;
+        if (verbosity) Info<< "delete Scalar: " << data_ << endl;
     }
 
     scalar value() const noexcept { return data_; }
@@ -93,8 +93,6 @@ public:
     }
 };
 
-bool Scalar::verbose = true;
-
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 //  Main program:

applications/test/PtrList/Make/files

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

applications/test/PtrList/Test-PtrList.cxx

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
-    Copyright (C) 2018-2023 OpenCFD Ltd.
+    Copyright (C) 2018-2025 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -41,35 +41,85 @@ Description
 
 using namespace Foam;
 
-class Scalar
+bool verbosity = true;
+
+// Gratuitous class inheritance
+template<class T>
+class BoxedType
 {
-    scalar data_;
+    T data_;
 
 public:
 
     static bool verbose;
 
-    constexpr Scalar() noexcept : data_(0) {}
-    Scalar(scalar val) noexcept : data_(val) {}
+    constexpr BoxedType() noexcept : data_(0) {}
+    BoxedType(T val) noexcept : data_(val) {}
+
+    ~BoxedType()
+    {
+        if (verbosity) Info<< "    [delete BoxedType: " << value() << ']' << nl;
+    }
+
+    T value() const noexcept { return data_; }
+    T& value() noexcept { return data_; }
+
+    auto clone() const { return autoPtr<BoxedType<T>>::New(*this); }
+};
+
+template<class T> Ostream& operator<<(Ostream& os, const BoxedType<T>& item)
+{
+    return (os << " -> " << item.value());
+}
+
+
+class Scalar : public BoxedType<scalar>
+{
+public:
+
+    using BoxedType<scalar>::BoxedType;
 
     ~Scalar()
     {
-        if (verbose) Info<< "delete Scalar: " << data_ << endl;
-    }
-
-    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  << item.value();
-        return os;
+        if (verbosity) Info<< "delete Scalar: " << value() << nl;
     }
+    auto clone() const { return autoPtr<Scalar>::New(*this); }
 };
 
-bool Scalar::verbose = true;
+Ostream& operator<<(Ostream& os, const Scalar& item)
+{
+    return (os << item.value());
+}
+
+
+class Integer : public BoxedType<label>
+{
+public:
+
+    using BoxedType<label>::BoxedType;
+
+    ~Integer()
+    {
+        if (verbosity) Info<< "delete Integer: " << value() << nl;
+    }
+    auto clone() const { return autoPtr<Integer>::New(*this); }
+};
+
+Ostream& operator<<(Ostream& os, const Integer& item)
+{
+    return (os << item.value());
+}
+
+
+//- Permit up-casting to the base class (eg, fvMesh to polyMesh).
+//  Usually only for holding (const) references.
+//  Exercise caution with the
+template<class Base, class Derived>
+std::enable_if_t<std::is_base_of_v<Base, Derived>, const UPtrList<Base>&>
+upcast(const UPtrList<Derived>& This)
+{
+    return *reinterpret_cast<const UPtrList<Base>*>(&This);
+}
 
 
 // As per
@@ -86,20 +136,7 @@ Ostream& printAddr
     const UPtrList<T>& list
 )
 {
-    const label len = list.size();
-
-    // Size and start delimiter
-    os  << nl << indent << len << nl
-        << indent << token::BEGIN_LIST << incrIndent << nl;
-
-    for (label i=0; i < len; ++i)
-    {
-        os << "addr=" << Foam::name(list.get(i)) << nl;
-    }
-
-    // End delimiter
-    os << decrIndent << indent << token::END_LIST << nl;
-    return os;
+    return list.printAddresses(os);
 }
 
 
@@ -176,11 +213,11 @@ Ostream& print
     {
         const label cap = list.capacity();
 
-        for (label i=len; i < cap; ++i)
+        for (label i = len; i < cap; ++i)
         {
             const T* ptr = list.get(i);
 
-            os << "unused " << name(ptr) << nl;
+            os << "unused " << Foam::name(ptr) << nl;
         }
     }
 
@@ -264,9 +301,9 @@ int main(int argc, char *argv[])
 
         Info<< "DLPtrList: " << llist1 << endl;
 
-        Scalar::verbose = false;
+        verbosity = false;
         llist1.clear();
-        Scalar::verbose = true;
+        verbosity = true;
     }
     #endif
 
@@ -344,6 +381,44 @@ int main(int argc, char *argv[])
     }
 
 
+    // Test upcasting - dangerous
+    {
+        const auto& base =
+            *reinterpret_cast<UPtrList<BoxedType<scalar>>*>(&list1);
+
+        Info<< "list :" << list1 << nl;
+        Info<< "base :" << base << nl;
+    }
+
+    // Expect bad things to happen!!
+    {
+        const auto& base =
+            *reinterpret_cast<UPtrList<BoxedType<label>>*>(&list1);
+
+        Info<< "list :" << list1 << nl;
+        Info<< "base :" << base << nl;
+    }
+
+    // Test upcasting - compile safer (make as member function?)
+    {
+        // const auto& base = list1.upcast<BoxedType<scalar>>();
+        const auto& base = upcast<BoxedType<scalar>>(list1);
+
+        Info<< "list :" << list1 << nl;
+        Info<< "base :" << base << nl;
+    }
+
+    // Refuse to compile (good!)
+    #if 0
+    {
+        // const auto& base = list1.upcast<BoxedType<label>>();
+        const auto& base = upcast<BoxedType<label>>(list1);
+
+        Info<< "list :" << list1 << nl;
+        Info<< "base :" << base << nl;
+    }
+    #endif
+
     PtrList<Scalar> list2(15);
     Info<< "Emplace set " << list2.size() << " values" << nl;
     forAll(list2, i)
@@ -518,6 +593,7 @@ int main(int argc, char *argv[])
         print(Info, dynlist1d);
 
         Info<< "addresses:" << nl;
+        dynlist1d.printAddresses(Info, true);
         printAddr(Info, dynlist1d);
 
         PtrList<Scalar> list1d;

applications/test/PtrListDictionary/Make/files

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

applications/test/PtrListDictionary/Test-PtrListDictionary.cxx

@@ -39,26 +39,26 @@ Description
 
 using namespace Foam;
 
+bool verbosity = true;
+
 class Scalar
 {
     scalar data_;
 
 public:
 
-    static bool verbose;
-
     constexpr Scalar() noexcept : data_(0) {}
     Scalar(scalar val) noexcept : data_(val) {}
 
     ~Scalar()
     {
-        if (verbose) Info<< "delete Scalar: " << data_ << endl;
+        if (verbosity) Info<< "delete Scalar: " << value() << nl;
     }
 
-    const scalar& value() const noexcept { return data_; }
+    scalar value() const noexcept { return data_; }
     scalar& value() noexcept { return data_; }
 
-    autoPtr<Scalar> clone() const { return autoPtr<Scalar>::New(data_); }
+    auto clone() const { return autoPtr<Scalar>::New(*this); }
 
     friend Ostream& operator<<(Ostream& os, const Scalar& item)
     {
@@ -67,8 +67,6 @@ public:
     }
 };
 
-bool Scalar::verbose = true;
-
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 //  Main program:

applications/test/SpanStream1/Test-SpanStream1.cxx

@@ -91,12 +91,6 @@ Ostream& printView(Ostream& os, std::string_view s)
 }
 
 
-Ostream& printView(Ostream& os, stdFoam::span<char> s)
-{
-    return printView(os, s.begin(), s.end());
-}
-
-
 Ostream& printView(Ostream& os, const UList<char>& list)
 {
     return printView(os, list.begin(), list.end());

applications/test/UPstreamTraits/Test-UPstreamTraits.cxx

@@ -200,7 +200,7 @@ void printTypeName()
 
 
 template<class Type, bool UseTypeName = true>
-void printPstreamTraits(const std::string_view name = std::string_view())
+void printPstreamTraits(std::string_view name = std::string_view())
 {
     Info<< "========" << nl;
     Info<< "type: ";
@@ -299,6 +299,9 @@ void printPstreamTraits(const std::string_view name = std::string_view())
         // Use element or component type (or byte-wise) for data type
         using base = typename UPstream_dataType<Type>::base;
 
+        // The sizing factor is constexpr
+        constexpr std::streamsize count = UPstream_dataType<Type>::size(1);
+
         Info<< " : ";
         if constexpr (UseTypeName)
         {
@@ -311,8 +314,7 @@ void printPstreamTraits(const std::string_view name = std::string_view())
 
         Info<< " cmpt-type=";
         printDataTypeId(UPstream_dataType<Type>::datatype_id);
-        Info<< " count=" << UPstream_dataType<Type>::size(1);
-        Info<< nl;
+        Info<< " count=" << count << nl;
     }
 }
 
@@ -362,6 +364,24 @@ void print_data_opType(BinaryOp bop, std::string_view name)
 }
 
 
+
+template<class Type>
+int check_simple(std::string_view name = std::string_view())
+{
+    // The sizing factor is constexpr
+    constexpr std::streamsize count = UPstream_dataType<Type>::size(1);
+
+    static_assert
+    (
+        (count == 1),
+        "Code does not (yet) work with aggregate types"
+    );
+
+    Info<< "check_simple: " << name << ": " << count << nl;
+    return count;
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 // Main program:
 
@@ -389,6 +409,8 @@ int main()
     printPstreamTraits<const float>();
     printPstreamTraits<floatVector>();
 
+    check_simple<floatVector>("vector<float>");
+
     printPstreamTraits<scalar>();
     printPstreamTraits<double>();
     printPstreamTraits<doubleVector>();

applications/test/base64/Make/files

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

applications/test/base64/Test-base64Encoding.cxx

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2016 OpenCFD Ltd.
+    Copyright (C) 2016-2025 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -35,25 +35,31 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "base64Layer.H"
+#include "SpanStream.H"
 #include "List.H"
 #include "Pair.H"
 
-#include <sstream>
-
 using namespace Foam;
 
 bool test(const Pair<string>& unit)
 {
-    const string& input = unit.first();
-    const string& expected = unit.second();
+    const auto& input = unit.first();
+    const auto& expected = unit.second();
 
-    std::ostringstream os;
+    Foam::ocharstream os;
 
-    base64Layer b64(os);
-    b64.write(input.data(), input.size());
-    b64.close();
+    {
+        base64Layer b64(os);
+        b64.write(input.data(), input.size());
 
-    const string encoded = os.str();
+        if (b64.close())
+        {
+            // Extra information
+            // std::cerr<< "closed with pending data" << nl;
+        }
+    }
+
+    const auto encoded = os.view();
 
     Info<< input << nl;
 
@@ -78,7 +84,7 @@ bool test(std::initializer_list<Pair<string>> list)
 {
     bool good = true;
 
-    for (const Pair<string>& t : list)
+    for (const auto& t : list)
     {
         good = test(t) && good;
     }
@@ -91,7 +97,7 @@ bool test(const UList<Pair<string>>& list)
 {
     bool good = true;
 
-    for (const Pair<string>& t : list)
+    for (const auto& t : list)
     {
         good = test(t) && good;
     }
@@ -107,7 +113,7 @@ void testMixed(std::ostream& os, const UList<Pair<string>>& list)
     os  << "<test-mixed>" << nl;
 
     int i=0;
-    for (const Pair<string>& t : list)
+    for (const auto& t : list)
     {
         const string& input = t.first();
 

applications/test/bitSet1/Make/files

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

applications/test/bitSet1/Test-bitSet1.cxx

@@ -142,6 +142,9 @@ int main(int argc, char *argv[])
             Info<< "got: " << bset1 << nl
                 << "and: " << bset2 << nl
                 << "and: " << bset3 << nl;
+
+            Info<< "==";
+            bset3.writeList(Info, 10) << nl;  // matrix-like output
         }
     }
 

applications/test/bitSet2/Test-bitSet2.cxx

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018-2021 OpenCFD Ltd.
+    Copyright (C) 2018-2025 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -75,9 +75,9 @@ inline Ostream& info(const UList<bool>& bools)
     Info<< "size=" << bools.size()
         << " count=" << BitOps::count(bools)
         << " !count=" << BitOps::count(bools, false)
-        << " all:" << BitOps::all(bools)
-        << " any:" << BitOps::any(bools)
-        << " none:" << BitOps::none(bools) << nl;
+        << " all:" << bools.all()
+        << " any:" << bools.any()
+        << " none:" << bools.none() << nl;
 
     return Info;
 }
@@ -137,11 +137,11 @@ inline bool compare
     const std::string& expected
 )
 {
-    const List<unsigned int>& store = bitset.storage();
+    const auto& store = bitset.storage();
 
     std::string has;
 
-    for (label blocki=0; blocki < bitset.nBlocks(); ++blocki)
+    for (label blocki=0; blocki < bitset.num_blocks(); ++blocki)
     {
         has += toString(store[blocki]);
     }
@@ -194,8 +194,10 @@ int main(int argc, char *argv[])
     {
         boolList bools = list1.values();
 
-        Info<<"===============" << nl;
-        Info<<"bools: " << flatOutput(bools) << nl;
+        Info<< "===============" << nl;
+        Info<< "bools: " << flatOutput(bools) << nl;
+        Info<< "    ";
+        info(bools);
 
         for (int i : { -10, 0, 8, 15, 32})
         {
@@ -238,17 +240,18 @@ int main(int argc, char *argv[])
     }
 
     #ifdef TEST_SFINAE
+    // This should fail to compile:
     {
         labelList labels = list1.toc();
         if (labels.test(0))
         {
-            Info<<"no" << endl;
+            Info<< "no" << endl;
         }
 
         List<double*> ptrs(10, nullptr);
         if (ptrs.get(0))
         {
-            Info<<"no" << endl;
+            Info<< "no" << endl;
         }
     }
     #endif

applications/test/boolList/Make/files

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

applications/test/boolList/Test-boolList.cxx

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2020-2022 OpenCFD Ltd.
+    Copyright (C) 2020-2025 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -71,9 +71,9 @@ inline Ostream& info(const UList<bool>& bools)
     Info<< "size=" << bools.size()
         << " count=" << BitOps::count(bools)
         << " !count=" << BitOps::count(bools, false)
-        << " all:" << BitOps::all(bools)
-        << " any:" << BitOps::any(bools)
-        << " none:" << BitOps::none(bools) << nl;
+        << " all:" << bools.all()
+        << " any:" << bools.any()
+        << " none:" << bools.none() << nl;
 
     return Info;
 }

applications/test/codeStream/codeStreamDict1

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

applications/test/compoundToken1/Make/files

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

applications/test/compoundToken1/Test-compoundToken1.cxx

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2023 OpenCFD Ltd.
+    Copyright (C) 2023-2025 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -158,7 +158,8 @@ void populateCompound(token::compound& ct, const dictionary& dict)
         }
         break;
 
-        case token::tokenType::LABEL :
+        case token::tokenType::INTEGER_32 :
+        case token::tokenType::INTEGER_64 :
         {
             fillComponents(label, cmpts, 123);
         }

applications/test/compoundToken1/testDict1

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

applications/test/compoundToken1/testDict2

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

applications/test/coordinateSystem/testCase0/constant/coordinateSystems

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2412                                 |
+|  \\    /   O peration     | Version:  v2506                                 |
 |   \\  /    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:  v2412                                 |
+|  \\    /   O peration     | Version:  v2506                                 |
 |   \\  /    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:  v2412                                 |
+|  \\    /   O peration     | Version:  v2506                                 |
 |   \\  /    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:  v2412                                 |
+|  \\    /   O peration     | Version:  v2506                                 |
 |   \\  /    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:  v2412                                 |
+|  \\    /   O peration     | Version:  v2506                                 |
 |   \\  /    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:  v2412                                 |
+|  \\    /   O peration     | Version:  v2506                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/

applications/test/dictionary/Make/files

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

applications/test/dictionary/blockMeshDict1.calc

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2412                                 |
+|  \\    /   O peration     | Version:  v2506                                 |
 |   \\  /    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:  v2412                                 |
+|  \\    /   O peration     | Version:  v2506                                 |
 |   \\  /    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:  v2412                                 |
+|  \\    /   O peration     | Version:  v2506                                 |
 |   \\  /    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:  v2412                                 |
+|  \\    /   O peration     | Version:  v2506                                 |
 |   \\  /    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:  v2412                                 |
+|  \\    /   O peration     | Version:  v2506                                 |
 |   \\  /    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:  v2412                                 |
+|  \\    /   O peration     | Version:  v2506                                 |
 |   \\  /    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:  v2412                                 |
+|  \\    /   O peration     | Version:  v2506                                 |
 |   \\  /    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:  v2412                                 |
+|  \\    /   O peration     | Version:  v2506                                 |
 |   \\  /    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:  v2412                                 |
+|  \\    /   O peration     | Version:  v2506                                 |
 |   \\  /    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:  v2412                                 |
+|  \\    /   O peration     | Version:  v2506                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/

applications/test/dictionary/testDictEval5

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2412                                 |
+|  \\    /   O peration     | Version:  v2506                                 |
 |   \\  /    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:  v2412                                 |
+|  \\    /   O peration     | Version:  v2506                                 |
 |   \\  /    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:  v2412                                 |
+|  \\    /   O peration     | Version:  v2506                                 |
 |   \\  /    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:  v2412                                 |
+|  \\    /   O peration     | Version:  v2506                                 |
 |   \\  /    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:  v2412                                 |
+|  \\    /   O peration     | Version:  v2506                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/

applications/test/dictionary2/Make/files

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

applications/test/dictionary2/Test-dictionary2.cxx

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2017-2023 OpenCFD Ltd.
+    Copyright (C) 2017-2025 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -47,8 +47,18 @@ void entryInfo(entry* e)
 {
     if (e)
     {
-        Info<<"added "
-            << e->keyword() << ": " << typeid(e).name() << nl;
+        Info<< "added "
+            << e->keyword() << ": " << typeid(e).name();
+
+        if (auto* stream = e->streamPtr())
+        {
+            Info<< " tokens: "; stream->tokens().writeList(Info);
+        }
+        if (auto* dict = e->dictPtr())
+        {
+            Info<< " dictionary:";
+        }
+        Info<< nl;
     }
 }
 
@@ -200,12 +210,31 @@ int main(int argc, char *argv[])
     {
         dictionary tmpdict;
 
+        // Add an empty entry and populate afterwards
+        if (entry* e = dict1.set(word::printf("entry%d", i), nullptr))
         {
-            entry* e = dict1.add
-            (
-                word::printf("entry%d", i),
-                string("entry" + Foam::name(i))
-            );
+            auto& toks = e->stream();
+            toks.resize(2);
+
+            toks[0] = word("value" + Foam::name(i));
+            toks[1] = 10*i;
+            entryInfo(e);
+        }
+
+        // Add an entry from given list of tokens
+        {
+            tokenList toks(2);
+            toks[0] = word("value" + Foam::name(i));
+            toks[1] = 10*i;
+
+            Info<< "set token0: " << Foam::name(&(toks[0])) << nl;
+
+            entry* e = dict1.set(word::printf("_entry%d", i), std::move(toks));
+
+            // verify that the address is identical (ie, move semantics worked)
+            auto& newToks = e->stream();
+            Info<< "get token0: " << Foam::name(&(newToks[0])) << nl;
+
             entryInfo(e);
         }
 

applications/test/dictionaryCopy/Make/files

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

applications/test/dictionaryCopy/testDictCopy

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2412                                 |
+|  \\    /   O peration     | Version:  v2506                                 |
 |   \\  /    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:  v2412                                 |
+|  \\    /   O peration     | Version:  v2506                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/

applications/test/fieldMapping/pipe1D/constant/manualDecomposition

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