ENH: integrate memory pool support for List allocations

- provides an optional memory management using a memory pool.
  Currently can support Umpire (https://github.com/LLNL/Umpire)

  When available, its use can be controlled by the FOAM_MEMORY_POOL
  environment variable, or the memory_pool Optimisation switch
  (etc/controlDict).

Notes:

  Use of the memory-pool is controlled by the 'is_aligned_type()' test
  and the minimum field size, controlled by the 'use_memory_pool()' test.

  If the memory-pool is not enabled or not required according to the two
  above tests, the allocation falls back to either an aligned or unaligned
  allocation (depending on the field size).

  The thresholds for aligned, unaligned, memory-pool allocation
  are still a compile-time option. Made by direct edit of the
  corrsponding functions.

applications/solvers/combustion/PDRFoam/setDeltaT.H

@@ -36,7 +36,8 @@ Description
 if (adjustTimeStep)
 {
     scalar maxDeltaTFact = maxCo/(CoNum + StCoNum + SMALL);
-    scalar deltaTFact =
+
+    const scalar deltaTFact =
         Foam::min(Foam::min(maxDeltaTFact, 1.0 + 0.1*maxDeltaTFact), 1.2);
 
     runTime.setDeltaT

applications/solvers/combustion/chemFoam/setDeltaT.H

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

applications/solvers/combustion/reactingFoam/setRDeltaT.H

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2013-2016 OpenFOAM Foundation
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020,2025 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -57,10 +57,22 @@ License
     // (relative to reference value)
     scalar alphaY(pimpleDict.getOrDefault<scalar>("alphaY", 1.0));
 
-    Info<< "Time scales min/max:" << endl;
 
-    // Cache old reciprocal time scale field
-    volScalarField rDeltaT0("rDeltaT0", rDeltaT);
+    // The old reciprocal time scale field, with any damping factor
+    tmp<volScalarField> rDeltaT0_damped;
+
+    // Calculate damped value before applying any other changes
+    if
+    (
+        rDeltaTDampingCoeff < 1
+     && runTime.timeIndex() > runTime.startTimeIndex() + 1
+    )
+    {
+        rDeltaT0_damped = (scalar(1) - rDeltaTDampingCoeff)*(rDeltaT);
+    }
+
+
+    Info<< "Time scales min/max:" << endl;
 
     // Flow time scale
     {
@@ -70,12 +82,14 @@ License
            /((2*maxCo)*mesh.V()*rho())
         );
 
-        // Limit the largest time scale
-        rDeltaT.max(1/maxDeltaT);
+        // Limit the largest time scale (=> smallest reciprocal time)
+        rDeltaT.clamp_min(1/maxDeltaT);
+
+        auto limits = gMinMax(rDeltaT.primitiveField());
+        limits.reset(1/(limits.max()+VSMALL), 1/(limits.min()+VSMALL));
 
         Info<< "    Flow        = "
-            << 1/gMax(rDeltaT.primitiveField()) << ", "
-            << 1/gMin(rDeltaT.primitiveField()) << endl;
+            << limits.min() << ", " << limits.max() << endl;
     }
 
     // Heat release rate time scale
@@ -86,11 +100,13 @@ License
             mag(Qdot)/(alphaTemp*rho*thermo.Cp()*T)
         );
 
-        Info<< "    Temperature = "
-            << 1/(gMax(rDeltaTT.field()) + VSMALL) << ", "
-            << 1/(gMin(rDeltaTT.field()) + VSMALL) << endl;
+        rDeltaT.primitiveFieldRef().clamp_min(rDeltaTT);
 
-        rDeltaT.ref() = max(rDeltaT(), rDeltaTT);
+        auto limits = gMinMax(rDeltaTT.field());
+        limits.reset(1/(limits.max()+VSMALL), 1/(limits.min()+VSMALL));
+
+        Info<< "    Temperature = "
+            << limits.min() << ", " << limits.max() << endl;
     }
 
     // Reaction rate time scale
@@ -138,11 +154,13 @@ License
 
         if (foundY)
         {
-            Info<< "    Composition = "
-                << 1/(gMax(rDeltaTY.field()) + VSMALL) << ", "
-                << 1/(gMin(rDeltaTY.field()) + VSMALL) << endl;
+            rDeltaT.primitiveFieldRef().clamp_min(rDeltaTY);
 
-            rDeltaT.ref() = max(rDeltaT(), rDeltaTY);
+            auto limits = gMinMax(rDeltaTY.field());
+            limits.reset(1/(limits.max()+VSMALL), 1/(limits.min()+VSMALL));
+
+            Info<< "    Composition = "
+                << limits.min() << ", " << limits.max() << endl;
         }
         else
         {
@@ -161,28 +179,22 @@ License
         fvc::smooth(rDeltaT, rDeltaTSmoothingCoeff);
     }
 
-    // Limit rate of change of time scale
+    // Limit rate of change of time scale (=> smallest reciprocal time)
     // - reduce as much as required
     // - only increase at a fraction of old time scale
-    if
-    (
-        rDeltaTDampingCoeff < 1
-     && runTime.timeIndex() > runTime.startTimeIndex() + 1
-    )
+    if (rDeltaT0_damped)
     {
-        rDeltaT = max
-        (
-            rDeltaT,
-            (scalar(1) - rDeltaTDampingCoeff)*rDeltaT0
-        );
+        rDeltaT.clamp_min(rDeltaT0_damped());
     }
 
     // Update tho boundary values of the reciprocal time-step
     rDeltaT.correctBoundaryConditions();
 
+    auto limits = gMinMax(rDeltaT.field());
+    limits.reset(1/(limits.max()+VSMALL), 1/(limits.min()+VSMALL));
+
     Info<< "    Overall     = "
-        << 1/gMax(rDeltaT.primitiveField())
-        << ", " << 1/gMin(rDeltaT.primitiveField()) << endl;
+        << limits.min() << ", " << limits.max() << endl;
 }
 
 

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

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2015 OpenFOAM Foundation
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020,2025 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -106,7 +106,7 @@ Foam::smoluchowskiJumpTFvPatchScalarField::smoluchowskiJumpTFvPatchScalarField
     if (!this->readValueEntry(dict))
     {
         // Fallback: set to the internal field
-        fvPatchField<scalar>::patchInternalField(*this);
+        this->extrapolateInternal();
     }
 
     refValue() = *this;

applications/solvers/compressible/rhoCentralFoam/setRDeltaT.H

@@ -23,7 +23,11 @@
 
     fvc::smooth(rDeltaT, rDeltaTSmoothingCoeff);
 
-    Info<< "Flow time scale min/max = "
-        << gMin(1/rDeltaT.primitiveField())
-        << ", " << gMax(1/rDeltaT.primitiveField()) << endl;
+    {
+        auto limits = gMinMax(rDeltaT.primitiveField());
+        limits.reset(1/(limits.max()+VSMALL), 1/(limits.min()+VSMALL));
+
+        Info<< "Flow time scale min/max = "
+            << limits.min() << ", " << limits.max() << endl;
+    }
 }

applications/solvers/compressible/rhoPimpleFoam/setRDeltaT.H

@@ -52,18 +52,26 @@
     // Update the boundary values of the reciprocal time-step
     rDeltaT.correctBoundaryConditions();
 
-    Info<< "Flow time scale min/max = "
-        << gMin(1/rDeltaT.primitiveField())
-        << ", " << gMax(1/rDeltaT.primitiveField()) << endl;
+    {
+        auto limits = gMinMax(rDeltaT.primitiveField());
+        limits.reset(1/(limits.max()+VSMALL), 1/(limits.min()+VSMALL));
+
+        Info<< "Flow time scale min/max = "
+            << limits.min() << ", " << limits.max() << endl;
+    }
 
     if (rDeltaTSmoothingCoeff < 1.0)
     {
         fvc::smooth(rDeltaT, rDeltaTSmoothingCoeff);
     }
 
-    Info<< "Smoothed flow time scale min/max = "
-        << gMin(1/rDeltaT.primitiveField())
-        << ", " << gMax(1/rDeltaT.primitiveField()) << endl;
+    {
+        auto limits = gMinMax(rDeltaT.primitiveField());
+        limits.reset(1/(limits.max()+VSMALL), 1/(limits.min()+VSMALL));
+
+        Info<< "Smoothed flow time scale min/max = "
+            << limits.min() << ", " << limits.max() << endl;
+    }
 
     // Limit rate of change of time scale
     // - reduce as much as required
@@ -75,13 +83,13 @@
     )
     {
         rDeltaT =
-        (
             rDeltaT0
-          * Foam::max(rDeltaT/rDeltaT0, scalar(1) - rDeltaTDampingCoeff)
-        );
+           *max(rDeltaT/rDeltaT0, scalar(1) - rDeltaTDampingCoeff);
+
+        auto limits = gMinMax(rDeltaT.primitiveField());
+        limits.reset(1/(limits.max()+VSMALL), 1/(limits.min()+VSMALL));
 
         Info<< "Damped flow time scale min/max = "
-            << gMin(1/rDeltaT.primitiveField())
-            << ", " << gMax(1/rDeltaT.primitiveField()) << endl;
+            << limits.min() << ", " << limits.max() << endl;
     }
 }

applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/pEqn.H

@@ -78,8 +78,8 @@
     }
 
     rho = thermo.rho();
-    rho = max(rho, rhoMin[i]);
-    rho = min(rho, rhoMax[i]);
+
+    rho.clamp_range(rhoMin[i], rhoMax[i]);
     rho.relax();
 
     Info<< "Min/max rho:" << min(rho).value() << ' '

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

@@ -387,15 +387,18 @@ updateCoeffs()
         {
             scalar Q = gSum(kappa(Tp)*patch().magSf()*snGrad());
 
-                Info<< "T solid : " << nl << endl;
+            auto limits = gMinMax(Tp);
+            auto avg = gAverage(Tp);
 
-                Info
-                    << " heat transfer rate from solid:" << Q
-                    << " walltemperature "
-                    << " min:" << gMin(Tp)
-                    << " max:" << gMax(Tp)
-                    << " avg:" << gAverage(Tp) << nl
-                    << endl;
+            Info<< "T solid : " << nl << endl;
+
+            Info
+                << " heat transfer rate from solid:" << Q
+                << " walltemperature "
+                << " min:" << limits.min()
+                << " max:" << limits.max()
+                << " avg:" << avg << nl
+                << endl;
         }
     }
     else if (regionType_ == fluid)
@@ -445,10 +448,16 @@ updateCoeffs()
             scalarField qLiq((Tp - Tc)*KdeltaLiq);
             scalarField qVap((Tp - Tv.patchInternalField())*KdeltaVap);
 
+            auto infoT = gMinMax(Tp);
+            auto avgT = gAverage(Tp);
+
+            auto infoLiq = gMinMax(qLiq);
+            auto infoVap = gMinMax(qVap);
+
             Info<< "T flow : " << nl << endl;
 
-            Info<< "  qLiq: " << gMin(qLiq) << " - " << gMax(qLiq) << endl;
-            Info<< "  qVap: " << gMin(qVap) << " - " << gMax(qVap) << endl;
+            Info<< "  qLiq: " << infoLiq.min() << " - " << infoLiq.max() << nl
+                << "  qVap: " << infoVap.min() << " - " << infoVap.max() << nl;
 
             scalar QLiq = gSum(qLiq*patch().magSf());
             scalar QVap = gSum(qVap*patch().magSf());
@@ -457,9 +466,9 @@ updateCoeffs()
             Info<<  " Heat transfer to Vap: " << QVap << endl;
 
             Info<< " walltemperature "
-                << " min:" << gMin(Tp)
-                << " max:" << gMax(Tp)
-                << " avg:" << gAverage(Tp)
+                << " min:" << infoT.min()
+                << " max:" << infoT.max()
+                << " avg:" << avgT
                 << endl;
         }
     }

applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/fluid/compressibleMultiRegionCourantNo.H

@@ -31,7 +31,7 @@
             );
 
 
-            scalar maxPhiCoNum =
+            scalar regionCoNum =
                 0.5*gMax
                 (
                     sumPhi/fluidRegions[regioni].V().field()
@@ -43,7 +43,7 @@
               / fluidRegions[regioni].V().field()
             )*runTime.deltaTValue();
 
-            CoNum = Foam::max(CoNum, Foam::max(maxPhiCoNum, UrCoNum));
+            CoNum = Foam::max(CoNum, Foam::max(regionCoNum, UrCoNum));
         }
     }
 

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

@@ -48,12 +48,8 @@ if (adjustTimeStep)
     scalar maxDeltaTFluid = maxCo/(CoNum + SMALL);
     scalar maxDeltaTSolid = maxDi/(DiNum + SMALL);
 
-    scalar deltaTFluid =
-        Foam::min
-        (
-            Foam::min(maxDeltaTFluid, 1.0 + 0.1*maxDeltaTFluid),
-            1.2
-        );
+    const scalar deltaTFluid =
+        Foam::min(Foam::min(maxDeltaTFluid, 1.0 + 0.1*maxDeltaTFluid), 1.2);
 
     runTime.setDeltaT
     (

applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C

@@ -60,13 +60,10 @@ template<class Type>
 void zeroCells
 (
     GeometricField<Type, fvPatchField, volMesh>& vf,
-    const labelList& cells
+    const labelUList& cells
 )
 {
-    forAll(cells, i)
-    {
-        vf[cells[i]] = Zero;
-    }
+    UIndirectList<Type>(vf.primitiveField(), cells) = Zero;
 }
 
 

applications/solvers/incompressible/adjointShapeOptimizationFoam/createFields.H

@@ -103,8 +103,8 @@ dimensionedScalar alphaMax
     laminarTransport
 );
 
-const labelList& inletCells = mesh.boundary()["inlet"].faceCells();
-//const labelList& outletCells = mesh.boundary()["outlet"].faceCells();
+const labelUList& inletCells = mesh.boundary()["inlet"].faceCells();
+//const labelUList& outletCells = mesh.boundary()["outlet"].faceCells();
 
 volScalarField alpha
 (

applications/solvers/incompressible/pimpleFoam/overPimpleDyMFoam/correctPhi.H

@@ -55,7 +55,7 @@ if (mesh.changing())
     dimensionedScalar rAUf("rAUf", dimTime, 1.0);
 
     const cellCellStencilObject& overlap = Stencil::New(mesh);
-    const labelList& cellTypes = overlap.cellTypes();
+    const labelUList& cellTypes = overlap.cellTypes();
     const labelIOList& zoneIDs = overlap.zoneID();
 
     while (pimple.correctNonOrthogonal())

applications/solvers/incompressible/pimpleFoam/setRDeltaT.H

@@ -36,18 +36,26 @@
     // Update the boundary values of the reciprocal time-step
     rDeltaT.correctBoundaryConditions();
 
-    Info<< "Flow time scale min/max = "
-        << gMin(1/rDeltaT.primitiveField())
-        << ", " << gMax(1/rDeltaT.primitiveField()) << endl;
+    {
+        auto limits = gMinMax(rDeltaT.primitiveField());
+        limits.reset(1/(limits.max()+VSMALL), 1/(limits.min()+VSMALL));
+
+        Info<< "Flow time scale min/max = "
+            << limits.min() << ", " << limits.max() << endl;
+    }
 
     if (rDeltaTSmoothingCoeff < 1.0)
     {
         fvc::smooth(rDeltaT, rDeltaTSmoothingCoeff);
     }
 
-    Info<< "Smoothed flow time scale min/max = "
-        << gMin(1/rDeltaT.primitiveField())
-        << ", " << gMax(1/rDeltaT.primitiveField()) << endl;
+    {
+        auto limits = gMinMax(rDeltaT.primitiveField());
+        limits.reset(1/(limits.max()+VSMALL), 1/(limits.min()+VSMALL));
+
+        Info<< "Smoothed flow time scale min/max = "
+            << limits.min() << ", " << limits.max() << endl;
+    }
 
     // Limit rate of change of time scale
     // - reduce as much as required
@@ -62,8 +70,10 @@
             rDeltaT0
            *max(rDeltaT/rDeltaT0, scalar(1) - rDeltaTDampingCoeff);
 
+        auto limits = gMinMax(rDeltaT.primitiveField());
+        limits.reset(1/(limits.max()+VSMALL), 1/(limits.min()+VSMALL));
+
         Info<< "Damped flow time scale min/max = "
-            << gMin(1/rDeltaT.primitiveField())
-            << ", " << gMax(1/rDeltaT.primitiveField()) << endl;
+            << limits.min() << ", " << limits.max() << endl;
     }
 }

applications/solvers/lagrangian/coalChemistryFoam/setRDeltaT.H

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020,2025 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -54,10 +54,21 @@ License
     scalar alphaTemp(pimpleDict.getOrDefault("alphaTemp", 0.05));
 
 
-    Info<< "Time scales min/max:" << endl;
+    // The old reciprocal time scale field, with any damping factor
+    tmp<volScalarField> rDeltaT0_damped;
 
-    // Cache old reciprocal time scale field
-    volScalarField rDeltaT0("rDeltaT0", rDeltaT);
+    // Calculate damped value before applying any other changes
+    if
+    (
+        rDeltaTDampingCoeff < 1
+     && runTime.timeIndex() > runTime.startTimeIndex() + 1
+    )
+    {
+        rDeltaT0_damped = (scalar(1) - rDeltaTDampingCoeff)*(rDeltaT);
+    }
+
+
+    Info<< "Time scales min/max:" << endl;
 
     // Flow time scale
     {
@@ -67,12 +78,14 @@ License
            /((2*maxCo)*mesh.V()*rho())
         );
 
-        // Limit the largest time scale
-        rDeltaT.max(1/maxDeltaT);
+        // Limit the largest time scale (=> smallest reciprocal time)
+        rDeltaT.clamp_min(1/maxDeltaT);
+
+        auto limits = gMinMax(rDeltaT.primitiveField());
+        limits.reset(1/(limits.max()+VSMALL), 1/(limits.min()+VSMALL));
 
         Info<< "    Flow        = "
-            << gMin(1/rDeltaT.primitiveField()) << ", "
-            << gMax(1/rDeltaT.primitiveField()) << endl;
+            << limits.min() << ", " << limits.max() << endl;
     }
 
     // Reaction source time scale
@@ -93,15 +106,13 @@ License
            )
         );
 
-        Info<< "    Temperature = "
-            << gMin(1/(rDeltaTT.field() + VSMALL)) << ", "
-            << gMax(1/(rDeltaTT.field() + VSMALL)) << endl;
+        rDeltaT.primitiveFieldRef().clamp_min(rDeltaTT);
 
-        rDeltaT.ref() = max
-        (
-            rDeltaT(),
-            rDeltaTT
-        );
+        auto limits = gMinMax(rDeltaTT.field());
+        limits.reset(1/(limits.max()+VSMALL), 1/(limits.min()+VSMALL));
+
+        Info<< "    Temperature = "
+            << limits.min() << ", " << limits.max() << endl;
     }
 
     // Update tho boundary values of the reciprocal time-step
@@ -113,25 +124,19 @@ License
         fvc::smooth(rDeltaT, rDeltaTSmoothingCoeff);
     }
 
-    // Limit rate of change of time scale
+    // Limit rate of change of time scale (=> smallest reciprocal time)
     // - reduce as much as required
     // - only increase at a fraction of old time scale
-    if
-    (
-        rDeltaTDampingCoeff < 1.0
-     && runTime.timeIndex() > runTime.startTimeIndex() + 1
-    )
+    if (rDeltaT0_damped)
     {
-        rDeltaT = max
-        (
-            rDeltaT,
-            (scalar(1) - rDeltaTDampingCoeff)*rDeltaT0
-        );
+        rDeltaT.clamp_min(rDeltaT0_damped());
     }
 
+    auto limits = gMinMax(rDeltaT.primitiveField());
+    limits.reset(1/(limits.max()+VSMALL), 1/(limits.min()+VSMALL));
+
     Info<< "    Overall     = "
-        << gMin(1/rDeltaT.primitiveField())
-        << ", " << gMax(1/rDeltaT.primitiveField()) << endl;
+        << limits.min() << ", " << limits.max() << endl;
 }
 
 

applications/solvers/lagrangian/reactingParcelFoam/setMultiRegionDeltaT.H

@@ -38,8 +38,10 @@ if (adjustTimeStep)
     const scalar maxDeltaTFact =
         Foam::min
         (
-            maxCo/(CoNum + SMALL), maxCo/(surfaceFilm.CourantNumber() + SMALL)
+            maxCo/(CoNum + SMALL),
+            maxCo/(surfaceFilm.CourantNumber() + SMALL)
         );
+
     const scalar deltaTFact =
         Foam::min(Foam::min(maxDeltaTFact, 1.0 + 0.1*maxDeltaTFact), 1.2);
 

applications/solvers/lagrangian/reactingParcelFoam/setRDeltaT.H

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020,2025 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -54,10 +54,21 @@ License
     scalar alphaTemp(pimpleDict.getOrDefault("alphaTemp", 0.05));
 
 
-    Info<< "Time scales min/max:" << endl;
+    // The old reciprocal time scale field, with any damping factor
+    tmp<volScalarField> rDeltaT0_damped;
 
-    // Cache old reciprocal time scale field
-    volScalarField rDeltaT0("rDeltaT0", rDeltaT);
+    // Calculate damped value before applying any other changes
+    if
+    (
+        rDeltaTDampingCoeff < 1
+     && runTime.timeIndex() > runTime.startTimeIndex() + 1
+    )
+    {
+        rDeltaT0_damped = (scalar(1) - rDeltaTDampingCoeff)*(rDeltaT);
+    }
+
+
+    Info<< "Time scales min/max:" << endl;
 
     // Flow time scale
     {
@@ -67,12 +78,14 @@ License
            /((2*maxCo)*mesh.V()*rho())
         );
 
-        // Limit the largest time scale
-        rDeltaT.max(1/maxDeltaT);
+        // Limit the largest time scale (=> smallest reciprocal time)
+        rDeltaT.clamp_min(1/maxDeltaT);
+
+        auto limits = gMinMax(rDeltaT.primitiveField());
+        limits.reset(1/(limits.max()+VSMALL), 1/(limits.min()+VSMALL));
 
         Info<< "    Flow        = "
-            << gMin(1/rDeltaT.primitiveField()) << ", "
-            << gMax(1/rDeltaT.primitiveField()) << endl;
+            << limits.min() << ", " << limits.max() << endl;
     }
 
     // Reaction source time scale
@@ -92,15 +105,13 @@ License
            )
         );
 
-        Info<< "    Temperature = "
-            << gMin(1/(rDeltaTT.field() + VSMALL)) << ", "
-            << gMax(1/(rDeltaTT.field() + VSMALL)) << endl;
+        rDeltaT.primitiveFieldRef().clamp_min(rDeltaTT);
 
-        rDeltaT.ref() = max
-        (
-            rDeltaT(),
-            rDeltaTT
-        );
+        auto limits = gMinMax(rDeltaTT.field());
+        limits.reset(1/(limits.max()+VSMALL), 1/(limits.min()+VSMALL));
+
+        Info<< "    Temperature = "
+            << limits.min() << ", " << limits.max() << endl;
     }
 
     // Update the boundary values of the reciprocal time-step
@@ -112,25 +123,22 @@ License
         fvc::smooth(rDeltaT, rDeltaTSmoothingCoeff);
     }
 
-    // Limit rate of change of time scale
+    // Limit rate of change of time scale (=> smallest reciprocal time)
     // - reduce as much as required
     // - only increase at a fraction of old time scale
-    if
-    (
-        rDeltaTDampingCoeff < 1.0
-     && runTime.timeIndex() > runTime.startTimeIndex() + 1
-    )
+    if (rDeltaT0_damped)
     {
-        rDeltaT = max
-        (
-            rDeltaT,
-            (scalar(1) - rDeltaTDampingCoeff)*rDeltaT0
-        );
+        rDeltaT.clamp_min(rDeltaT0_damped());
     }
 
+    // Update the boundary values of the reciprocal time-step
+    rDeltaT.correctBoundaryConditions();
+
+    auto limits = gMinMax(rDeltaT.primitiveField());
+    limits.reset(1/(limits.max()+VSMALL), 1/(limits.min()+VSMALL));
+
     Info<< "    Overall     = "
-        << gMin(1/rDeltaT.primitiveField())
-        << ", " << gMax(1/rDeltaT.primitiveField()) << endl;
+        << limits.min() << ", " << limits.max() << endl;
 }
 
 

applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/pEqn.H

@@ -48,8 +48,7 @@ U.correctBoundaryConditions();
 fvOptions.correct(U);
 
 rho = thermo.rho();
-rho = max(rho, rhoMin);
-rho = min(rho, rhoMax);
+rho.clamp_range(rhoMin, rhoMax);
 rho.relax();
 
 Info<< "p min/max = " << min(p).value() << ", " << max(p).value() << endl;

applications/solvers/lagrangian/simpleCoalParcelFoam/pEqn.H

@@ -49,8 +49,7 @@
     fvOptions.correct(U);
 
     rho = thermo.rho();
-    rho = max(rho, rhoMin);
-    rho = min(rho, rhoMax);
+    rho.clamp_range(rhoMin, rhoMax);
     rho.relax();
 
     Info<< "p min/max = " << min(p).value() << ", " << max(p).value() << endl;

applications/solvers/lagrangian/sprayFoam/pEqn.H

@@ -1,6 +1,5 @@
 rho = thermo.rho();
-rho = max(rho, rhoMin);
-rho = min(rho, rhoMax);
+rho.clamp_range(rhoMin, rhoMax);
 rho.relax();
 
 volScalarField rAU(1.0/UEqn.A());
@@ -94,8 +93,7 @@ p.relax();
 
 // Recalculate density from the relaxed pressure
 rho = thermo.rho();
-rho = max(rho, rhoMin);
-rho = min(rho, rhoMax);
+rho.clamp_range(rhoMin, rhoMax);
 rho.relax();
 Info<< "rho min/max : " << min(rho).value() << " " << max(rho).value() << endl;
 

applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/pEqn.H

@@ -1,6 +1,5 @@
 rho = thermo.rho();
-rho = max(rho, rhoMin);
-rho = min(rho, rhoMax);
+rho.clamp_range(rhoMin, rhoMax);
 rho.relax();
 
 volScalarField rAU(1.0/UEqn.A());
@@ -94,8 +93,7 @@ p.relax();
 
 // Recalculate density from the relaxed pressure
 rho = thermo.rho();
-rho = max(rho, rhoMin);
-rho = min(rho, rhoMax);
+rho.clamp_range(rhoMin, rhoMax);
 rho.relax();
 Info<< "rho min/max : " << min(rho).value() << " " << max(rho).value() << endl;
 

applications/solvers/multiphase/VoF/setDeltaT.H

@@ -38,7 +38,7 @@ if (adjustTimeStep)
     scalar maxDeltaTFact =
         Foam::min(maxCo/(CoNum + SMALL), maxAlphaCo/(alphaCoNum + SMALL));
 
-    scalar deltaTFact =
+    const scalar deltaTFact =
         Foam::min(Foam::min(maxDeltaTFact, 1.0 + 0.1*maxDeltaTFact), 1.2);
 
     runTime.setDeltaT

applications/solvers/multiphase/VoF/setRDeltaT.H

@@ -53,6 +53,21 @@
         pimpleDict.getOrDefault<scalar>("maxDeltaT", GREAT)
     );
 
+
+    // The old reciprocal time scale field, with any damping factor
+    tmp<volScalarField> rDeltaT0_damped;
+
+    // Calculate damped value before applying any other changes
+    if
+    (
+        rDeltaTDampingCoeff < 1
+     && runTime.timeIndex() > runTime.startTimeIndex() + 1
+    )
+    {
+        rDeltaT0_damped = (scalar(1) - rDeltaTDampingCoeff)*(rDeltaT);
+    }
+
+
     volScalarField rDeltaT0("rDeltaT0", rDeltaT);
 
     // Set the reciprocal time-step from the local Courant number
@@ -83,10 +98,13 @@
     // Update tho boundary values of the reciprocal time-step
     rDeltaT.correctBoundaryConditions();
 
-    Info<< "Flow time scale min/max = "
-        << gMin(1/rDeltaT.primitiveField())
-        << ", " << gMax(1/rDeltaT.primitiveField()) << endl;
+    {
+        auto limits = gMinMax(rDeltaT.primitiveField());
+        limits.reset(1/(limits.max()+VSMALL), 1/(limits.min()+VSMALL));
 
+        Info<< "Flow time scale min/max = "
+            << limits.min() << ", " << limits.max() << endl;
+    }
     if (rDeltaTSmoothingCoeff < 1.0)
     {
         fvc::smooth(rDeltaT, rDeltaTSmoothingCoeff);
@@ -110,27 +128,25 @@
         fvc::sweep(rDeltaT, alpha1, nAlphaSweepIter, alphaSpreadDiff);
     }
 
-    Info<< "Smoothed flow time scale min/max = "
-        << gMin(1/rDeltaT.primitiveField())
-        << ", " << gMax(1/rDeltaT.primitiveField()) << endl;
+    {
+        auto limits = gMinMax(rDeltaT.primitiveField());
+        limits.reset(1/(limits.max()+VSMALL), 1/(limits.min()+VSMALL));
 
-    // Limit rate of change of time scale
+        Info<< "Smoothed flow time scale min/max = "
+            << limits.min() << ", " << limits.max() << endl;
+    }
+
+    // Limit rate of change of time scale (=> smallest reciprocal time)
     // - reduce as much as required
     // - only increase at a fraction of old time scale
-    if
-    (
-        rDeltaTDampingCoeff < 1.0
-     && runTime.timeIndex() > runTime.startTimeIndex() + 1
-    )
+    if (rDeltaT0_damped)
     {
-        rDeltaT = max
-        (
-            rDeltaT,
-            (scalar(1) - rDeltaTDampingCoeff)*rDeltaT0
-        );
+        rDeltaT.clamp_min(rDeltaT0_damped());
+
+        auto limits = gMinMax(rDeltaT.primitiveField());
+        limits.reset(1/(limits.max()+VSMALL), 1/(limits.min()+VSMALL));
 
         Info<< "Damped flow time scale min/max = "
-            << gMin(1/rDeltaT.primitiveField())
-            << ", " << gMax(1/rDeltaT.primitiveField()) << endl;
+            << limits.min() << ", " << limits.max() << endl;
     }
 }

applications/solvers/multiphase/cavitatingFoam/setDeltaT.H

@@ -38,7 +38,7 @@ if (adjustTimeStep)
     scalar maxDeltaTFact =
         Foam::min(maxCo/(CoNum + SMALL), maxAcousticCo/(acousticCoNum + SMALL));
 
-    scalar deltaTFact =
+    const scalar deltaTFact =
         Foam::min(Foam::min(maxDeltaTFact, 1.0 + 0.1*maxDeltaTFact), 1.2);
 
     runTime.setDeltaT

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

@@ -210,7 +210,7 @@ void VoFPatchTransfer::correct
             film().toRegion(patchi, Vp);
 
             const polyPatch& pp = pbm[patchi];
-            const labelList& faceCells = pp.faceCells();
+            const labelUList& faceCells = pp.faceCells();
 
             // Accumulate the total mass removed from patch
             scalar dMassPatch = 0;

applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/twoPhaseMixtureThermo.H

@@ -135,7 +135,7 @@ public:
             virtual volScalarField& he()
             {
                 NotImplemented;
-                return const_cast<volScalarField&>(volScalarField::null());
+                return volScalarField::null().constCast();
             }
 
             //- Enthalpy/Internal energy [J/kg]

applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.H

@@ -243,7 +243,7 @@ public:
             virtual volScalarField& he()
             {
                 NotImplemented;
-                return const_cast<volScalarField&>(volScalarField::null());
+                return volScalarField::null().constCast();
             }
 
             //- Enthalpy/Internal energy [J/kg]

applications/solvers/multiphase/icoReactingMultiphaseInterFoam/setDeltaT.H

@@ -50,7 +50,7 @@ if (adjustTimeStep)
             )
         );
 
-    scalar deltaTFact =
+    const scalar deltaTFact =
         Foam::min(Foam::min(maxDeltaTFact, 1.0 + 0.1*maxDeltaTFact), 1.2);
 
     runTime.setDeltaT
@@ -61,6 +61,7 @@ if (adjustTimeStep)
             maxDeltaT
         )
     );
+
     Info<< "deltaT = " <<  runTime.deltaTValue() << endl;
 }
 

applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/twoPhaseMixtureEThermo/twoPhaseMixtureEThermo.H

@@ -86,7 +86,7 @@ public:
         virtual volScalarField& he()
         {
             NotImplemented;
-            return const_cast<volScalarField&>(volScalarField::null());
+            return volScalarField::null().constCast();
         }
 
         //- Return access to the internal energy field [J/Kg]

applications/solvers/multiphase/interFoam/overInterDyMFoam/correctPhi.H

@@ -65,7 +65,7 @@
     dimensionedScalar rAUf("rAUf", dimTime/rho.dimensions(), 1.0);
 
     const cellCellStencilObject& overlap = Stencil::New(mesh);
-    const labelList& cellTypes = overlap.cellTypes();
+    const labelUList& cellTypes = overlap.cellTypes();
     const labelIOList& zoneIDs = overlap.zoneID();
 
     while (pimple.correctNonOrthogonal())

applications/solvers/multiphase/reactingMultiphaseEulerFoam/setRDeltaT.H

@@ -38,7 +38,9 @@
 
     fvc::smooth(rDeltaT, rDeltaTSmoothingCoeff);
 
+    auto limits = gMinMax(rDeltaT.primitiveField());
+    limits.reset(1/(limits.max()+VSMALL), 1/(limits.min()+VSMALL));
+
     Info<< "Flow time scale min/max = "
-        << gMin(1/rDeltaT.primitiveField())
-        << ", " << gMax(1/rDeltaT.primitiveField()) << endl;
+        << limits.min() << ", " << limits.max() << endl;
 }

applications/solvers/multiphase/reactingTwoPhaseEulerFoam/setRDeltaT.H

@@ -31,7 +31,9 @@
 
     fvc::smooth(rDeltaT, rDeltaTSmoothingCoeff);
 
+    auto limits = gMinMax(rDeltaT.primitiveField());
+    limits.reset(1/(limits.max()+VSMALL), 1/(limits.min()+VSMALL));
+
     Info<< "Flow time scale min/max = "
-        << gMin(1/rDeltaT.primitiveField())
-        << ", " << gMax(1/rDeltaT.primitiveField()) << endl;
+        << limits.min() << ", " << limits.max() << endl;
 }

applications/test/CircularBuffer/Make/files

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

applications/test/DynamicList/Make/files

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

applications/test/DynamicList2/Make/files

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

applications/test/DynamicList2/Test-DynamicList2.cxx

@@ -52,7 +52,8 @@ void printInfo
     if (showSize)
     {
         Info<< " size=\"" << list.size()
-            << "\" capacity=\"" << list.capacity() << "\"";
+            << "\" capacity=\"" << list.capacity() << "\""
+            << "\" min=\"" << SizeMin << "\"" ;
         if (list.cdata())
         {
             Info<< " ptr=\"" << name(list.cdata()) << "\"";
@@ -79,7 +80,8 @@ void printInfo
     if (showSize)
     {
         Info<< " size=\"" << list.size()
-            << "\" capacity=\"" << list.capacity() << "\"";
+            << "\" capacity=\"" << list.capacity() << "\""
+            << "\" min=\"" << SizeMin << "\"" ;
         if (list.cdata())
         {
             Info<< " ptr=\"" << name(list.cdata()) << "\"";
@@ -168,6 +170,22 @@ int main(int argc, char *argv[])
         printInfo("", list2);
     }
 
+    {
+        DynamicList<float, 32> list1(std::pair<label,label>(16,0));
+        list1 = -1;
+
+        Info<< "construct with specified size/capacity" << nl;
+        printInfo("", list1);
+    }
+
+    {
+        DynamicList<float, 32> list1(std::pair<label,label>(8,16));
+        list1 = -1;
+
+        Info<< "construct with specified size/capacity" << nl;
+        printInfo("", list1);
+    }
+
     Info<< "\nEnd\n";
 
     return 0;

applications/test/FixedList/Make/files

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

applications/test/FixedList/Test-FixedList.cxx

@@ -41,7 +41,6 @@ See also
 #include "List.H"
 #include "IPstream.H"
 #include "OPstream.H"
-#include <numeric>
 
 using namespace Foam;
 

applications/test/Hashing2/Make/files

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

applications/test/Hashing2/Test-Hashing2.cxx

@@ -274,9 +274,7 @@ int main(int argc, char *argv[])
         Info<< nl << "No " << is.name() << " file found ..." << nl;
     }
 
-    token tok;
-
-    while (is.good() && is.read(tok) && tok.good())
+    for (token tok; tok.read(is); /*nil*/)
     {
         const word listType(tok.wordToken());
 

applications/test/ICharStream1/Make/files

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

applications/test/ICharStream1/Test-ICharStream1.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.
@@ -83,12 +83,10 @@ Ostream& printView(Ostream& os, const char* first, const char* last)
 }
 
 
-#if __cplusplus >= 201703L
 Ostream& printView(Ostream& os, std::string_view s)
 {
     return printView(os, s.begin(), s.end());
 }
-#endif
 
 
 Ostream& printView(Ostream& os, stdFoam::span<char> s)
@@ -138,17 +136,10 @@ void printInfo(const List<char>& buf)
 void printTokens(Istream& is)
 {
     label count = 0;
-    token t;
-    while (is.good())
+    for (token tok; tok.read(is); ++count)
     {
-        is >> t;
-        if (t.good())
-        {
-            ++count;
-            Info<<"token: " << t << endl;
-        }
+        Info<< "token: " << tok << nl;
     }
-
     Info<< count << " tokens" << endl;
 }
 

applications/test/IOField/Test-IOField.cxx

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2017 OpenFOAM Foundation
-    Copyright (C) 2019-2022 OpenCFD Ltd.
+    Copyright (C) 2019-2025 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -269,7 +269,7 @@ int main(int argc, char *argv[])
         ioOutput.rename(args.executable() + "-labels");
         Info<< "write " << ioOutput.objectRelPath() << endl;
         {
-            IOListRef<label>(ioOutput, ints).write();
+            IOList<label>::writeContents(ioOutput, ints);
         }
 
         ioOutput.rename(args.executable() + "-points");

applications/test/ITstream/Test-ITstream.cxx

@@ -73,14 +73,13 @@ Ostream& toString(Ostream& os, const List<char>& list)
 
 void printTokens(Istream& is)
 {
-    label count = 0;
-
     Info<< "stream tokens:" << endl;
+
+    label count = 0;
     for (token tok; tok.read(is); ++count)
     {
-        Info<< "  : " << tok << endl;
+        Info<< "  : " << tok << nl;
     }
-
     Info<< count << " tokens" << endl;
 }
 

applications/test/List/Make/files

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

applications/test/List/Test-List.cxx

@@ -54,7 +54,6 @@ See also
 #include "ListPolicy.H"
 
 #include <list>
-#include <numeric>
 #include <functional>
 
 // see issue #2083
@@ -75,8 +74,6 @@ public:
 
 
 
-namespace Detail
-{
 namespace ListPolicy
 {
 
@@ -84,7 +81,6 @@ namespace ListPolicy
 template<> struct short_length<short> : std::integral_constant<int,20> {};
 
 } // End namespace ListPolicy
-} // End namespace Detail
 } // End namespace Foam
 
 
@@ -119,9 +115,9 @@ Ostream& printListOutputType(const char* what)
     Info<< what
         << " (contiguous="
         << is_contiguous_v<T> << " no_linebreak="
-        << Detail::ListPolicy::no_linebreak<T>::value
+        << ListPolicy::no_linebreak<T>::value
         << " short_length="
-        << Detail::ListPolicy::short_length<T>::value << ')';
+        << ListPolicy::short_length<T>::value << ')';
 
     return Info;
 }
@@ -143,8 +139,46 @@ int main(int argc, char *argv[])
     argList::addBoolOption("ListList", "Test list of list functionality");
     argList::addBoolOption("flag");
 
+    argList::addBoolOption("reserve", "Test ListPolicy for reserve_size");
+
     #include "setRootCase.H"
 
+    if (args.found("reserve"))
+    {
+        using namespace Foam::ListPolicy;
+
+        using control = std::pair<label, label>;
+
+        for
+        (
+            const auto& tup :
+            {
+                control{ 10, 5 },
+                control{ 20, 25 }
+            }
+        )
+        {
+            const auto [len, capacity] = tup;
+
+            Info<< "test " << tup << nl;
+
+            auto size = reserve_size<16,2>(len, capacity);
+            Info<< "   => " << size << " (ratio 2)" << nl;
+
+            size = reserve_size<16,3,2>(len, capacity);
+            Info<< "   => " << size << " (ratio 3/2)" << nl;
+
+            size = reserve_size<16,13,8>(len, capacity);
+            Info<< "   => " << size << " (ratio " << (13.0/8) << ')' << nl;
+
+            size = reserve_size<16,25,16>(len, capacity);
+            Info<< "   => " << size << " (ratio " << (25.0/16) << ')' << nl;
+        }
+
+        Info<< nl << "\nEnd" << endl;
+        return 0;
+    }
+
     {
         List<label> ident(15);
         Foam::identity(ident, 0);

applications/test/List3/Make/files

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

applications/test/ListRead1/Make/files

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

applications/test/ListRead1/Test-ListRead1.cxx

@@ -50,7 +50,6 @@ Description
 #include "ListPolicy.H"
 
 #include <list>
-#include <numeric>
 #include <functional>
 
 using namespace Foam;
@@ -86,7 +85,7 @@ bool readBracketList(List<T>& list, Istream& is)
         // constexpr label chunkSize = 128;
         typedef std::unique_ptr<List<T>> chunkType;
 
-        is >> tok;
+        tok.read(is);
         is.fatalCheck(FUNCTION_NAME);
 
         if (tok.isPunctuation(token::END_LIST))
@@ -150,7 +149,7 @@ bool readBracketList(List<T>& list, Istream& is)
                 "reading entry"
             );
 
-            is >> tok;
+            tok.read(is);
             is.fatalCheck(FUNCTION_NAME);
         }
 

applications/test/OCharStream1/Make/files

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

applications/test/OCharStream1/Test-OCharStream1.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.
@@ -83,12 +83,10 @@ Ostream& printView(Ostream& os, const char* first, const char* last)
 }
 
 
-#if __cplusplus >= 201703L
 Ostream& printView(Ostream& os, std::string_view s)
 {
     return printView(os, s.begin(), s.end());
 }
-#endif
 
 
 Ostream& printView(Ostream& os, stdFoam::span<char> s)
@@ -129,17 +127,10 @@ void printInfo(const BufType& buf)
 void printTokens(Istream& is)
 {
     label count = 0;
-    token t;
-    while (is.good())
+    for (token tok; tok.read(is); ++count)
     {
-        is >> t;
-        if (t.good())
-        {
-            ++count;
-            Info<<"token: " << t << endl;
-        }
+        Info<< "token: " << tok << nl;
     }
-
     Info<< count << " tokens" << endl;
 }
 

applications/test/PackedList1/Make/files

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

applications/test/PackedList2/Make/files

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

applications/test/SpanStream1/Make/files

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

applications/test/SpanStream1/Test-SpanStream1.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.
@@ -85,12 +85,10 @@ Ostream& printView(Ostream& os, const char* first, const char* last)
 }
 
 
-#if __cplusplus >= 201703L
 Ostream& printView(Ostream& os, std::string_view s)
 {
     return printView(os, s.begin(), s.end());
 }
-#endif
 
 
 Ostream& printView(Ostream& os, stdFoam::span<char> s)
@@ -145,17 +143,10 @@ void printInfo(const UList<char>& buf)
 void printTokens(Istream& is)
 {
     label count = 0;
-    token t;
-    while (is.good())
+    for (token tok; tok.read(is); ++count)
     {
-        is >> t;
-        if (t.good())
-        {
-            ++count;
-            Info<<"token: " << t << endl;
-        }
+        Info<< "token: " << tok << nl;
     }
-
     Info<< count << " tokens" << endl;
 }
 

applications/test/SubField/Make/files

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

applications/test/SubField/Test-SubField.cxx

@@ -38,7 +38,6 @@ Description
 #include "SubField.H"
 #include "labelRange.H"
 #include "ListOps.H"
-#include <numeric>
 
 using namespace Foam;
 

applications/test/UIndirectList/Make/files

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

applications/test/bitSet2/Make/files

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

applications/test/bitSet2/Test-bitSet2.cxx

@@ -499,7 +499,7 @@ int main(int argc, char *argv[])
         Info<<"bitSet ";
         report(list4);
 
-        list4.shrink();
+        list4.shrink_to_fit();
         Info<<"shrunk ";
         report(list4);
 

applications/test/charList/Make/files

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

applications/test/charList/Test-charList.cxx

@@ -43,8 +43,6 @@ Description
 #include "SubList.H"
 #include "FlatOutput.H"
 
-#include <numeric>
-
 using namespace Foam;
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

applications/test/checkIOspeed/Test-checkIOspeed.cxx

@@ -50,8 +50,6 @@ Description
 #include "SliceStreamRepo.H"
 #endif
 
-#include <numeric>
-
 using namespace Foam;
 
 

applications/test/contiguous/Make/files

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

applications/test/dictionaryTokens/Make/files

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

applications/test/edges/Make/files

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

applications/test/edges/Test-edges.cxx

@@ -142,6 +142,26 @@ int main(int argc, char *argv[])
     Info<< "sorted ";
     printInfo(e4);
 
+    // Sorted construction
+    {
+        edge edge1(10, 5);
+
+        Info<< "plain ";
+        printInfo(edge1);
+
+        // construct sorted
+        auto edge3(edge::sorted(10, 5));
+
+        Info<< "sorted ";
+        printInfo(edge3);
+
+        // // construct sorted (deprecated)
+        // edge edge2(10, 5, true);
+        //
+        // Info<< "sorted ";
+        // printInfo(edge2);
+    }
+
     return 0;
 }
 

applications/test/fieldMapping/Test-fieldMapping.C

@@ -262,13 +262,12 @@ int main(int argc, char *argv[])
 
         // Check constant profile
         {
-            const scalar max = gMax(one);
-            const scalar min = gMin(one);
+            auto limits =  gMinMax(one);
 
-            Info<< "Uniform one field min = " << min
-                << "  max = " << max << endl;
+            Info<< "Uniform one field min = "
+                << limits.min() << "  max = " << limits.max() << endl;
 
-            if (isNotEqual(max, 1) || isNotEqual(min, 1))
+            if (isNotEqual(limits.min(), 1) || isNotEqual(limits.max(), 1))
             {
                 FatalErrorInFunction
                     << "Uniform volVectorField not preserved."
@@ -286,13 +285,12 @@ int main(int argc, char *argv[])
         {
             const scalarField diff = ccX-mesh.C().component(0);
 
-            const scalar max = gMax(diff);
-            const scalar min = gMin(diff);
+            auto limits =  gMinMax(diff);
 
-            Info<< "Linear profile field min = " << min
-                << "  max = " << max << endl;
+            Info<< "Linear profile field min = "
+                << limits.min() << "  max = " << limits.max() << endl;
 
-            if (isNotEqual(max, 0) || isNotEqual(min, 0))
+            if (isNotEqual(limits.min(), 0) || isNotEqual(limits.max(), 0))
             {
                 FatalErrorInFunction
                     << "Linear profile not preserved."
@@ -309,13 +307,12 @@ int main(int argc, char *argv[])
         // Check face field mapping
         if (surfaceOne.size())
         {
-            const scalar max = gMax(surfaceOne.primitiveField());
-            const scalar min = gMin(surfaceOne.primitiveField());
+            auto limits =  gMinMax(surfaceOne.primitiveField());
 
-            Info<< "Uniform surface field min = " << min
-                << "  max = " << max << endl;
+            Info<< "Uniform surface field min = "
+                << limits.min() << "  max = " << limits.max() << endl;
 
-            if (isNotEqual(max, 1) || isNotEqual(min, 1))
+            if (isNotEqual(limits.min(), 1) || isNotEqual(limits.max(), 1))
             {
                 FatalErrorInFunction
                     << "Uniform surfaceScalarField not preserved."

applications/test/globalMeshData/Make/files

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

applications/test/globalMeshData/Test-globalMeshData.cxx

@@ -182,18 +182,11 @@ int main(int argc, char *argv[])
         const labelListList& transformedSlaves =
             globalData.globalPointTransformedBoundaryFaces();
 
-        const label nBnd = mesh.nBoundaryFaces();
-
         pointField fc(globalPointBoundaryFacesMap.constructSize());
-        SubList<point>(fc, nBnd) =
+        pointField::subList(fc, mesh.nBoundaryFaces()) =
             primitivePatch
             (
-                SubList<face>
-                (
-                    mesh.faces(),
-                    nBnd,
-                    mesh.nInternalFaces()
-                ),
+                mesh.boundaryMesh().faces(),
                 mesh.points()
             ).faceCentres();
 

applications/test/hexRef8/Test-hexRef8.C

@@ -344,13 +344,12 @@ int main(int argc, char *argv[])
 
         // Check constant profile
         {
-            const scalar max = gMax(one);
-            const scalar min = gMin(one);
+            auto limits =  gMinMax(one);
 
-            Info<< "Uniform one field min = " << min
-                << "  max = " << max << endl;
+            Info<< "Uniform one field min = "
+                << limits.min() << "  max = " << limits.max() << endl;
 
-            if (isNotEqual(min, 1) || isNotEqual(max, 1))
+            if (isNotEqual(limits.min(), 1) || isNotEqual(limits.max(), 1))
             {
                 FatalErrorInFunction
                     << "Uniform volVectorField not preserved."
@@ -368,13 +367,12 @@ int main(int argc, char *argv[])
         {
             const scalarField diff = ccX-mesh.C().component(0);
 
-            const scalar max = gMax(diff);
-            const scalar min = gMin(diff);
+            auto limits =  gMinMax(diff);
 
-            Info<< "Linear profile field min = " << min
-                << "  max = " << max << endl;
+            Info<< "Linear profile field min = "
+                << limits.min() << "  max = " << limits.max() << endl;
 
-            if (isNotEqual(min, 0) || isNotEqual(max, 0))
+            if (isNotEqual(limits.min(), 0) || isNotEqual(limits.max(), 0))
             {
                 Info<< "Linear profile not preserved."
                     << " Min and max should both be 0.0. min:" << min
@@ -389,13 +387,12 @@ int main(int argc, char *argv[])
         // Check face field mapping
         if (surfaceOne.size())
         {
-            const scalar max = gMax(surfaceOne.primitiveField());
-            const scalar min = gMin(surfaceOne.primitiveField());
+            auto limits =  gMinMax(surfaceOne.primitiveField());
 
-            Info<< "Uniform surface field min = " << min
-                << "  max = " << max << endl;
+            Info<< "Uniform surface field min = "
+                << limits.min() << "  max = " << limits.max() << endl;
 
-            if (isNotEqual(min, 1) || isNotEqual(max, 1))
+            if (isNotEqual(limits.min(), 1) || isNotEqual(limits.max(), 1))
             {
                 FatalErrorInFunction
                     << "Uniform surfaceScalarField not preserved."

applications/test/memoryPool1/Make/files

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

applications/test/memoryPool1/Make/options

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

applications/test/memoryPool1/Test-memoryPool1.cxx

@@ -0,0 +1,252 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  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/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "argList.H"
+#include "IOstreams.H"
+
+// Enable/disable based on header
+#ifdef Foam_MemoryPool_H
+#define FOAM_HAS_MEMORY_POOL
+#else
+#undef FOAM_HAS_MEMORY_POOL
+#endif
+
+// options
+int min_align_size = 5;
+int min_pool_size = 10;
+bool use_aligned_alloc(true);
+bool use_aligned_dealloc(true);
+
+//- True if size exceeds the min-size for using memory alignment
+template<class IntType>
+inline bool use_alignment(IntType n) noexcept
+{
+    return (n >= min_align_size);
+}
+
+
+//- True if size exceeds the min-size for using the memory pool
+template<class IntType>
+inline bool use_memory_pool(IntType n) noexcept
+{
+    return (n >= IntType(min_pool_size));
+}
+
+
+//- Default alignment
+inline constexpr std::align_val_t default_alignment() noexcept
+{
+    return std::align_val_t(64);
+}
+
+
+//- Allocate from memory pool (if active) or aligned/normal
+template<class T, class IntType>
+inline T* my_allocate(IntType n)
+{
+    std::cerr<< "my_allocate(" << n << ")\n";
+
+    if (use_aligned_alloc && use_alignment(n))
+    {
+        #ifdef FOAM_HAS_MEMORY_POOL
+        if
+        (
+            void *pool_ptr
+            (
+                // Consider memory pool for large amounts of data
+                use_memory_pool(n)
+              ? Foam::MemoryPool::try_allocate(sizeof(T)*n)
+              : nullptr
+            );
+            pool_ptr
+        )
+        {
+            // Placement new
+            return new (pool_ptr) T[n];
+        }
+        else
+        #endif
+        {
+            return new (default_alignment()) T[n];
+        }
+    }
+    else
+    {
+        // Plain new
+        return new T[n];
+    }
+}
+
+
+//- Deallocate from memory pool or normal
+template<class T>
+inline void my_deallocate(T* ptr)
+{
+    std::cerr<< "my_deallocate() : " << Foam::name(ptr) << '\n';
+
+    #ifdef FOAM_HAS_MEMORY_POOL
+    if
+    (
+        ptr && !Foam::MemoryPool::try_deallocate(ptr)
+    )
+    #endif
+    {
+        // Plain new
+        delete[] ptr;
+    }
+}
+
+
+//- Deallocate from memory pool or aligned/normal
+template<class T, class IntType>
+inline void my_deallocate(T* ptr, IntType n)
+{
+    std::cerr<< "my_deallocate(" << n << ") : " << Foam::name(ptr) << '\n';
+
+    if (use_aligned_dealloc && use_alignment(n))
+    {
+        if
+        (
+            #ifdef FOAM_HAS_MEMORY_POOL
+            ptr && !Foam::MemoryPool::try_deallocate(ptr)
+            #else
+            ptr
+            #endif
+        )
+        {
+            ::operator delete[](ptr, default_alignment());
+        }
+    }
+    else
+    {
+        // Plain new
+        delete[] ptr;
+    }
+}
+
+
+using namespace Foam;
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+//  Main program:
+
+int main(int argc, char *argv[])
+{
+    argList::noCheckProcessorDirectories();
+    argList::addOption
+    (
+        "min-align",
+        "INT",
+        "Min number of elements for memory alignment (default: 5)"
+    );
+    argList::addOption
+    (
+        "min-pool",
+        "INT",
+        "Min number of elements for using memory pool (default: 10)"
+    );
+    argList::addOption
+    (
+        "count",
+        "INT",
+        "Number of elements to test (default: 10)"
+    );
+    argList::addBoolOption
+    (
+        "no-align",
+        "Disable aligned alloc/dealloc"
+    );
+    argList::addBoolOption
+    (
+        "no-align-alloc",
+        "Disable aligned alloc (default: false)"
+    );
+    argList::addBoolOption
+    (
+        "no-align-dealloc",
+        "Disable aligned dealloc (default: false)"
+    );
+
+    #include "setRootCase.H"
+
+    label count(10);
+
+    args.readIfPresent("count", count);
+    args.readIfPresent("min-align", min_align_size);
+    args.readIfPresent("min-pool", min_pool_size);
+
+    if (min_pool_size < min_align_size)
+    {
+        min_pool_size = min_align_size;
+    }
+
+    if (args.found("no-align"))
+    {
+        use_aligned_alloc = false;
+        use_aligned_dealloc = false;
+    }
+    else
+    {
+        use_aligned_alloc = !args.found("no-align-alloc");
+        use_aligned_dealloc = !args.found("no-align-dealloc");
+    }
+
+
+    Info<< "Testing with " << count << " elements" << nl
+        << "min-align: " << int(min_align_size) << " elements" << nl
+        #ifdef FOAM_HAS_MEMORY_POOL
+        << "min-pool: " << int(min_pool_size)
+        << " elements, active:" << MemoryPool::active() << nl
+        #endif
+        << "alignment: " << int(default_alignment()) << " bytes" << nl
+        << nl;
+
+    {
+        using T = double;
+        label len = count;
+
+        UList<T> list(my_allocate<T>(len), len);
+
+        Info<< "List ptr: " << Foam::name(list.data()) << nl;
+
+        list = 1.234;
+
+        Info<< "List: " << list << nl;
+
+        my_deallocate(list.data(), len);
+
+        list = UList<T>();
+
+        my_deallocate(list.data());
+        my_deallocate(list.data(), len);
+    }
+
+    return 0;
+}
+
+
+// ************************************************************************* //

applications/test/minMax2/Test-minMax2.cxx

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2019-2023 OpenCFD Ltd.
+    Copyright (C) 2019-2025 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -175,6 +175,36 @@ int main(int argc, char *argv[])
             << nl;
     }
 
+    {
+        scalarField field1(10);
+        scalarField field2(10);
+        scalarField work;
+
+        Random rnd(4567);
+        for (scalar& val : field1)
+        {
+            val = rnd.position(scalar(-0.2), scalar(1.2));
+        }
+        for (scalar& val : field2)
+        {
+            val = rnd.position(scalar(-0.1), scalar(1.1));
+        }
+
+        Info<< nl
+            << "field1: " << flatOutput(field1) << nl
+            << "field2: " << flatOutput(field2) << nl;
+
+        work = field1;
+        work.clamp_min(field2);
+
+        Info<< "clamp_min: " << flatOutput(work) << nl;
+
+        work = field1;
+        work.clamp_max(field2);
+
+        Info<< "clamp_max: " << flatOutput(work) << nl;
+    }
+
     Info<< nl << "\nDone\n" << endl;
     return 0;
 }

applications/test/parallel-comm2/Make/files

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

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

@@ -69,6 +69,7 @@ int main(int argc, char *argv[])
     argList::addBoolOption("info", "information");
     argList::addBoolOption("print-tree", "Report tree(s) as graph");
     argList::addBoolOption("no-test", "Disable general tests");
+    argList::addBoolOption("split", "Test Pstream split-comm");
     argList::addBoolOption("host-comm", "Test Pstream host-comm");
     argList::addBoolOption("host-broadcast", "Test host-base broadcasts");
 
@@ -85,8 +86,8 @@ int main(int argc, char *argv[])
 
     if (UPstream::parRun() && optPrintTree)
     {
-        Info<< "comms: "
-            << UPstream::whichCommunication(UPstream::worldComm) << nl;
+        // Info<< "comms: "
+        //     << UPstream::whichCommunication(UPstream::worldComm) << nl;
         UPstream::printCommTree(UPstream::commWorld());
     }
 
@@ -102,6 +103,34 @@ int main(int argc, char *argv[])
             << flatOutput(UPstream::procID(UPstream::commLocalNode())) << nl;
     }
 
+    if (UPstream::parRun() && args.found("split"))
+    {
+        Info<< "split: alternative ranks" << nl;
+
+        const auto myRank = UPstream::myProcNo();
+
+        int colour =
+        (
+            (myRank == 5 || myRank == 6)  // Exclude these ones
+          ? -1
+          : (myRank % 2)
+        );
+
+        UPstream::communicator comm =
+            UPstream::communicator::split(UPstream::commWorld(), colour, true);
+
+        Pout<< "split ranks (colour=" << colour << ") "
+            << flatOutput(UPstream::procID(comm.comm())) << nl;
+
+        comm.reset();
+        comm =
+            UPstream::communicator::split(UPstream::commWorld(), colour, false);
+
+        Pout<< "Split ranks (colour=" << colour << ") "
+            << flatOutput(UPstream::procID(comm.comm())) << nl;
+    }
+
+
     if (args.found("info"))
     {
         Info<< nl;
@@ -135,8 +164,8 @@ int main(int argc, char *argv[])
             << endl;
 
         {
-            Info<< "host-master: "
-                << UPstream::whichCommunication(commInterNode) << endl;
+            // Info<< "host-master: "
+            //     << UPstream::whichCommunication(commInterNode) << endl;
 
             UPstream::printCommTree(commInterNode);
             UPstream::printCommTree(commLocalNode);

applications/test/string_view1/Make/files

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

applications/test/string_view1/Test-string_view1.cxx

@@ -40,11 +40,6 @@ using namespace Foam;
 int main(int argc, char *argv[])
 {
     Info<< "Compiled with C++ " << __cplusplus;
-    #if __cplusplus >= 201703L
-    Info<< " - has std::string_view" << nl << nl;
-    #else
-    Info<< " - NO std::string_view" << nl << nl;
-    #endif
 
     // basics
     {
@@ -63,9 +58,7 @@ int main(int argc, char *argv[])
                 << "input: <" << cstr << '>'
                 << " type: " << typeid(cstr).name() << " len:" << len << nl;
 
-            #if __cplusplus >= 201703L
             Info<< "    view: " << std::string_view(cstr) << nl;
-            #endif
 
             Info<< "    span: "
                 << stdFoam::span<const char>(cstr, len) << nl;

applications/test/syncTools/Make/files

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

applications/test/syncTools/Test-syncTools.cxx

@@ -195,16 +195,7 @@ void testSparseData(const polyMesh& mesh, Random& rndGen)
         << "Position test of sparse data only correct for cases without cyclics"
         << " with shared points." << endl;
 
-    primitivePatch allBoundary
-    (
-        SubList<face>
-        (
-            mesh.faces(),
-            mesh.nBoundaryFaces(),
-            mesh.nInternalFaces()
-        ),
-        mesh.points()
-    );
+    primitivePatch allBoundary(mesh.boundaryMesh().faces(), mesh.points());
     const pointField& localPoints = allBoundary.localPoints();
 
 

applications/test/token/Test-token.cxx

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2017-2024 OpenCFD Ltd.
+    Copyright (C) 2017-2025 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -134,50 +134,51 @@ int main(int argc, char *argv[])
         Info<< "resized: "
             << ctok1.info() << nl << ctok1 << endl;
 
+        // Using isA<> on compoundToken()
+        if
+        (
+            const auto* listptr
+          = ctok1.compoundToken().isA<scalarList>()
+        )
         {
-            // Using isA<> on compoundToken()
-            const auto* listptr = ctok1.compoundToken().isA<scalarList>();
-            if (listptr)
-            {
-                // sneaky, SubField bypasses const!
-                scalarField::subField fld(*listptr);
-                fld *= 5;
+            // sneaky, SubField bypasses const!
+            scalarField::subField fld(*listptr);
+            fld *= 5;
 
-                Info<< "multiplied List<scalar>: "
-                    << ctok1.info() << nl << ctok1 << endl;
-            }
+            Info<< "multiplied List<scalar>: "
+                << ctok1.info() << nl << ctok1 << endl;
         }
 
+        // Using isCompound<...> - combined check
+        if
+        (
+            const auto* listptr
+          = ctok1.isCompound<scalarList>()
+        )
         {
-            // Using isCompound<...> - combined check
+            scalarField::subField fld(*listptr);
+            fld /= 2;
 
-            const auto* listptr = ctok1.isCompound<scalarList>();
-            if (listptr)
-            {
-                scalarField::subField fld(*listptr);
-                fld /= 2;
-
-                Info<< "divided List<scalar>: "
-                    << ctok1.info() << nl << ctok1 << endl;
-            }
+            Info<< "divided List<scalar>: "
+                << ctok1.info() << nl << ctok1 << endl;
         }
 
+        // Using isCompound<...> - combined check
+        if
+        (
+            const auto* listptr
+          = ctok1.isCompound<labelList>()
+        )
         {
-            // Using isCompound<...> - combined check
+            labelField::subField fld(*listptr);
+            fld /= 2;
 
-            const auto* listptr = ctok1.isCompound<labelList>();
-            if (listptr)
-            {
-                labelField::subField fld(*listptr);
-                fld /= 2;
-
-                Info<< "divided List<label>: "
-                    << ctok1.info() << nl << ctok1 << endl;
-            }
-            else
-            {
-                Info<< "compound is not List<label>" << nl;
-            }
+            Info<< "divided List<label>: "
+                << ctok1.info() << nl << ctok1 << endl;
+        }
+        else
+        {
+            Info<< "compound is not List<label>" << nl;
         }
 
         Info<< "Before fill_zero: " << ctok1 << endl;
@@ -248,13 +249,14 @@ int main(int argc, char *argv[])
 
         token tok;
 
+        if (auto v = obuf.view(); !v.empty())
         {
-            auto v = obuf.view();
-            if (!v.empty())
-            {
-                tok = string(v.data(), v.size());
-                tok.setType(token::tokenType::CHAR_DATA);
-            }
+            tok = string(v.data(), v.size());
+            tok.setType(token::tokenType::CHAR_DATA);
+        }
+        else
+        {
+            tok = token();
         }
 
         Info<< "tok: " << tok.name() << nl << nl;
@@ -274,13 +276,14 @@ int main(int argc, char *argv[])
 
         obuf.endBlock();
 
+        if (auto v = obuf.view(); !v.empty())
         {
-            auto v = obuf.view();
-            if (!v.empty())
-            {
-                tok = string(v.data(), v.size());
-                tok.setType(token::tokenType::CHAR_DATA);
-            }
+            tok = string(v.data(), v.size());
+            tok.setType(token::tokenType::CHAR_DATA);
+        }
+        else
+        {
+            tok = token();
         }
 
         // Output like xml:
@@ -349,10 +352,11 @@ int main(int argc, char *argv[])
         {
             typedef List<scalar> ListType;
 
-            auto* inputDataPtr =
-                const_cast<ListType*>(entry0.stream().findCompound<ListType>());
-
-            if (inputDataPtr)
+            if
+            (
+                auto* inputDataPtr
+              = const_cast<ListType*>(entry0.stream().findCompound<ListType>())
+            )
             {
                 Info<< "found input data" << nl;
                 Info<< entry0 << nl;

applications/test/tokenize/Make/files

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

applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C

@@ -417,14 +417,7 @@ int main(int argc, char *argv[])
 
 
     // Get calculating engine for all of outside
-    const SubList<face> outsideFaces
-    (
-        mesh.faces(),
-        mesh.nBoundaryFaces(),
-        mesh.nInternalFaces()
-    );
-
-    primitivePatch allBoundary(outsideFaces, mesh.points());
+    primitivePatch allBoundary(mesh.boundaryMesh().faces(), mesh.points());
 
 
     // Look up mesh labels and convert to input for boundaryCutter.

applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C

@@ -145,17 +145,22 @@ int main(int argc, char *argv[])
     hexRef8 meshCutter(mesh);
 
     // Some stats
-    Info<< "Read mesh:" << nl
-        << "    cells:" << mesh.globalData().nTotalCells() << nl
-        << "    faces:" << mesh.globalData().nTotalFaces() << nl
-        << "    points:" << mesh.globalData().nTotalPoints() << nl
-        << "    cellLevel :"
-        << " min:" << gMin(meshCutter.cellLevel())
-        << " max:" << gMax(meshCutter.cellLevel()) << nl
-        << "    pointLevel :"
-        << " min:" << gMin(meshCutter.pointLevel())
-        << " max:" << gMax(meshCutter.pointLevel()) << nl
-        << endl;
+    {
+        auto cellLimits = gMinMax(meshCutter.cellLevel());
+        auto pointLimits = gMinMax(meshCutter.pointLevel());
+
+        Info<< "Read mesh:" << nl
+            << "    cells:" << mesh.globalData().nTotalCells() << nl
+            << "    faces:" << mesh.globalData().nTotalFaces() << nl
+            << "    points:" << mesh.globalData().nTotalPoints() << nl
+            << "    cellLevel :"
+            << " min:" << cellLimits.min()
+            << " max:" << cellLimits.max() << nl
+            << "    pointLevel :"
+            << " min:" << pointLimits.min()
+            << " max:" << pointLimits.max() << nl
+            << endl;
+    }
 
 
     // Maintain 2:1 ratio

applications/utilities/mesh/advanced/selectCells/edgeStats.C

@@ -37,7 +37,6 @@ License
 const Foam::scalar Foam::edgeStats::edgeTol_ = 1e-3;
 
 
-
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 Foam::direction Foam::edgeStats::getNormalDir
@@ -45,26 +44,25 @@ Foam::direction Foam::edgeStats::getNormalDir
     const twoDPointCorrector* correct2DPtr
 ) const
 {
-    direction dir = 3;
-
     if (correct2DPtr)
     {
         const vector& normal = correct2DPtr->planeNormal();
 
-        if (mag(normal & vector(1, 0, 0)) > 1-edgeTol_)
+        if (mag(normal.x()) > 1-edgeTol_)
         {
-            dir = 0;
+            return vector::X;
         }
-        else if (mag(normal & vector(0, 1, 0)) > 1-edgeTol_)
+        else if (mag(normal.y()) > 1-edgeTol_)
         {
-            dir = 1;
+            return vector::Y;
         }
-        else if (mag(normal & vector(0, 0, 1)) > 1-edgeTol_)
+        else if (mag(normal.z()) > 1-edgeTol_)
         {
-            dir = 2;
+            return vector::Z;
         }
     }
-    return dir;
+
+    return direction(3);
 }
 
 
@@ -95,12 +93,9 @@ Foam::edgeStats::edgeStats(const polyMesh& mesh)
         {
             Info<< "Correcting for 2D motion" << endl << endl;
 
-            autoPtr<twoDPointCorrector> correct2DPtr
-            (
-                new twoDPointCorrector(mesh)
-            );
+            twoDPointCorrector correct2D(mesh);
 
-            normalDir_ = getNormalDir(&correct2DPtr());
+            normalDir_ = getNormalDir(&correct2D);
         }
     }
 }
@@ -122,24 +117,15 @@ Foam::edgeStats::edgeStats
 
 Foam::scalar Foam::edgeStats::minLen(Ostream& os) const
 {
-    label nX = 0;
-    label nY = 0;
-    label nZ = 0;
+    label nAny(0);
+    label nX(0);
+    label nY(0);
+    label nZ(0);
 
-    scalar minX = GREAT;
-    scalar maxX = -GREAT;
-    vector x(1, 0, 0);
-
-    scalar minY = GREAT;
-    scalar maxY = -GREAT;
-    vector y(0, 1, 0);
-
-    scalar minZ = GREAT;
-    scalar maxZ = -GREAT;
-    vector z(0, 0, 1);
-
-    scalar minOther = GREAT;
-    scalar maxOther = -GREAT;
+    scalarMinMax limitsAny(GREAT, -GREAT);
+    scalarMinMax limitsX(limitsAny);
+    scalarMinMax limitsY(limitsAny);
+    scalarMinMax limitsZ(limitsAny);
 
     const edgeList& edges = mesh_.edges();
 
@@ -151,58 +137,75 @@ Foam::scalar Foam::edgeStats::minLen(Ostream& os) const
 
         eVec /= eMag;
 
-        if (mag(eVec & x) > 1-edgeTol_)
+        if (mag(eVec.x()) > 1-edgeTol_)
         {
-            minX = min(minX, eMag);
-            maxX = max(maxX, eMag);
+            limitsX.add(eMag);
             nX++;
         }
-        else if (mag(eVec & y) > 1-edgeTol_)
+        else if (mag(eVec.y()) > 1-edgeTol_)
         {
-            minY = min(minY, eMag);
-            maxY = max(maxY, eMag);
+            limitsY.add(eMag);
             nY++;
         }
-        else if (mag(eVec & z) > 1-edgeTol_)
+        else if (mag(eVec.z()) > 1-edgeTol_)
         {
-            minZ = min(minZ, eMag);
-            maxZ = max(maxZ, eMag);
+            limitsZ.add(eMag);
             nZ++;
         }
         else
         {
-            minOther = min(minOther, eMag);
-            maxOther = max(maxOther, eMag);
+            limitsAny.add(eMag);
+            nAny++;
         }
     }
 
     os  << "Mesh bounding box:" << boundBox(mesh_.points()) << nl << nl
         << "Mesh edge statistics:" << nl
-        << "    x aligned :  number:" << nX << "\tminLen:" << minX
-        << "\tmaxLen:" << maxX << nl
-        << "    y aligned :  number:" << nY << "\tminLen:" << minY
-        << "\tmaxLen:" << maxY << nl
-        << "    z aligned :  number:" << nZ << "\tminLen:" << minZ
-        << "\tmaxLen:" << maxZ << nl
-        << "    other     :  number:" << mesh_.nEdges() - nX - nY - nZ
-        << "\tminLen:" << minOther
-        << "\tmaxLen:" << maxOther << nl << endl;
+        << "    x aligned :  number:" << nX
+        << "\tminLen:" << limitsX.min() << "\tmaxLen:" << limitsX.max() << nl
+        << "    y aligned :  number:" << nY
+        << "\tminLen:" << limitsY.min() << "\tmaxLen:" << limitsY.max() << nl
+        << "    z aligned :  number:" << nZ
+        << "\tminLen:" << limitsZ.min() << "\tmaxLen:" << limitsZ.max() << nl
+        << "    other     :  number:" << nAny
+        << "\tminLen:" << limitsAny.min()
+        << "\tmaxLen:" << limitsAny.max() << nl << endl;
 
-    if (normalDir_ == 0)
+    if (normalDir_ == vector::X)
     {
-        return min(minY, min(minZ, minOther));
+        return Foam::min
+        (
+            limitsAny.min(),
+            Foam::min(limitsY.min(), limitsZ.min())
+        );
     }
-    else if (normalDir_ == 1)
+    else if (normalDir_ == vector::Y)
     {
-        return min(minX, min(minZ, minOther));
+        return Foam::min
+        (
+            limitsAny.min(),
+            Foam::min(limitsX.min(), limitsZ.min())
+        );
     }
-    else if (normalDir_ == 2)
+    else if (normalDir_ == vector::Z)
     {
-        return min(minX, min(minY, minOther));
+        return Foam::min
+        (
+            limitsAny.min(),
+            Foam::min(limitsX.min(), limitsY.min())
+        );
     }
     else
     {
-        return min(minX, min(minY, min(minZ, minOther)));
+        return Foam::min
+        (
+            limitsAny.min(),
+            Foam::min
+            (
+                limitsX.min(),
+                Foam::min(limitsY.min(), limitsZ.min())
+            )
+        );
     }
 }
 

applications/utilities/mesh/advanced/snappyRefineMesh/snappyRefineMesh.C

@@ -81,26 +81,25 @@ void writeSet(const cellSet& cells, const string& msg)
 
 direction getNormalDir(const twoDPointCorrector* correct2DPtr)
 {
-    direction dir = 3;
-
     if (correct2DPtr)
     {
         const vector& normal = correct2DPtr->planeNormal();
 
-        if (mag(normal & vector(1, 0, 0)) > 1-edgeTol)
+        if (mag(normal.x()) > 1-edgeTol)
         {
-            dir = 0;
+            return vector::X;
         }
-        else if (mag(normal & vector(0, 1, 0)) > 1-edgeTol)
+        else if (mag(normal.y()) > 1-edgeTol)
         {
-            dir = 1;
+            return vector::Y;
         }
-        else if (mag(normal & vector(0, 0, 1)) > 1-edgeTol)
+        else if (mag(normal.z()) > 1-edgeTol)
         {
-            dir = 2;
+            return vector::Z;
         }
     }
-    return dir;
+
+    return direction(3);
 }
 
 
@@ -109,89 +108,95 @@ direction getNormalDir(const twoDPointCorrector* correct2DPtr)
 // directions but exclude component (0=x, 1=y, 2=z, other=none)
 scalar getEdgeStats(const primitiveMesh& mesh, const direction excludeCmpt)
 {
-    label nX = 0;
-    label nY = 0;
-    label nZ = 0;
+    label nAny(0);
+    label nX(0);
+    label nY(0);
+    label nZ(0);
 
-    scalar minX = GREAT;
-    scalar maxX = -GREAT;
-    vector x(1, 0, 0);
-
-    scalar minY = GREAT;
-    scalar maxY = -GREAT;
-    vector y(0, 1, 0);
-
-    scalar minZ = GREAT;
-    scalar maxZ = -GREAT;
-    vector z(0, 0, 1);
-
-    scalar minOther = GREAT;
-    scalar maxOther = -GREAT;
+    scalarMinMax limitsAny(GREAT, -GREAT);
+    scalarMinMax limitsX(limitsAny);
+    scalarMinMax limitsY(limitsAny);
+    scalarMinMax limitsZ(limitsAny);
 
     const edgeList& edges = mesh.edges();
 
-    forAll(edges, edgei)
+    for (const edge& e : edges)
     {
-        const edge& e = edges[edgei];
-
         vector eVec(e.vec(mesh.points()));
 
         scalar eMag = mag(eVec);
 
         eVec /= eMag;
 
-        if (mag(eVec & x) > 1-edgeTol)
+        if (mag(eVec.x()) > 1-edgeTol)
         {
-            minX = Foam::min(minX, eMag);
-            maxX = Foam::max(maxX, eMag);
+            limitsX.add(eMag);
             nX++;
         }
-        else if (mag(eVec & y) > 1-edgeTol)
+        else if (mag(eVec.y()) > 1-edgeTol)
         {
-            minY = Foam::min(minY, eMag);
-            maxY = Foam::max(maxY, eMag);
+            limitsY.add(eMag);
             nY++;
         }
-        else if (mag(eVec & z) > 1-edgeTol)
+        else if (mag(eVec.z()) > 1-edgeTol)
         {
-            minZ = Foam::min(minZ, eMag);
-            maxZ = Foam::max(maxZ, eMag);
+            limitsZ.add(eMag);
             nZ++;
         }
         else
         {
-            minOther = Foam::min(minOther, eMag);
-            maxOther = Foam::max(maxOther, eMag);
+            limitsAny.add(eMag);
+            nAny++;
         }
     }
 
     Info<< "Mesh bounding box:" << boundBox(mesh.points()) << nl << nl
         << "Mesh edge statistics:" << nl
-        << "    x aligned :  number:" << nX << "\tminLen:" << minX
-        << "\tmaxLen:" << maxX << nl
-        << "    y aligned :  number:" << nY << "\tminLen:" << minY
-        << "\tmaxLen:" << maxY << nl
-        << "    z aligned :  number:" << nZ << "\tminLen:" << minZ
-        << "\tmaxLen:" << maxZ << nl
-        << "    other     :  number:" << mesh.nEdges() - nX - nY - nZ
-        << "\tminLen:" << minOther
-        << "\tmaxLen:" << maxOther << nl << endl;
+        << "    x aligned :  number:" << nX
+        << "\tminLen:" << limitsX.min() << "\tmaxLen:" << limitsX.max() << nl
+        << "    y aligned :  number:" << nY
+        << "\tminLen:" << limitsY.min() << "\tmaxLen:" << limitsY.max() << nl
+        << "    z aligned :  number:" << nZ
+        << "\tminLen:" << limitsZ.min() << "\tmaxLen:" << limitsZ.max() << nl
+        << "    other     :  number:" << nAny
+        << "\tminLen:" << limitsAny.min()
+        << "\tmaxLen:" << limitsAny.max() << nl << endl;
 
-    if (excludeCmpt == 0)
+    if (excludeCmpt == vector::X)
     {
-        return Foam::min(minY, Foam::min(minZ, minOther));
+        return Foam::min
+        (
+            limitsAny.min(),
+            Foam::min(limitsY.min(), limitsZ.min())
+        );
     }
-    else if (excludeCmpt == 1)
+    else if (excludeCmpt == vector::Y)
     {
-        return Foam::min(minX, Foam::min(minZ, minOther));
+        return Foam::min
+        (
+            limitsAny.min(),
+            Foam::min(limitsX.min(), limitsZ.min())
+        );
     }
-    else if (excludeCmpt == 2)
+    else if (excludeCmpt == vector::Z)
     {
-        return Foam::min(minX, Foam::min(minY, minOther));
+        return Foam::min
+        (
+            limitsAny.min(),
+            Foam::min(limitsX.min(), limitsY.min())
+        );
     }
     else
     {
-        return Foam::min(minX, Foam::min(minY, Foam::min(minZ, minOther)));
+        return Foam::min
+        (
+            limitsAny.min(),
+            Foam::min
+            (
+                limitsX.min(),
+                Foam::min(limitsY.min(), limitsZ.min())
+            )
+        );
     }
 }
 

applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L

@@ -1674,10 +1674,9 @@ int main(int argc, char *argv[])
             // Add cell zones to patch zone list
             forAll(bPatches, pI)
             {
-                const labelList& faceCells = bPatches[pI].faceCells();
-                forAll(faceCells, fcI)
+                for (const label celli : bPatches[pI].faceCells())
                 {
-                    if (zoneCell.test(faceCells[fcI]))
+                    if (zoneCell.test(celli))
                     {
                         boundaryZones[pI].append(name);
                         break;

applications/utilities/mesh/conversion/foamMeshToFluent/fluentFvMesh.C

@@ -161,8 +161,7 @@ void Foam::fluentFvMesh::writeFluentMesh() const
     {
         const faceUList& patchFaces = boundaryMesh()[patchi];
 
-        const labelList& patchFaceCells =
-            boundaryMesh()[patchi].faceCells();
+        const labelUList& patchFaceCells = boundaryMesh()[patchi].faceCells();
 
         // The face group will be offset by 10 from the patch label
 

applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C

@@ -1506,7 +1506,7 @@ int main(int argc, char *argv[])
     // Go through all the patchFaces and find corresponding face in pp.
     forAll(patchFaces, patchi)
     {
-        const DynamicList<face>& pFaces = patchFaces[patchi];
+        const auto& pFaces = patchFaces[patchi];
 
         Info<< "Finding faces of patch " << patchi << endl;