ENH: functionObjects: add optional flag to suppress warnings for missing patches

.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 : v2406|v2312|v2306|v2212|v2206 etc
   Operating system : ubuntu|openSUSE|RedHat etc
   Hardware info    : any info that may help?
   Compiler         : gcc|clang etc

CONTRIBUTORS.md

@@ -27,7 +27,6 @@ It is likely incomplete...
 - Bernhard Gschaider
 - Andrew Heather
 - David Hill
-- Crist<73>bal Ib<49><62>ez
 - Yoshiaki Inoue
 - Mattijs Janssens
 - Andrew Jackson

META-INFO/api-info

@@ -1,2 +1,2 @@
-api=2412
+api=2406
 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-v2406 version:
 ```
-source /installation/path/OpenFOAM-v2412/etc/bashrc
+source /installation/path/OpenFOAM-v2406/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-v2406
+\-- ThirdParty-v2406
 ```
 There are, however, many cases where this simple convention is inadequate:
 
@@ -136,7 +136,7 @@ There are, however, many cases where this simple convention is inadequate:
   operating system or cluster installation provides it)
 
 * When we have changed the OpenFOAM directory name to some arbitrary
-  directory name, e.g. openfoam-sandbox2412, etc..
+  directory name, e.g. openfoam-sandbox2406, etc..
 
 * When we would like any additional 3rd party software to be located
   inside of the OpenFOAM directory to ensure that the installation is
@@ -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*, `v2406-myCustom`,
      without requiring a renamed ThirdParty. The API value would still
-     be `2412` and the original `ThirdParty-v2412/` would be found.
+     be `2406` and the original `ThirdParty-v2406/` would be found.
 4. PREFIX/ThirdParty-API
    * same as the previous example, but using an unadorned API value.
 5. PREFIX/ThirdParty-common

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

@@ -33,12 +33,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 {
-    const DimensionedField<scalar, volMesh> contErr
-    (
-        interpolatedCells.internalField()
-       *cellMask.internalField()
-       *fvc::div(phi)().internalField()
-    );
+    volScalarField contErr(interpolatedCells*cellMask*fvc::div(phi));
 
     scalar sumLocalContErr = runTime.deltaTValue()*
         mag(contErr)().weightedAverage(mesh.V()).value();

applications/solvers/incompressible/simpleFoam/Make/options

@@ -5,17 +5,13 @@ EXE_INC = \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
     -I$(LIB_SRC)/transportModels \
-    -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
-    -I$(LIB_SRC)/dynamicMesh/lnInclude \
-    -I$(LIB_SRC)/dynamicFvMesh/lnInclude
+    -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel
 
 EXE_LIBS = \
     -lfiniteVolume \
     -lfvOptions \
     -lmeshTools \
     -lsampling \
-    -ldynamicMesh \
-    -ldynamicFvMesh \
     -lturbulenceModels \
     -lincompressibleTurbulenceModels \
     -lincompressibleTransportModels \

applications/solvers/incompressible/simpleFoam/overSimpleFoam/continuityErrs.H

@@ -33,12 +33,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 {
-    const DimensionedField<scalar, volMesh> contErr
-    (
-        interpolatedCells.internalField()
-       *cellMask.internalField()
-       *fvc::div(phi)().internalField()
-    );
+    volScalarField contErr(interpolatedCells*cellMask*fvc::div(phi));
 
     scalar sumLocalContErr = runTime.deltaTValue()*
         mag(contErr)().weightedAverage(mesh.V()).value();

applications/solvers/incompressible/simpleFoam/simpleFoam.C

@@ -64,7 +64,6 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
-#include "dynamicFvMesh.H"
 #include "singlePhaseTransportModel.H"
 #include "turbulentTransportModel.H"
 #include "simpleControl.H"
@@ -84,7 +83,7 @@ int main(int argc, char *argv[])
     #include "addCheckCaseOptions.H"
     #include "setRootCaseLists.H"
     #include "createTime.H"
-    #include "createDynamicFvMesh.H"
+    #include "createMesh.H"
     #include "createControl.H"
     #include "createFields.H"
     #include "initContinuityErrs.H"
@@ -99,14 +98,6 @@ int main(int argc, char *argv[])
     {
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-        // Do any mesh changes
-        mesh.controlledUpdate();
-
-        if (mesh.changing())
-        {
-            MRF.update();
-        }
-
         // --- Pressure-velocity SIMPLE corrector
         {
             #include "UEqn.H"

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

@@ -33,12 +33,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 {
-    const DimensionedField<scalar, volMesh> contErr
-    (
-        interpolatedCells.internalField()
-       *cellMask.internalField()
-       *fvc::div(phi)().internalField()
-    );
+    volScalarField contErr(interpolatedCells*cellMask*fvc::div(phi));
 
     scalar sumLocalContErr = runTime.deltaTValue()*
         mag(contErr)().weightedAverage(mesh.V()).value();

applications/solvers/multiphase/twoPhaseEulerFoam/EEqns.H

@@ -50,7 +50,7 @@
       + (
             he2.name() == thermo2.phasePropertyName("e")
           ? fvc::div(fvc::absolute(alphaPhi2, alpha2, U2), p)
-          + p*fvc::ddt(alpha2)
+          + p*fvc::ddt(alpha1)
           : -alpha2*dpdt
         )
 

applications/test/00-machine-sizes/Test-machine-sizes.cpp

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018-2025 OpenCFD Ltd.
+    Copyright (C) 2018-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -25,12 +25,9 @@ License
 
 Description
     Test the sizeof for basic types.
-    Also tests how the data mapping of OpenFOAM types to UPstream (MPI)
-    type ids are handled.
-
     Can be compiled and run without any OpenFOAM libraries.
 
-        g++ -std=c++17 -oTest-machine-sizes Test-machine-sizes.cpp
+        g++ -std=c++11 -oTest-machine-sizes Test-machine-sizes.cpp
 
 \*---------------------------------------------------------------------------*/
 
@@ -40,114 +37,6 @@ Description
 #include <iostream>
 #include <limits>
 #include <typeinfo>
-#include <type_traits>
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-// Partial copy from UPstream.H
-
-//- Some MPI data types
-//
-//- Mapping of some fundamental and aggregate types to MPI data types
-enum class dataTypes : int
-{
-    // Builtin Types [8]:
-    DataTypes_begin,    //!< Begin builtin types (internal use)
-    type_byte = DataTypes_begin,  // also for char, unsigned char
-    type_int32,
-    type_int64,
-    type_uint32,
-    type_uint64,
-    type_float,
-    type_double,
-    type_long_double,
-    invalid
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-// Partial copy from UPstreamTraits.H
-
-//- A supported UPstream data type (intrinsic or user-defined)
-template<class T>
-struct UPstream_base_dataType : std::false_type
-{
-    static constexpr auto datatype_id = dataTypes::invalid;
-};
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// Specializations of the above,
-// each to match the elements of UPstream::dataTypes
-
-#undef  defineUPstreamDataTraits
-#define defineUPstreamDataTraits(TypeId, Type)                                \
-    template<> struct UPstream_base_dataType<Type> : std::true_type           \
-    {                                                                         \
-        static constexpr auto datatype_id = dataTypes::TypeId;                \
-    };
-
-
-defineUPstreamDataTraits(type_byte,   char);
-defineUPstreamDataTraits(type_byte,   unsigned char);
-defineUPstreamDataTraits(type_int32,  int32_t);
-defineUPstreamDataTraits(type_int64,  int64_t);
-defineUPstreamDataTraits(type_uint32, uint32_t);
-defineUPstreamDataTraits(type_uint64, uint64_t);
-defineUPstreamDataTraits(type_float,  float);
-defineUPstreamDataTraits(type_double, double);
-defineUPstreamDataTraits(type_long_double, long double);
-
-#undef defineUPstreamDataTraits
-
-
-//- Explicit handling of data type aliases. This is necessary since
-//- different systems map things like 'unsigned long' differently but we
-//- restrict ourselves to int32/int64 types
-template<class T>
-struct UPstream_alias_dataType
-:
-    std::bool_constant
-    <
-        // Base type (no alias needed)
-        UPstream_base_dataType<std::remove_cv_t<T>>::value ||
-        (
-            // Or some int 32/64 type to re-map
-            std::is_integral_v<T>
-         && (sizeof(T) == sizeof(int32_t) || sizeof(T) == sizeof(int64_t))
-        )
-    >
-{
-    // Is it using the base type? (no alias needed)
-    static constexpr bool is_base =
-        UPstream_base_dataType<std::remove_cv_t<T>>::value;
-
-    using base = std::conditional_t
-    <
-        UPstream_base_dataType<std::remove_cv_t<T>>::value,  // is_base
-        std::remove_cv_t<T>,
-        std::conditional_t
-        <
-            (
-                std::is_integral_v<T>
-             && (sizeof(T) == sizeof(int32_t) || sizeof(T) == sizeof(int64_t))
-            ),
-            std::conditional_t
-            <
-                (sizeof(T) == sizeof(int32_t)),
-                std::conditional_t<std::is_signed_v<T>, int32_t, uint32_t>,
-                std::conditional_t<std::is_signed_v<T>, int64_t, uint64_t>
-            >,
-            char  // Fallback value (assuming it is contiguous)
-        >
-    >;
-
-    static constexpr auto datatype_id =
-        UPstream_base_dataType<base>::datatype_id;
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class T>
 void print(const char* name, bool showLimits = true)
@@ -158,78 +47,28 @@ void print(const char* name, bool showLimits = true)
     if (showLimits)
     {
         std::cout
-            << " max=<";
-
-        if constexpr (sizeof(T) == 1)
-        {
-            std::cout << int(std::numeric_limits<T>::max());
-        }
-        else
-        {
-            std::cout << std::numeric_limits<T>::max();
-        }
-        std::cout << '>';
-    }
-
-    // A declared or deduced MPI type, or aliased
-    std::cout
-        << " is_mpi=" << UPstream_base_dataType<T>::value
-        << " (" << int(UPstream_base_dataType<T>::datatype_id) << ")";
-
-    if (UPstream_alias_dataType<T>::value)
-    {
-        if (UPstream_alias_dataType<T>::is_base)
-        {
-            std::cout<< " is_base";
-        }
-        else
-        {
-            std::cout<< " is_alias ("
-                << int(UPstream_alias_dataType<T>::datatype_id) << ")";
-        }
-    }
-    else
-    {
-        std::cout<< " no_alias";
+            << " \"max\"=" << std::numeric_limits<T>::max();
     }
 
     std::cout<< '\n';
 }
 
 
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 // Main program:
 
 int main(int argc, char *argv[])
 {
     std::cout<< "c++ = " << __cplusplus << '\n';
-    std::cout<< "machine sizes (and some MPI traits)\n---\n\n";
+    std::cout<< "machine sizes\n---\n\n";
 
-    print<int8_t>("int8_t");
-    print<uint8_t>("uint8_t");
-    print<int16_t>("int16_t");
-    print<uint16_t>("uint16_t");
-    print<int32_t>("int32_t");
-    print<uint32_t>("uint32_t");
-    print<int64_t>("int64_t");
-    print<uint64_t>("uint64_t");
-
-    std::cout << '\n';
-    print<char>("char");
-    print<unsigned char>("unsigned char");
     print<short>("short");
     print<int>("int");
-    print<unsigned>("unsigned");
     print<long>("long");
     print<unsigned long>("unsigned long");
+    print<std::size_t>("std::size_t");
     print<long long>("long long");
 
-    std::cout << '\n';
-    print<std::size_t>("std::size_t");
-    print<std::streamsize>("std::streamsize");
-
-    std::cout << '\n';
     print<float>("float");
     print<double>("double");
     print<long double>("long double");

applications/test/DiagTensor/Test-DiagTensor.C

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2020-2025 OpenCFD Ltd.
+    Copyright (C) 2020-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -38,11 +38,12 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#include "complex.H"
 #include "Tensor.H"
 #include "SymmTensor.H"
 #include "SphericalTensor.H"
 #include "DiagTensor.H"
+#include "scalar.H"
+#include "complex.H"
 
 using namespace Foam;
 
@@ -56,11 +57,45 @@ unsigned nTest_ = 0;
 unsigned nFail_ = 0;
 
 
+// Compare two floating point types, and print output.
+// Do ++nFail_ if values of two objects are not equal within a given tolerance.
+// The function is converted from PEP-485.
+template<class Type>
+typename std::enable_if<pTraits<Type>::rank == 0, void>::type
+cmp
+(
+    const word& msg,
+    const Type& x,
+    const Type& y,
+    const scalar relTol = 1e-8,  //<! are values the same within 8 decimals
+    const scalar absTol = 0      //<! useful for cmps near zero
+)
+{
+    Info<< msg << x << endl;
+
+    unsigned nFail = 0;
+
+    if (max(absTol, relTol*max(mag(x), mag(y))) < mag(x - y))
+    {
+        ++nFail;
+    }
+
+    if (nFail)
+    {
+        Info<< nl
+            << "        #### Fail in " << nFail << " comps ####" << nl << endl;
+        ++nFail_;
+    }
+    ++nTest_;
+}
+
+
 // Compare two containers elementwise, and print output.
 // Do ++nFail_ if two components are not equal within a given tolerance.
 // The function is converted from PEP-485
 template<class Type>
-void cmp
+typename std::enable_if<pTraits<Type>::rank != 0, void>::type
+cmp
 (
     const word& msg,
     const Type& x,
@@ -69,37 +104,18 @@ void cmp
     const scalar absTol = 0
 )
 {
-    const auto notEqual = [=](const auto& a, const auto& b) -> bool
-    {
-        return
-        (
-            Foam::max(absTol, relTol*Foam::max(Foam::mag(a), Foam::mag(b)))
-          < Foam::mag(a - b)
-        );
-    };
+    Info<< msg << x << endl;
 
     unsigned nFail = 0;
 
-    if constexpr (is_vectorspace_v<Type>)
+    for (direction i = 0; i < pTraits<Type>::nComponents; ++i)
     {
-        for (direction i = 0; i < pTraits<Type>::nComponents; ++i)
-        {
-            if (notEqual(x[i], y[i]))
-            {
-                ++nFail;
-            }
-        }
-    }
-    else
-    {
-        if (notEqual(x, y))
+        if (max(absTol, relTol*max(mag(x[i]), mag(y[i]))) < mag(x[i] - y[i]))
         {
             ++nFail;
         }
     }
 
-    Info<< msg << x << endl;
-
     if (nFail)
     {
         Info<< nl
@@ -352,26 +368,27 @@ void test_global_opers(Type)
 
 // Do compile-time recursion over the given types
 template<std::size_t I = 0, typename... Tp>
-void run_tests(const std::tuple<Tp...>& types, const List<word>& names)
+inline typename std::enable_if<I == sizeof...(Tp), void>::type
+run_tests(const std::tuple<Tp...>& types, const List<word>& typeID){}
+
+
+template<std::size_t I = 0, typename... Tp>
+inline typename std::enable_if<I < sizeof...(Tp), void>::type
+run_tests(const std::tuple<Tp...>& types, const List<word>& typeID)
 {
-    if constexpr (I < sizeof...(Tp))
-    {
-        const auto& name = names[I];
+    Info<< nl << "    ## Test constructors: "<< typeID[I] <<" ##" << nl;
+    test_constructors(std::get<I>(types));
 
-        Info<< nl << "    ## Test constructors: " << name << " ##" << nl;
-        test_constructors(std::get<I>(types));
+    Info<< nl << "    ## Test member functions: "<< typeID[I] <<" ##" << nl;
+    test_member_funcs(std::get<I>(types));
 
-        Info<< nl << "    ## Test member functions: " << name << " ##" << nl;
-        test_member_funcs(std::get<I>(types));
+    Info<< nl << "    ## Test global functions: "<< typeID[I] << " ##" << nl;
+    test_global_funcs(std::get<I>(types));
 
-        Info<< nl << "    ## Test global functions: " << name << " ##" << nl;
-        test_global_funcs(std::get<I>(types));
+    Info<< nl << "    ## Test global operators: "<< typeID[I] <<" ##" << nl;
+    test_global_opers(std::get<I>(types));
 
-        Info<< nl << "    ## Test global operators: " << name << " ##" << nl;
-        test_global_opers(std::get<I>(types));
-
-        run_tests<I + 1, Tp...>(types, names);
-    }
+    run_tests<I + 1, Tp...>(types, typeID);
 }
 
 
@@ -386,8 +403,8 @@ int main()
 
     const List<word> typeID
     ({
-        "DiagTensor<float>",
-        "DiagTensor<double>",
+        "DiagTensor<floatScalar>",
+        "DiagTensor<doubleScalar>",
         "DiagTensor<complex>"
     });
 

applications/test/Dictionary/Make/files

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

applications/test/Dictionary/Test-Dictionary.C

@@ -25,10 +25,10 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Application
-    Test-PtrDictionary1
+    Test-Dictionary
 
 Description
-    Tests for Dictionary (not dictionary) and PtrDictionary
+    Tests for Dictionary (not dictionary)
 
 \*---------------------------------------------------------------------------*/
 
@@ -185,7 +185,7 @@ int main(int argc, char *argv[])
     }
 
     std::cout<< "iter type: "
-        << typeid(std::begin(scalarDict2)).name() << '\n';
+        << typeid(stdFoam::begin(scalarDict2)).name() << '\n';
 
     scalarDict.transfer(scalarDict2);
 

applications/test/FixedList/Test-FixedList.C

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2019-2025 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -85,7 +85,8 @@ void compileInfo()
 
 
 template<class FixedListType>
-std::enable_if_t<(FixedListType::max_size() == 2), bool>
+typename std::enable_if
+<(FixedListType::max_size() == 2), bool>::type
 is_pair()
 {
      return true;
@@ -93,7 +94,7 @@ is_pair()
 
 
 template<class FixedListType>
-std::enable_if_t<(FixedListType::max_size() != 2), std::string>
+typename std::enable_if<(FixedListType::max_size() != 2), std::string>::type
 is_pair()
 {
      return "not really at all";

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:  v2406                                 |
 |   \\  /    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:  v2406                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/

applications/test/GAMGAgglomeration/Test-GAMGAgglomeration.C

@@ -92,10 +92,7 @@ int main(int argc, char *argv[])
         {
             fld[celli] = cellToCoarse[celli];
         }
-        if (normalise)
-        {
-            fld /= max(fld);
-        }
+        fld /= max(fld);
         scalarAgglomeration.correctBoundaryConditions();
         scalarAgglomeration.write();
 

applications/test/Hashing1/HashFunction.H

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2021-2025 OpenCFD Ltd.
+    Copyright (C) 2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -42,11 +42,9 @@ Note
 #include "Hash.H"
 
 #ifdef FULLDEBUG
-#define HashTypeInfo(Name)  \
-    static constexpr const char* name() noexcept { return Name; } \
-    void info() const { std::cerr<< name() << " hashing\n"; }
+#define HashTypeInfo(Args)  void info() { std::cerr<< "" Args << "\n"; }
 #else
-#define HashTypeInfo(Name)  void info() const {}
+#define HashTypeInfo(Args)  void info() {}
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -55,36 +53,20 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                          Class HashFunc Declaration
+                            Class Hash Declaration
 \*---------------------------------------------------------------------------*/
 
-template<class T>
+template<class T, class SFINAEType=bool>
 struct HashFun
 {
-    void info() const
-    {
-        #ifdef FULLDEBUG
-        if constexpr (std::is_base_of_v<std::string, T>)
-        {
-            std::cerr<< "std::string hashing\n";
-        }
-        else
-        {
-            std::cerr<< "default hashing\n";
-        }
-        #endif
-    }
+    #ifdef FULLDEBUG
+    static constexpr const char* name() noexcept { return "default"; }
+    #endif
+    HashTypeInfo("plain hash")
 
     unsigned operator()(const T& obj, unsigned seed=0) const
     {
-        if constexpr (std::is_base_of_v<std::string, T>)
-        {
-            return Foam::Hasher(obj.data(), obj.size(), seed);
-        }
-        else
-        {
-            return Foam::Hasher(&obj, sizeof(obj), seed);
-        }
+        return Foam::Hasher(&obj, sizeof(obj), seed);
     }
 };
 
@@ -94,17 +76,45 @@ struct HashFun
 //- Hashing for label
 template<> struct HashFun<Foam::label> : Hash<label>
 {
-    HashTypeInfo("label")
+    #ifdef FULLDEBUG
+    static constexpr const char* name() noexcept { return "label"; }
+    #endif
+    HashTypeInfo("hash label")
 };
 
 
 //- Hashing for pointers, interpret pointer as a integer type
 template<> struct HashFun<void*> : Hash<void *>
 {
-    HashTypeInfo("pointer")
+    #ifdef FULLDEBUG
+    static constexpr const char* name() noexcept { return "pointer"; }
+    #endif
+    HashTypeInfo("hash ptr")
 };
 
 
+//- Hashing for string types
+template<class StringType>
+struct HashFun
+<
+    StringType,
+    typename std::enable_if
+    <
+        std::is_base_of<std::string, StringType>::value, bool
+    >::type
+>
+{
+    #ifdef FULLDEBUG
+    static constexpr const char* name() noexcept { return "string"; }
+    #endif
+    HashTypeInfo("hash string")
+
+    unsigned operator()(const std::string& obj, unsigned seed=0) const
+    {
+        return Foam::Hasher(obj.data(), obj.size(), seed);
+    }
+};
+
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -123,56 +133,83 @@ namespace Foam
 
 template<> struct HashFun<edge> : Hash<edge>
 {
-    HashTypeInfo("edge")
+    #ifdef FULLDEBUG
+    static constexpr const char* name() noexcept { return "edge"; }
+    #endif
+    HashTypeInfo("hash edge")
 };
 
 
 template<> struct HashFun<face> : Hash<face>
 {
-    HashTypeInfo("face")
+    #ifdef FULLDEBUG
+    static constexpr const char* name() noexcept { return "face"; }
+    #endif
+    HashTypeInfo("hash face")
 };
 
 
 template<> struct HashFun<triFace> : Hash<triFace>
 {
-    HashTypeInfo("triFace")
+    #ifdef FULLDEBUG
+    static constexpr const char* name() noexcept { return "triFace"; }
+    #endif
+    HashTypeInfo("hash triFace")
 };
 
 
 template<class T>
 struct HashFun<Pair<T>> : Hash<Pair<T>>
 {
-    HashTypeInfo("Pair")
+    #ifdef FULLDEBUG
+    static constexpr const char* name() noexcept { return "Pair"; }
+    #endif
+    HashTypeInfo("hash Pair")
 };
 
 template<class T1, class T2>
 struct HashFun<Tuple2<T1, T2>> : Hash<Tuple2<T1, T2>>
 {
-    HashTypeInfo("Tuple2")
+    #ifdef FULLDEBUG
+    static constexpr const char* name() noexcept { return "Tuple2"; }
+    #endif
+    HashTypeInfo("hash Tuple2")
 };
 
 
 template<class T>
 struct HashFun<List<T>> : Hash<List<T>>
 {
-    HashTypeInfo("List")
+    #ifdef FULLDEBUG
+    static constexpr const char* name() noexcept { return "List"; }
+    #endif
+    HashTypeInfo("hash List")
 };
 
 template<class T> struct HashFun<UList<T>> : Hash<UList<T>>
 {
-    HashTypeInfo("UList")
+    #ifdef FULLDEBUG
+    static constexpr const char* name() noexcept { return "UList"; }
+    #endif
+    HashTypeInfo("hash UList")
 };
 
 template<class T, int SizeMin>
 struct HashFun<DynamicList<T, SizeMin>> : Hash<DynamicList<T, SizeMin>>
 {
-    HashTypeInfo("DynamicList")
+    #ifdef FULLDEBUG
+    static constexpr const char* name() noexcept { return "DynamicList"; }
+    #endif
+    HashTypeInfo("hash DynamicList")
 };
 
 template<class T, unsigned N>
 struct HashFun<FixedList<T, N>> : Hash<FixedList<T, N>>
 {
-    HashTypeInfo("FixedList")
+    #ifdef FULLDEBUG
+    static constexpr const char* name() noexcept { return "FixedList"; }
+    #endif
+    HashTypeInfo("hash FixedList")
 };
 
 

applications/test/Hashing2/Test-Hashing2.C

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2018-2025 OpenCFD Ltd.
+    Copyright (C) 2018-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -81,7 +81,7 @@ void infoHashString
 
 void reportHashList(const UList<string>& list)
 {
-    Info<< "contiguous = " << is_contiguous_v<string> << nl << nl;
+    Info<< "contiguous = " << is_contiguous<string>::value << nl << nl;
 
     for (const string& val : list)
     {
@@ -94,7 +94,7 @@ void reportHashList(const UList<string>& list)
 
 void reportHashList(const UList<label>& list)
 {
-    Info<<"contiguous = " << is_contiguous_v<label> << nl << nl;
+    Info<<"contiguous = " << is_contiguous<label>::value << nl << nl;
 
     for (const label val : list)
     {
@@ -113,7 +113,7 @@ void reportHashList(const UList<label>& list)
 
 void reportHashList(const UList<face>& list)
 {
-    Info<<"contiguous = " << is_contiguous_v<label> << nl << nl;
+    Info<<"contiguous = " << is_contiguous<label>::value << nl << nl;
 
     for (const face& f : list)
     {
@@ -154,7 +154,7 @@ void reportHashList(const UList<labelList>& list)
 
 void reportHashList(const UList<wordPair>& list)
 {
-    Info<<"contiguous = " << is_contiguous_v<wordPair> << nl << nl;
+    Info<<"contiguous = " << is_contiguous<wordPair>::value << nl << nl;
 
     for (const wordPair& pr : list)
     {
@@ -179,7 +179,7 @@ void reportHashList(const UList<wordPair>& list)
 
 void reportHashList(const UList<labelPair>& list)
 {
-    Info<<"contiguous = " << is_contiguous_v<labelPair> << nl << nl;
+    Info<<"contiguous = " << is_contiguous<labelPair>::value << nl << nl;
 
     for (const labelPair& pr : list)
     {
@@ -200,7 +200,7 @@ void reportHashList(const UList<labelPair>& list)
 
 void reportHashList(const UList<labelPairPair>& list)
 {
-    Info<<"contiguous = " << is_contiguous_v<labelPairPair> << nl << nl;
+    Info<<"contiguous = " << is_contiguous<labelPairPair>::value << nl << nl;
 
     for (const labelPairPair& pr : list)
     {
@@ -221,7 +221,7 @@ void reportHashList(const UList<labelPairPair>& list)
 
 void reportHashList(const UList<edge>& list)
 {
-    Info<<"contiguous = " << is_contiguous_v<edge> << nl << nl;
+    Info<<"contiguous = " << is_contiguous<edge>::value << nl << nl;
 
     for (const edge& e : list)
     {
@@ -242,7 +242,7 @@ void reportHashList(const UList<edge>& list)
 
 void reportHashList(const UList<triFace>& list)
 {
-    Info<<"contiguous = " << is_contiguous_v<triFace> << nl << nl;
+    Info<<"contiguous = " << is_contiguous<triFace>::value << nl << nl;
 
     for (const triFace& f : list)
     {

applications/test/Hashing2/hashingTests

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

applications/test/IOField/Test-IOField.cxx

@@ -213,10 +213,11 @@ int main(int argc, char *argv[])
             mesh
         );
 
-        Info<< "points path: " << io.typeFilePath<pointIOField>() << nl;
+        Info<< "points path: " << io.typeFilePath<labelIOList>() << nl;
+        Info<< "points path: " << io.typeFilePath<void>() << nl;
 
         io.resetHeader("bad-points");
-        Info<< "bad path: " << io.typeFilePath<labelIOList>() << nl;
+        Info<< "bad path: " << io.typeFilePath<void>() << nl;
     }
 
     IOobject io

applications/test/IOobject-type/Test-IOobject-type.cxx

@@ -45,7 +45,7 @@ using namespace Foam;
 template<class Type>
 word report()
 {
-    if constexpr (is_globalIOobject<Type>::value)
+    if (is_globalIOobject<Type>::value)
     {
         return "global";
     }

applications/test/List/Test-List.C

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2017-2025 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -118,7 +118,7 @@ Ostream& printListOutputType(const char* what)
 {
     Info<< what
         << " (contiguous="
-        << is_contiguous_v<T> << " no_linebreak="
+        << is_contiguous<T>::value << " no_linebreak="
         << Detail::ListPolicy::no_linebreak<T>::value
         << " short_length="
         << Detail::ListPolicy::short_length<T>::value << ')';

applications/test/MathFunctions/Test-MathFunctions.C

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2021-2025 OpenCFD Ltd.
+    Copyright (C) 2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -128,17 +128,18 @@ void test_member_funcs(Type)
 
 // Do compile-time recursion over the given types
 template<std::size_t I = 0, typename... Tp>
-void run_tests(const std::tuple<Tp...>& types, const List<word>& names)
+inline typename std::enable_if<I == sizeof...(Tp), void>::type
+run_tests(const std::tuple<Tp...>& types, const List<word>& typeID){}
+
+
+template<std::size_t I = 0, typename... Tp>
+inline typename std::enable_if<I < sizeof...(Tp), void>::type
+run_tests(const std::tuple<Tp...>& types, const List<word>& typeID)
 {
-    if constexpr (I < sizeof...(Tp))
-    {
-        const auto& name = names[I];
+    Info<< nl << "    ## Test member functions: "<< typeID[I] <<" ##" << nl;
+    test_member_funcs(std::get<I>(types));
 
-        Info<< nl << "    ## Test member functions: " << name << " ##" << nl;
-        test_member_funcs(std::get<I>(types));
-
-        run_tests<I + 1, Tp...>(types, names);
-    }
+    run_tests<I + 1, Tp...>(types, typeID);
 }
 
 

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:  v2406                                 |
 |   \\  /    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:  v2406                                 |
 |   \\  /    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:  v2406                                 |
 |   \\  /    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:  v2406                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/

applications/test/PatchFunction1/function1Properties

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

applications/test/PtrDictionary1/Make/files

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

applications/test/SphericalTensor/Test-SphericalTensor.C

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2020-2025 OpenCFD Ltd.
+    Copyright (C) 2020-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -38,11 +38,12 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#include "complex.H"
 #include "Tensor.H"
 #include "SymmTensor.H"
 #include "SphericalTensor.H"
 #include "DiagTensor.H"
+#include "scalar.H"
+#include "complex.H"
 
 using namespace Foam;
 
@@ -56,50 +57,65 @@ unsigned nTest_ = 0;
 unsigned nFail_ = 0;
 
 
-// Compare two containers elementwise, and print output.
+// Compare two floating point types, and print output.
 // Do ++nFail_ if values of two objects are not equal within a given tolerance.
 // The function is converted from PEP-485.
-template<class Type, class Type2 = Type>
-void cmp
+template<class Type>
+typename std::enable_if<pTraits<Type>::rank == 0, void>::type
+cmp
 (
     const word& msg,
     const Type& x,
-    const Type2& y,
+    const Type& y,
     const scalar relTol = 1e-8,  //<! are values the same within 8 decimals
     const scalar absTol = 0      //<! useful for cmps near zero
 )
 {
-    const auto notEqual = [=](const auto& a, const auto& b) -> bool
-    {
-        return
-        (
-            Foam::max(absTol, relTol*Foam::max(Foam::mag(a), Foam::mag(b)))
-          < Foam::mag(a - b)
-        );
-    };
+    Info<< msg << x << endl;
 
     unsigned nFail = 0;
 
-    if constexpr (is_vectorspace_v<Type>)
+    if (max(absTol, relTol*max(mag(x), mag(y))) < mag(x - y))
     {
-        for (direction i = 0; i < pTraits<Type>::nComponents; ++i)
-        {
-            if (notEqual(x[i], y[i]))
-            {
-                ++nFail;
-            }
-        }
+        ++nFail;
     }
-    else
+
+    if (nFail)
     {
-        if (notEqual(x, y))
+        Info<< nl
+            << "        #### Fail in " << nFail << " comps ####" << nl << endl;
+        ++nFail_;
+    }
+    ++nTest_;
+}
+
+
+// Compare two containers elementwise, and print output.
+// Do ++nFail_ if two components are not equal within a given tolerance.
+// The function is converted from PEP-485
+template<class Type>
+typename std::enable_if<pTraits<Type>::rank != 0, void>::type
+cmp
+(
+    const word& msg,
+    const Type& x,
+    const Type& y,
+    const scalar relTol = 1e-8,
+    const scalar absTol = 0
+)
+{
+    Info<< msg << x << endl;
+
+    unsigned nFail = 0;
+
+    for (direction i = 0; i < pTraits<Type>::nComponents; ++i)
+    {
+        if (max(absTol, relTol*max(mag(x[i]), mag(y[i]))) < mag(x[i] - y[i]))
         {
             ++nFail;
         }
     }
 
-    Info<< msg << x << endl;
-
     if (nFail)
     {
         Info<< nl
@@ -261,26 +277,27 @@ void test_global_opers(Type)
 
 // Do compile-time recursion over the given types
 template<std::size_t I = 0, typename... Tp>
-void run_tests(const std::tuple<Tp...>& types, const List<word>& names)
+inline typename std::enable_if<I == sizeof...(Tp), void>::type
+run_tests(const std::tuple<Tp...>& types, const List<word>& typeID){}
+
+
+template<std::size_t I = 0, typename... Tp>
+inline typename std::enable_if<I < sizeof...(Tp), void>::type
+run_tests(const std::tuple<Tp...>& types, const List<word>& typeID)
 {
-    if constexpr (I < sizeof...(Tp))
-    {
-        const auto& name = names[I];
+    Info<< nl << "    ## Test constructors: "<< typeID[I] <<" ##" << nl;
+    test_constructors(std::get<I>(types));
 
-        Info<< nl << "    ## Test constructors: " << name << " ##" << nl;
-        test_constructors(std::get<I>(types));
+    Info<< nl << "    ## Test member functions: "<< typeID[I] <<" ##" << nl;
+    test_member_funcs(std::get<I>(types));
 
-        Info<< nl << "    ## Test member functions: " << name << " ##" << nl;
-        test_member_funcs(std::get<I>(types));
+    Info<< nl << "    ## Test global functions: "<< typeID[I] << " ##" << nl;
+    test_global_funcs(std::get<I>(types));
 
-        Info<< nl << "    ## Test global functions: " << name << " ##" << nl;
-        test_global_funcs(std::get<I>(types));
+    Info<< nl << "    ## Test global operators: "<< typeID[I] <<" ##" << nl;
+    test_global_opers(std::get<I>(types));
 
-        Info<< nl << "    ## Test global operators: " << name << " ##" << nl;
-        test_global_opers(std::get<I>(types));
-
-        run_tests<I + 1, Tp...>(types, names);
-    }
+    run_tests<I + 1, Tp...>(types, typeID);
 }
 
 
@@ -295,8 +312,8 @@ int main()
 
     const List<word> typeID
     ({
-        "SphericalTensor<float>",
-        "SphericalTensor<double>",
+        "SphericalTensor<floatScalar>",
+        "SphericalTensor<doubleScalar>",
         "SphericalTensor<complex>"
     });
 

applications/test/SphericalTensor2D/Test-SphericalTensor2D.C

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2020-2025 OpenCFD Ltd.
+    Copyright (C) 2020-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -38,10 +38,11 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#include "complex.H"
 #include "Tensor2D.H"
 #include "SymmTensor2D.H"
 #include "SphericalTensor2D.H"
+#include "scalar.H"
+#include "complex.H"
 
 using namespace Foam;
 
@@ -55,11 +56,12 @@ unsigned nTest_ = 0;
 unsigned nFail_ = 0;
 
 
-// Compare two containers elementwise, and print output.
+// Compare two floating point types, and print output.
 // Do ++nFail_ if values of two objects are not equal within a given tolerance.
 // The function is converted from PEP-485.
 template<class Type>
-void cmp
+typename std::enable_if<pTraits<Type>::rank == 0, void>::type
+cmp
 (
     const word& msg,
     const Type& x,
@@ -68,37 +70,51 @@ void cmp
     const scalar absTol = 0      //<! useful for cmps near zero
 )
 {
-    const auto notEqual = [=](const auto& a, const auto& b) -> bool
-    {
-        return
-        (
-            Foam::max(absTol, relTol*Foam::max(Foam::mag(a), Foam::mag(b)))
-          < Foam::mag(a - b)
-        );
-    };
+    Info<< msg << x << endl;
 
     unsigned nFail = 0;
 
-    if constexpr (is_vectorspace_v<Type>)
+    if (max(absTol, relTol*max(mag(x), mag(y))) < mag(x - y))
     {
-        for (direction i = 0; i < pTraits<Type>::nComponents; ++i)
-        {
-            if (notEqual(x[i], y[i]))
-            {
-                ++nFail;
-            }
-        }
+        ++nFail;
     }
-    else
+
+    if (nFail)
     {
-        if (notEqual(x, y))
+        Info<< nl
+            << "        #### Fail in " << nFail << " comps ####" << nl << endl;
+        ++nFail_;
+    }
+    ++nTest_;
+}
+
+
+// Compare two containers elementwise, and print output.
+// Do ++nFail_ if two components are not equal within a given tolerance.
+// The function is converted from PEP-485
+template<class Type>
+typename std::enable_if<pTraits<Type>::rank != 0, void>::type
+cmp
+(
+    const word& msg,
+    const Type& x,
+    const Type& y,
+    const scalar relTol = 1e-8,
+    const scalar absTol = 0
+)
+{
+    Info<< msg << x << endl;
+
+    unsigned nFail = 0;
+
+    for (direction i = 0; i < pTraits<Type>::nComponents; ++i)
+    {
+        if (max(absTol, relTol*max(mag(x[i]), mag(y[i]))) < mag(x[i] - y[i]))
         {
             ++nFail;
         }
     }
 
-    Info<< msg << x << endl;
-
     if (nFail)
     {
         Info<< nl
@@ -244,26 +260,27 @@ void test_global_opers(Type)
 
 // Do compile-time recursion over the given types
 template<std::size_t I = 0, typename... Tp>
-void run_tests(const std::tuple<Tp...>& types, const List<word>& names)
+inline typename std::enable_if<I == sizeof...(Tp), void>::type
+run_tests(const std::tuple<Tp...>& types, const List<word>& typeID){}
+
+
+template<std::size_t I = 0, typename... Tp>
+inline typename std::enable_if<I < sizeof...(Tp), void>::type
+run_tests(const std::tuple<Tp...>& types, const List<word>& typeID)
 {
-    if constexpr (I < sizeof...(Tp))
-    {
-        const auto& name = names[I];
+    Info<< nl << "    ## Test constructors: "<< typeID[I] <<" ##" << nl;
+    test_constructors(std::get<I>(types));
 
-        Info<< nl << "    ## Test constructors: " << name << " ##" << nl;
-        test_constructors(std::get<I>(types));
+    Info<< nl << "    ## Test member functions: "<< typeID[I] <<" ##" << nl;
+    test_member_funcs(std::get<I>(types));
 
-        Info<< nl << "    ## Test member functions: " << name << " ##" << nl;
-        test_member_funcs(std::get<I>(types));
+    Info<< nl << "    ## Test global functions: "<< typeID[I] << " ##" << nl;
+    test_global_funcs(std::get<I>(types));
 
-        Info<< nl << "    ## Test global functions: " << name << " ##" << nl;
-        test_global_funcs(std::get<I>(types));
+    Info<< nl << "    ## Test global operators: "<< typeID[I] <<" ##" << nl;
+    test_global_opers(std::get<I>(types));
 
-        Info<< nl << "    ## Test global operators: " << name << " ##" << nl;
-        test_global_opers(std::get<I>(types));
-
-        run_tests<I + 1, Tp...>(types, names);
-     }
+    run_tests<I + 1, Tp...>(types, typeID);
 }
 
 
@@ -278,8 +295,8 @@ int main()
 
     const List<word> typeID
     ({
-        "SphericalTensor2D<float>",
-        "SphericalTensor2D<double>",
+        "SphericalTensor2D<floatScalar>",
+        "SphericalTensor2D<doubleScalar>",
         "SphericalTensor2D<complex>"
     });
 

applications/test/SymmTensor/Test-SymmTensor.C

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2020-2025 OpenCFD Ltd.
+    Copyright (C) 2020-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -40,10 +40,11 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#include "complex.H"
 #include "symmTensor.H"
 #include "transform.H"
 #include "Random.H"
+#include "scalar.H"
+#include "complex.H"
 
 using namespace Foam;
 
@@ -68,12 +69,12 @@ symmTensor makeRandomContainer(Random& rnd)
 
 // Create a symmTensor based on a given value
 template<class Type>
-std::enable_if_t
+typename std::enable_if
 <
-    std::is_floating_point_v<Type> || std::is_same_v<complex, Type>,
+    std::is_same<floatScalar, Type>::value ||
+    std::is_same<doubleScalar, Type>::value,
     symmTensor
->
-makeContainer(const Type val)
+>::type makeContainer(const Type val)
 {
     symmTensor T(Zero);
     std::fill(T.begin(), T.end(), val);
@@ -81,11 +82,12 @@ makeContainer(const Type val)
 }
 
 
-// Compare two containers elementwise, and print output.
+// Compare two floating point types, and print output.
 // Do ++nFail_ if values of two objects are not equal within a given tolerance.
 // The function is converted from PEP-485.
 template<class Type>
-void cmp
+typename std::enable_if<pTraits<Type>::rank == 0, void>::type
+cmp
 (
     const word& msg,
     const Type& x,
@@ -94,37 +96,51 @@ void cmp
     const scalar relTol = 1e-8  //<! are values the same within 8 decimals
 )
 {
-    const auto notEqual = [=](const auto& a, const auto& b) -> bool
-    {
-        return
-        (
-            Foam::max(absTol, relTol*Foam::max(Foam::mag(a), Foam::mag(b)))
-          < Foam::mag(a - b)
-        );
-    };
+    Info<< msg << x << "?=" << y << endl;
 
     unsigned nFail = 0;
 
-    if constexpr (is_vectorspace_v<Type>)
+    if (max(absTol, relTol*max(mag(x), mag(y))) < mag(x - y))
     {
-        for (direction i = 0; i < pTraits<Type>::nComponents; ++i)
-        {
-            if (notEqual(x[i], y[i]))
-            {
-                ++nFail;
-            }
-        }
+        ++nFail;
     }
-    else
+
+    if (nFail)
     {
-        if (notEqual(x, y))
+        Info<< nl
+            << "        #### Fail in " << nFail << " comps ####" << nl << endl;
+        ++nFail_;
+    }
+    ++nTest_;
+}
+
+
+// Compare two containers elementwise, and print output.
+// Do ++nFail_ if two components are not equal within a given tolerance.
+// The function is converted from PEP-485
+template<class Type>
+typename std::enable_if<pTraits<Type>::rank != 0, void>::type
+cmp
+(
+    const word& msg,
+    const Type& x,
+    const Type& y,
+    const scalar absTol = 0,
+    const scalar relTol = 1e-8
+)
+{
+    Info<< msg << x << "?=" << y << endl;
+
+    unsigned nFail = 0;
+
+    for (direction i = 0; i < pTraits<Type>::nComponents; ++i)
+    {
+        if (max(absTol, relTol*max(mag(x[i]), mag(y[i]))) < mag(x[i] - y[i]))
         {
             ++nFail;
         }
     }
 
-    Info<< msg << x << "?=" << y << endl;
-
     if (nFail)
     {
         Info<< nl
@@ -572,26 +588,27 @@ void test_eigen_funcs(const symmTensor& T)
 
 // Do compile-time recursion over the given types
 template<std::size_t I = 0, typename... Tp>
-void run_tests(const std::tuple<Tp...>& types, const List<word>& names)
+inline typename std::enable_if<I == sizeof...(Tp), void>::type
+run_tests(const std::tuple<Tp...>& types, const List<word>& typeID){}
+
+
+template<std::size_t I = 0, typename... Tp>
+inline typename std::enable_if<I < sizeof...(Tp), void>::type
+run_tests(const std::tuple<Tp...>& types, const List<word>& typeID)
 {
-    if constexpr (I < sizeof...(Tp))
-    {
-        const auto& name = names[I];
+    Info<< nl << "    ## Test constructors: "<< typeID[I] <<" ##" << nl;
+    test_constructors(std::get<I>(types));
 
-        Info<< nl << "    ## Test constructors: " << name << " ##" << nl;
-        test_constructors(std::get<I>(types));
+    Info<< nl << "    ## Test member functions: "<< typeID[I] <<" ##" << nl;
+    test_member_funcs(std::get<I>(types));
 
-        Info<< nl << "    ## Test member functions: " << name << " ##" << nl;
-        test_member_funcs(std::get<I>(types));
+    Info<< nl << "    ## Test global functions: "<< typeID[I] << " ##" << nl;
+    test_global_funcs(std::get<I>(types));
 
-        Info<< nl << "    ## Test global functions: " << name << " ##" << nl;
-        test_global_funcs(std::get<I>(types));
+    Info<< nl << "    ## Test global operators: "<< typeID[I] <<" ##" << nl;
+    test_global_opers(std::get<I>(types));
 
-        Info<< nl << "    ## Test global operators: " << name << " ##" << nl;
-        test_global_opers(std::get<I>(types));
-
-        run_tests<I + 1, Tp...>(types, names);
-    }
+    run_tests<I + 1, Tp...>(types, typeID);
 }
 
 
@@ -606,8 +623,8 @@ int main()
 
     const List<word> typeID
     ({
-        "SymmTensor<float>",
-        "SymmTensor<double>",
+        "SymmTensor<floatScalar>",
+        "SymmTensor<doubleScalar>",
         "SymmTensor<complex>"
     });
 

applications/test/SymmTensor2D/Test-SymmTensor2D.C

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2019-2025 OpenCFD Ltd.
+    Copyright (C) 2019-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -40,10 +40,11 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#include "complex.H"
 #include "symmTensor2D.H"
 #include "transform.H"
 #include "Random.H"
+#include "scalar.H"
+#include "complex.H"
 
 using namespace Foam;
 
@@ -66,11 +67,45 @@ symmTensor2D makeRandomContainer(Random& rnd)
 }
 
 
+// Compare two floating point types, and print output.
+// Do ++nFail_ if values of two objects are not equal within a given tolerance.
+// The function is converted from PEP-485.
+template<class Type>
+typename std::enable_if<pTraits<Type>::rank == 0, void>::type
+cmp
+(
+    const word& msg,
+    const Type& x,
+    const Type& y,
+    const scalar absTol = 0,     //<! useful for cmps near zero
+    const scalar relTol = 1e-8   //<! are values the same within 8 decimals
+)
+{
+    Info<< msg << x << "?=" << y << endl;
+
+    unsigned nFail = 0;
+
+    if (max(absTol, relTol*max(mag(x), mag(y))) < mag(x - y))
+    {
+        ++nFail;
+    }
+
+    if (nFail)
+    {
+        Info<< nl
+            << "        #### Fail in " << nFail << " comps ####" << nl << endl;
+        ++nFail_;
+    }
+    ++nTest_;
+}
+
+
 // Compare two containers elementwise, and print output.
 // Do ++nFail_ if two components are not equal within a given tolerance.
 // The function is converted from PEP-485
 template<class Type>
-void cmp
+typename std::enable_if<pTraits<Type>::rank != 0, void>::type
+cmp
 (
     const word& msg,
     const Type& x,
@@ -79,37 +114,18 @@ void cmp
     const scalar relTol = 1e-8
 )
 {
-    const auto notEqual = [=](const auto& a, const auto& b) -> bool
-    {
-        return
-        (
-            Foam::max(absTol, relTol*Foam::max(Foam::mag(a), Foam::mag(b)))
-          < Foam::mag(a - b)
-        );
-    };
+    Info<< msg << x << "?=" << y << endl;
 
     unsigned nFail = 0;
 
-    if constexpr (is_vectorspace_v<Type>)
+    for (direction i = 0; i < pTraits<Type>::nComponents; ++i)
     {
-        for (direction i = 0; i < pTraits<Type>::nComponents; ++i)
-        {
-            if (notEqual(x[i], y[i]))
-            {
-                ++nFail;
-            }
-        }
-    }
-    else
-    {
-        if (notEqual(x, y))
+        if (max(absTol, relTol*max(mag(x[i]), mag(y[i]))) < mag(x[i] - y[i]))
         {
             ++nFail;
         }
     }
 
-    Info<< msg << x << "?=" << y << endl;
-
     if (nFail)
     {
         Info<< nl
@@ -522,26 +538,27 @@ void test_eigen_funcs(const symmTensor2D& T)
 
 // Do compile-time recursion over the given types
 template<std::size_t I = 0, typename... Tp>
-void run_tests(const std::tuple<Tp...>& types, const List<word>& names)
+inline typename std::enable_if<I == sizeof...(Tp), void>::type
+run_tests(const std::tuple<Tp...>& types, const List<word>& typeID){}
+
+
+template<std::size_t I = 0, typename... Tp>
+inline typename std::enable_if<I < sizeof...(Tp), void>::type
+run_tests(const std::tuple<Tp...>& types, const List<word>& typeID)
 {
-    if constexpr (I < sizeof...(Tp))
-    {
-        const auto& name = names[I];
+    Info<< nl << "    ## Test constructors: "<< typeID[I] <<" ##" << nl;
+    test_constructors(std::get<I>(types));
 
-        Info<< nl << "    ## Test constructors: " << name << " ##" << nl;
-        test_constructors(std::get<I>(types));
+    Info<< nl << "    ## Test member functions: "<< typeID[I] <<" ##" << nl;
+    test_member_funcs(std::get<I>(types));
 
-        Info<< nl << "    ## Test member functions: " << name << " ##" << nl;
-        test_member_funcs(std::get<I>(types));
+    Info<< nl << "    ## Test global functions: "<< typeID[I] << " ##" << nl;
+    test_global_funcs(std::get<I>(types));
 
-        Info<< nl << "    ## Test global functions: " << name << " ##" << nl;
-        test_global_funcs(std::get<I>(types));
+    Info<< nl << "    ## Test global operators: "<< typeID[I] <<" ##" << nl;
+    test_global_opers(std::get<I>(types));
 
-        Info<< nl << "    ## Test global operators: " << name << " ##" << nl;
-        test_global_opers(std::get<I>(types));
-
-        run_tests<I + 1, Tp...>(types, names);
-    }
+    run_tests<I + 1, Tp...>(types, typeID);
 }
 
 
@@ -556,8 +573,8 @@ int main(int argc, char *argv[])
 
     const List<word> typeID
     ({
-        "SymmTensor2D<float>",
-        "SymmTensor2D<double>",
+        "SymmTensor2D<floatScalar>",
+        "SymmTensor2D<doubleScalar>",
         "SymmTensor2D<complex>"
     });
 

applications/test/Tensor/Test-Tensor.C

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2018 OpenFOAM Foundation
-    Copyright (C) 2019-2025 OpenCFD Ltd.
+    Copyright (C) 2019-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -41,10 +41,11 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#include "complex.H"
 #include "tensor.H"
 #include "transform.H"
 #include "Random.H"
+#include "scalar.H"
+#include "complex.H"
 
 using namespace Foam;
 
@@ -67,11 +68,45 @@ tensor makeRandomContainer(Random& rnd)
 }
 
 
+// Compare two floating point types, and print output.
+// Do ++nFail_ if values of two objects are not equal within a given tolerance.
+// The function is converted from PEP-485.
+template<class Type>
+typename std::enable_if<pTraits<Type>::rank == 0, void>::type
+cmp
+(
+    const word& msg,
+    const Type& x,
+    const Type& y,
+    const scalar absTol = 0,     //<! useful for cmps near zero
+    const scalar relTol = 1e-8   //<! are values the same within 8 decimals
+)
+{
+    Info<< msg << x << "?=" << y << endl;
+
+    unsigned nFail = 0;
+
+    if (max(absTol, relTol*max(mag(x), mag(y))) < mag(x - y))
+    {
+        ++nFail;
+    }
+
+    if (nFail)
+    {
+        Info<< nl
+            << "        #### Fail in " << nFail << " comps ####" << nl << endl;
+        ++nFail_;
+    }
+    ++nTest_;
+}
+
+
 // Compare two containers elementwise, and print output.
 // Do ++nFail_ if two components are not equal within a given tolerance.
 // The function is converted from PEP-485
 template<class Type>
-void cmp
+typename std::enable_if<pTraits<Type>::rank != 0, void>::type
+cmp
 (
     const word& msg,
     const Type& x,
@@ -80,37 +115,18 @@ void cmp
     const scalar relTol = 1e-8
 )
 {
-    const auto notEqual = [=](const auto& a, const auto& b) -> bool
-    {
-        return
-        (
-            Foam::max(absTol, relTol*Foam::max(Foam::mag(a), Foam::mag(b)))
-          < Foam::mag(a - b)
-        );
-    };
+    Info<< msg << x << "?=" << y << endl;
 
     unsigned nFail = 0;
 
-    if constexpr (is_vectorspace_v<Type>)
+    for (direction i = 0; i < pTraits<Type>::nComponents; ++i)
     {
-        for (direction i = 0; i < pTraits<Type>::nComponents; ++i)
-        {
-            if (notEqual(x[i], y[i]))
-            {
-                ++nFail;
-            }
-        }
-    }
-    else
-    {
-        if (notEqual(x, y))
+        if (max(absTol, relTol*max(mag(x[i]), mag(y[i]))) < mag(x[i] - y[i]))
         {
             ++nFail;
         }
     }
 
-    Info<< msg << x << "?=" << y << endl;
-
     if (nFail)
     {
         Info<< nl
@@ -971,26 +987,27 @@ void test_eigen_funcs(const tensor& T, const bool prod = true)
 
 // Do compile-time recursion over the given types
 template<std::size_t I = 0, typename... Tp>
-void run_tests(const std::tuple<Tp...>& types, const List<word>& names)
+inline typename std::enable_if<I == sizeof...(Tp), void>::type
+run_tests(const std::tuple<Tp...>& types, const List<word>& typeID){}
+
+
+template<std::size_t I = 0, typename... Tp>
+inline typename std::enable_if<I < sizeof...(Tp), void>::type
+run_tests(const std::tuple<Tp...>& types, const List<word>& typeID)
 {
-    if constexpr (I < sizeof...(Tp))
-    {
-        const auto& name = names;
+    Info<< nl << "    ## Test constructors: "<< typeID[I] <<" ##" << nl;
+    test_constructors(std::get<I>(types));
 
-        Info<< nl << "    ## Test constructors: " << name << " ##" << nl;
-        test_constructors(std::get<I>(types));
+    Info<< nl << "    ## Test member functions: "<< typeID[I] <<" ##" << nl;
+    test_member_funcs(std::get<I>(types));
 
-        Info<< nl << "    ## Test member functions: " << name << " ##" << nl;
-        test_member_funcs(std::get<I>(types));
+    Info<< nl << "    ## Test global functions: "<< typeID[I] << " ##" << nl;
+    test_global_funcs(std::get<I>(types));
 
-        Info<< nl << "    ## Test global functions: " << name <<" ##" << nl;
-        test_global_funcs(std::get<I>(types));
+    Info<< nl << "    ## Test global operators: "<< typeID[I] <<" ##" << nl;
+    test_global_opers(std::get<I>(types));
 
-        Info<< nl << "    ## Test global operators: " << name <<" ##" << nl;
-        test_global_opers(std::get<I>(types));
-
-        run_tests<I + 1, Tp...>(types, names);
-    }
+    run_tests<I + 1, Tp...>(types, typeID);
 }
 
 
@@ -1005,8 +1022,8 @@ int main()
 
     const List<word> typeID
     ({
-        "Tensor<float>",
-        "Tensor<double>",
+        "Tensor<floatScalar>",
+        "Tensor<doubleScalar>",
         "Tensor<complex>"
     });
 

applications/test/Tensor2D/Test-Tensor2D.C

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2014 OpenFOAM Foundation
-    Copyright (C) 2019-2025 OpenCFD Ltd.
+    Copyright (C) 2019-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -41,13 +41,13 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#include "scalar.H"
-#include "complex.H"
 #include "vector2DField.H"
 #include "tensor2D.H"
 #include "symmTensor2D.H"
 #include "transform.H"
 #include "Random.H"
+#include "scalar.H"
+#include "complex.H"
 
 using namespace Foam;
 
@@ -70,11 +70,12 @@ tensor2D makeRandomContainer(Random& rnd)
 }
 
 
-// Compare two containers elementwise, and print output.
-// Do ++nFail_ if two components are not equal within a given tolerance.
-// The function is converted from PEP-485
+// Compare two floating point types, and print output.
+// Do ++nFail_ if values of two objects are not equal within a given tolerance.
+// The function is converted from PEP-485.
 template<class Type>
-void cmp
+typename std::enable_if<pTraits<Type>::rank == 0, void>::type
+cmp
 (
     const word& msg,
     const Type& x,
@@ -83,37 +84,51 @@ void cmp
     const scalar relTol = 1e-8   //<! are values the same within 8 decimals
 )
 {
-    const auto notEqual = [=](const auto& a, const auto& b) -> bool
-    {
-        return
-        (
-            Foam::max(absTol, relTol*Foam::max(Foam::mag(a), Foam::mag(b)))
-          < Foam::mag(a - b)
-        );
-    };
+    Info<< msg << x << "?=" << y << endl;
 
     unsigned nFail = 0;
 
-    if constexpr (is_vectorspace_v<Type>)
+    if (max(absTol, relTol*max(mag(x), mag(y))) < mag(x - y))
     {
-        for (direction i = 0; i < pTraits<Type>::nComponents; ++i)
-        {
-            if (notEqual(x[i], y[i]))
-            {
-                ++nFail;
-            }
-        }
+        ++nFail;
     }
-    else
+
+    if (nFail)
     {
-        if (notEqual(x, y))
+        Info<< nl
+            << "        #### Fail in " << nFail << " comps ####" << nl << endl;
+        ++nFail_;
+    }
+    ++nTest_;
+}
+
+
+// Compare two containers elementwise, and print output.
+// Do ++nFail_ if two components are not equal within a given tolerance.
+// The function is converted from PEP-485
+template<class Type>
+typename std::enable_if<pTraits<Type>::rank != 0, void>::type
+cmp
+(
+    const word& msg,
+    const Type& x,
+    const Type& y,
+    const scalar absTol = 0,
+    const scalar relTol = 1e-8
+)
+{
+    Info<< msg << x << "?=" << y << endl;
+
+    unsigned nFail = 0;
+
+    for (direction i = 0; i < pTraits<Type>::nComponents; ++i)
+    {
+        if (max(absTol, relTol*max(mag(x[i]), mag(y[i]))) < mag(x[i] - y[i]))
         {
             ++nFail;
         }
     }
 
-    Info<< msg << x << "?=" << y << endl;
-
     if (nFail)
     {
         Info<< nl
@@ -780,26 +795,27 @@ void test_eigen_funcs(const tensor2D& T)
 
 // Do compile-time recursion over the given types
 template<std::size_t I = 0, typename... Tp>
-void run_tests(const std::tuple<Tp...>& types, const List<word>& names)
+inline typename std::enable_if<I == sizeof...(Tp), void>::type
+run_tests(const std::tuple<Tp...>& types, const List<word>& typeID){}
+
+
+template<std::size_t I = 0, typename... Tp>
+inline typename std::enable_if<I < sizeof...(Tp), void>::type
+run_tests(const std::tuple<Tp...>& types, const List<word>& typeID)
 {
-    if constexpr (I < sizeof...(Tp))
-    {
-        const auto& name = names[I];
+    Info<< nl << "    ## Test constructors: "<< typeID[I] <<" ##" << nl;
+    test_constructors(std::get<I>(types));
 
-        Info<< nl << "    ## Test constructors: " << name << " ##" << nl;
-        test_constructors(std::get<I>(types));
+    Info<< nl << "    ## Test member functions: "<< typeID[I] <<" ##" << nl;
+    test_member_funcs(std::get<I>(types));
 
-        Info<< nl << "    ## Test member functions: " << name << " ##" << nl;
-        test_member_funcs(std::get<I>(types));
+    Info<< nl << "    ## Test global functions: "<< typeID[I] << " ##" << nl;
+    test_global_funcs(std::get<I>(types));
 
-        Info<< nl << "    ## Test global functions: " << name << " ##" << nl;
-        test_global_funcs(std::get<I>(types));
+    Info<< nl << "    ## Test global operators: "<< typeID[I] <<" ##" << nl;
+    test_global_opers(std::get<I>(types));
 
-        Info<< nl << "    ## Test global operators: " << name << " ##" << nl;
-        test_global_opers(std::get<I>(types));
-
-        run_tests<I + 1, Tp...>(types, names);
-    }
+    run_tests<I + 1, Tp...>(types, typeID);
 }
 
 
@@ -815,8 +831,8 @@ int main(int argc, char *argv[])
 
     const List<word> typeID
     ({
-        "Tensor2D<float>",
-        "Tensor2D<double>",
+        "Tensor2D<floatScalar>",
+        "Tensor2D<doubleScalar>",
         "Tensor2D<complex>"
     });
 

applications/test/TestTools/TestTools.H

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2020-2025 OpenCFD Ltd.
+    Copyright (C) 2020-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -67,9 +67,13 @@ doubleScalar getTol(complex)
 }
 
 
-// Create a random Matrix (real or complex)
+// Create a non-complex random Matrix.
 template<class MatrixType>
-MatrixType makeRandomMatrix
+typename std::enable_if
+<
+    !std::is_same<complex, typename MatrixType::cmptType>:: value,
+    MatrixType
+>::type makeRandomMatrix
 (
     const labelPair& dims,
     Random& rndGen
@@ -77,22 +81,34 @@ MatrixType makeRandomMatrix
 {
     MatrixType mat(dims);
 
-    if constexpr (std::is_same_v<complex, typename MatrixType::cmptType>)
+    std::generate
+    (
+        mat.begin(),
+        mat.end(),
+        [&]{return rndGen.GaussNormal<scalar>();}
+    );
+
+    return mat;
+}
+
+
+// Create a complex random Matrix.
+template<class MatrixType>
+typename std::enable_if
+<
+    std::is_same<complex, typename MatrixType::cmptType>:: value,
+    MatrixType
+>::type makeRandomMatrix
+(
+    const labelPair& dims,
+    Random& rndGen
+)
+{
+    MatrixType mat(dims);
+
+    for (auto& x : mat)
     {
-        for (auto& x : mat)
-        {
-            x.real(rndGen.GaussNormal<scalar>());
-            x.imag(rndGen.GaussNormal<scalar>());
-        }
-    }
-    else
-    {
-        std::generate
-        (
-            mat.begin(),
-            mat.end(),
-            [&]{ return rndGen.GaussNormal<scalar>(); }
-        );
+        x = complex(rndGen.GaussNormal<scalar>(), rndGen.GaussNormal<scalar>());
     }
 
     return mat;
@@ -163,57 +179,128 @@ List<Type> flt
 }
 
 
-// Compare two values or two containers (elementwise), and print output.
+// Compare two floating point types, and print output.
 // Do ++nFail_ if values of two objects are not equal within a given tolerance.
 // The function is converted from PEP-485.
-template<class Type1, class Type2 = Type1>
-void cmp
+template<class Type>
+typename std::enable_if
+<
+    std::is_same<floatScalar, Type>::value ||
+    std::is_same<doubleScalar, Type>::value ||
+    std::is_same<complex, Type>::value,
+    void
+>::type cmp
 (
     const word& msg,
-    const Type1& x,
-    const Type2& y,
+    const Type& x,
+    const Type& y,
     const scalar absTol = 0,    //<! useful for cmps near zero
     const scalar relTol = 1e-8, //<! are values the same within 8 decimals
     const bool verbose = false
 )
 {
-    const auto notEqual = [=](const auto& a, const auto& b) -> bool
+    if (verbose)
     {
-        return
-        (
-            Foam::max(absTol, relTol*Foam::max(Foam::mag(a), Foam::mag(b)))
-          < Foam::mag(a - b)
-        );
-    };
+        Info<< msg << x << "?=" << y << endl;
+    }
 
     unsigned nFail = 0;
 
-    if constexpr
-    (
-        std::is_floating_point_v<Type1> || std::is_same_v<complex, Type1>
-    )
+    if (max(absTol, relTol*max(mag(x), mag(y))) < mag(x - y))
     {
-        if (notEqual(x, y))
+        ++nFail;
+    }
+
+    if (nFail)
+    {
+        Info<< nl
+            << "        #### Fail in " << nFail << " comps ####" << nl << endl;
+        ++nFail_;
+    }
+    ++nTest_;
+}
+
+
+// Compare two containers elementwise, and print output.
+// Do ++nFail_ if two components are not equal within a given tolerance.
+// The function is converted from PEP-485
+template<class Type>
+typename std::enable_if
+<
+    !std::is_same<floatScalar, Type>::value &&
+    !std::is_same<doubleScalar, Type>::value &&
+    !std::is_same<complex, Type>::value,
+    void
+>::type cmp
+(
+    const word& msg,
+    const Type& x,
+    const Type& y,
+    const scalar absTol = 0,
+    const scalar relTol = 1e-8,
+    const bool verbose = false
+)
+{
+    if (verbose)
+    {
+        Info<< msg << x << "?=" << y << endl;
+    }
+
+    unsigned nFail = 0;
+
+    for (label i = 0; i < x.size(); ++i)
+    {
+        if (max(absTol, relTol*max(mag(x[i]), mag(y[i]))) < mag(x[i] - y[i]))
         {
             ++nFail;
         }
     }
-    else
-    {
-        for (label i = 0; i < x.size(); ++i)
-        {
-            if (notEqual(x[i], y[i]))
-            {
-                ++nFail;
-            }
-        }
-    }
 
+    if (nFail)
+    {
+        Info<< nl
+            << "        #### Fail in " << nFail << " comps ####" << nl << endl;
+        ++nFail_;
+    }
+    ++nTest_;
+}
+
+
+// Compare two containers elementwise, and print output.
+// Do ++nFail_ if two components are not equal within a given tolerance.
+// The function is converted from PEP-485
+template<class Type1, class Type2>
+typename std::enable_if
+<
+    !std::is_same<floatScalar, Type1>::value &&
+    !std::is_same<doubleScalar, Type1>::value &&
+    !std::is_same<complex, Type1>::value,
+    void
+>::type cmp
+(
+    const word& msg,
+    const Type1& x,
+    const Type2& y,
+    const scalar absTol = 0,
+    const scalar relTol = 1e-8,
+    const bool verbose = false
+)
+{
     if (verbose)
     {
         Info<< msg << x << "?=" << y << endl;
     }
 
+    unsigned nFail = 0;
+
+    for (label i = 0; i < x.size(); ++i)
+    {
+        if (max(absTol, relTol*max(mag(x[i]), mag(y[i]))) < mag(x[i] - y[i]))
+        {
+            ++nFail;
+        }
+    }
+
     if (nFail)
     {
         Info<< nl
@@ -234,6 +321,11 @@ void cmp
     const bool verbose = false
 )
 {
+    if (verbose)
+    {
+        Info<< msg << x << "?=" << y << endl;
+    }
+
     unsigned nFail = 0;
 
     if (x != y)
@@ -241,11 +333,6 @@ void cmp
         ++nFail;
     }
 
-    if (verbose)
-    {
-        Info<< msg << x << "?=" << y << endl;
-    }
-
     if (nFail)
     {
         Info<< nl

applications/test/Tuple2/Make/files

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

applications/test/Tuple2/Test-Tuple2.C

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
-    Copyright (C) 2019-2025 OpenCFD Ltd.
+    Copyright (C) 2019-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -32,7 +32,6 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#include "argList.H"
 #include "labelPair.H"
 #include "Tuple2.H"
 #include "label.H"
@@ -103,12 +102,8 @@ void printTuple2(const Pair<word>& t)
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 // Main program:
 
-int main(int argc, char *argv[])
+int main()
 {
-    argList::noCheckProcessorDirectories();
-
-    #include "setRootCase.H"
-
     typedef Tuple2<label, scalar> indexedScalar;
 
     Info<< "Default constructed Tuple: " << indexedScalar() << nl;

applications/test/UPstreamTraits/Make/files

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

applications/test/UPstreamTraits/Make/options

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

applications/test/UPstreamTraits/Test-UPstreamTraits.cxx

@@ -1,267 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  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
-    Simple compilation tests and access for UPstream types
-
-\*---------------------------------------------------------------------------*/
-
-#include "pTraits.H"
-#include "contiguous.H"
-#include "FixedList.H"
-#include "boolVector.H"  // A FixedList pretending to be a vector
-#include "barycentric.H"
-#include "complex.H"
-#include "vector.H"
-#include "tensor.H"
-#include "uLabel.H"
-#include "Switch.H"
-#include "IOstreams.H"
-#include "UPstream.H"
-
-#include <type_traits>
-
-using namespace Foam;
-
-// Just for debugging
-const List<std::string> dataType_names
-({
-    "byte",
-    "int32",
-    "int64",
-    "uint32",
-    "uint64",
-    "float",
-    "double",
-    "long_double",
-
-    "float(2)",
-    "double(2)",
-    "float(3)",
-    "double(3)",
-    "float(6)",
-    "double(6)",
-    "float(9)",
-    "double(9)"
-});
-
-//- Test for pTraits typeName member : default is false
-template<class T, class = void>
-struct check_has_typeName : std::false_type {};
-
-//- Test for pTraits zero
-template<class T>
-struct check_has_typeName
-<
-    T,
-    std::void_t<decltype(pTraits<std::remove_cv_t<T>>::typeName)>
->
-:
-    std::true_type
-{};
-
-
-// Possible future change...
-// //- A supported UPstream data type (intrinsic or user-defined)
-// template<>
-// struct UPstream_base_dataType<complex> : std::true_type
-// {
-//     static constexpr auto datatype_id = []()
-//     {
-//         if constexpr (sizeof(complex) == 2*sizeof(float))
-//             return UPstream::dataTypes::type_2float;
-//         else
-//             return UPstream::dataTypes::type_2double;
-//     }();
-// };
-
-
-template<class T>
-void printTypeName(const bool showSize = false)
-{
-    // Both float and double have pTraits typeName = "scalar"!
-    if constexpr (std::is_same_v<float, std::remove_cv_t<T>>)
-    {
-        Info<< "<float>";
-    }
-    else if constexpr (std::is_same_v<double, std::remove_cv_t<T>>)
-    {
-        Info<< "<double>";
-    }
-    else if constexpr (check_has_typeName<T>::value)
-    {
-        Info<< pTraits<std::remove_cv_t<T>>::typeName;
-    }
-    else
-    {
-        Info<< typeid(T).name();
-    }
-    if (showSize)
-    {
-        Info<< " (" << sizeof(T) << " bytes)";
-    }
-}
-
-template<class Type, bool UseTypeName = true>
-void printPstreamTraits(const std::string_view name = std::string_view())
-{
-    Info<< "========" << nl;
-    Info<< "type: ";
-    if (!name.empty())
-    {
-        Info<< name << ' ';
-    }
-    if constexpr (UseTypeName)
-    {
-        printTypeName<Type>(true);
-    }
-    else
-    {
-        Info<< typeid(Type).name();
-        Info<< " (" << sizeof(Type) << " bytes)";
-    }
-
-    Info<< ", cmpt:";
-    printTypeName<typename Foam::pTraits_cmptType<Type>::type>(true);
-
-    Info<< nl
-        << "  is_contiguous:"
-        << is_contiguous<Type>::value
-        << ", is base:"
-        << UPstream_base_dataType<Type>::value
-        << ", is cmpt:"
-        << UPstream_dataType<Type>::value << nl;
-
-    Info<< "is base:"
-        << UPstream_base_dataType<Type>::value
-        << " (type:" << int(UPstream_base_dataType<Type>::datatype_id)
-        << ")  is alias:" << UPstream_alias_dataType<Type>::value
-        << " (type:" << int(UPstream_alias_dataType<Type>::datatype_id)
-        << ")" << nl;
-
-
-    {
-        int index = int(UPstream_base_dataType<Type>::datatype_id);
-        Info<< "datatype: " << index;
-
-        if (index < dataType_names.size())
-        {
-            Info<< ' ' << dataType_names[index];
-        }
-        Info<< nl;
-    }
-
-    {
-        // Use element or component type (or byte-wise) for data type
-        using base = typename UPstream_dataType<Type>::base;
-        constexpr auto datatype = UPstream_dataType<Type>::datatype_id;
-
-        Info<< "datatype => ";
-        printTypeName<base>();
-        Info<< " (" << sizeof(Type)/sizeof(base) << " elems)" << nl
-            << "datatype: " << static_cast<int>(datatype) << nl;
-    }
-}
-
-
-template<class BinaryOp>
-void printOpCodeTraits(BinaryOp bop, std::string_view name)
-{
-    Info<< "op: " << name << ' ';
-    if constexpr (UPstream_opType<BinaryOp>::value)
-    {
-        Info<< "supported";
-    }
-    else
-    {
-        Info<< "unknown";
-    }
-    Info<< ": " << int(UPstream_opType<BinaryOp>::opcode_id) << nl;
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// Main program:
-
-int main()
-{
-    printPstreamTraits<bool>();
-    printPstreamTraits<label>();
-
-    printPstreamTraits<int>("<int>");
-    printPstreamTraits<long>("<long>");
-    printPstreamTraits<unsigned>("<unsigned>");
-    printPstreamTraits<unsigned int>("<unsigned int>");
-    printPstreamTraits<unsigned long>("<long long>");
-
-    printPstreamTraits<const float>();
-    printPstreamTraits<floatVector>();
-
-    printPstreamTraits<scalar>();
-    printPstreamTraits<double>();
-    printPstreamTraits<doubleVector>();
-
-    // Avoid typeName for barycentric. It is declared, but not defined
-    printPstreamTraits<barycentric, false>("barycentric");
-
-    printPstreamTraits<complex>();     // Uses specialized pTraits_...
-
-    printPstreamTraits<boolVector>();  // Uses specialized pTraits_...
-    printPstreamTraits<floatVector>();
-    printPstreamTraits<doubleVector>();
-    printPstreamTraits<tensor>();
-    printPstreamTraits<word>();
-    printPstreamTraits<std::string>();
-
-    // This will not identify properly at the moment...
-    printPstreamTraits<FixedList<doubleVector, 4>>();
-    printPstreamTraits<labelPair>();
-
-    Info<< nl
-        << "========" << nl
-        << "Mapping of binary reduction ops" << nl;
-
-    printOpCodeTraits(minOp<scalar>{}, "min");
-    printOpCodeTraits(maxOp<vector>{}, "max");
-    printOpCodeTraits(sumOp<vector>{}, "sum");
-    printOpCodeTraits(plusOp<vector>{}, "plus");
-    printOpCodeTraits(multiplyOp<scalar>{}, "multiply");
-    printOpCodeTraits(divideOp<vector>{}, "divide");
-    printOpCodeTraits(minMagSqrOp<vector>{}, "minMagSqr");
-
-    printOpCodeTraits(bitAndOp<vector>{}, "bitAnd<vector>");
-    printOpCodeTraits(bitOrOp<vector>{}, "bitOr<vector>");
-
-    printOpCodeTraits(bitOrOp<float>{}, "bitOr<float>");
-    printOpCodeTraits(bitAndOp<unsigned>{}, "bitAnd<unsigned>");
-    printOpCodeTraits(bitOrOp<unsigned>{}, "bitOr<unsigned>");
-
-    Info<< nl << "End\n" << endl;
-
-    return 0;
-}
-
-
-// ************************************************************************* //

applications/test/argList/Test-argList.C

@@ -123,12 +123,15 @@ int main(int argc, char *argv[])
     argList::addDryRunOption("Just for testing");
     argList::addVerboseOption("Increase verbosity");
 
+    // Check -verbose before initialisation
+    UPstream::debug = argList::verbose(argc, argv);
+
     #include "setRootCase.H"
 
     Pout<< "command-line ("
         << args.options().size() << " options, "
         << args.args().size() << " args)" << nl
-        << "    " << args.commandLine().data() << nl << nl;
+        << "    " << args.commandLine().c_str() << nl << nl;
 
     Pout<< "rootPath:   " << args.rootPath() << nl
         << "globalCase: " << args.globalCaseName() << nl

applications/test/boolVector/Test-boolVector.C

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2020-2025 OpenCFD Ltd.
+    Copyright (C) 2020-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -54,7 +54,7 @@ int main(int argc, char *argv[])
 {
     Info<< "boolVector" << nl
         << "  size = " << boolVector::size() << nl
-        << "  contiguous = " << is_contiguous_v<boolVector> << nl
+        << "  contiguous = " << is_contiguous<boolVector>::value << nl
         << nl;
 
     {

applications/test/codeStream/codeStreamDict1

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

applications/test/compoundToken1/testDict1

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

applications/test/contiguous/Test-contiguous.C

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018-2025 OpenCFD Ltd.
+    Copyright (C) 2018-2019 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -72,14 +72,13 @@ void printInfo(const char* const name = nullptr)
         Info<< name;
     }
 
-    Info<< " contiguous=" <<  Switch(is_contiguous<T>::value)
-        << " / " <<  Switch(is_contiguous_v<T>);
+    Info<< " contiguous=" <<  Switch(is_contiguous<T>::value);
 
-    if constexpr (is_contiguous_label<T>::value)
+    if (is_contiguous_label<T>::value)
     {
         Info<< " label";
     }
-    if constexpr (is_contiguous_scalar<T>::value)
+    if (is_contiguous_scalar<T>::value)
     {
         Info<< " scalar";
     }
@@ -97,11 +96,10 @@ int main(int argc, char *argv[])
     argList::noParallel();
     argList::noFunctionObjects();
 
-    printInfo<label>();
     printInfo<label>();
     printInfo<double>();
     printInfo<FixedList<double, 4>>();
-    printInfo<const Pair<long>>();
+    printInfo<Pair<long>>();
 
     printInfo<FixedList<word, 2>>();
     printInfo<Pair<word>>();

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:  v2406                                 |
 |   \\  /    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:  v2406                                 |
 |   \\  /    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:  v2406                                 |
 |   \\  /    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:  v2406                                 |
 |   \\  /    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:  v2406                                 |
 |   \\  /    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:  v2406                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/

applications/test/dictionary/blockMeshDict1.calc

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

applications/test/dictionaryCopy/testDictCopy

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

applications/test/exprValue1/Test-exprValue1.cxx

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2021-2025 OpenCFD Ltd.
+    Copyright (C) 2021-2024 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
@@ -122,7 +122,7 @@ int main(int argc, char *argv[])
     // Regular broadcast doesn't work
     Info<< "exprValue"
         << " sizeof:" << sizeof(expressions::exprValue)
-        << " contiguous:" << is_contiguous_v<expressions::exprValue>
+        << " contiguous:" << is_contiguous<expressions::exprValue>::value
         << nl << nl;
 
     {

applications/test/extendedStencil/Make/options

@@ -3,5 +3,4 @@ EXE_INC = \
     -I$(LIB_SRC)/meshTools/lnInclude
 
 EXE_LIBS = \
-    -lfiniteVolume \
-    -lmeshTools
+    -lfiniteVolume

applications/test/fieldDependency/Make/options

@@ -3,5 +3,4 @@ EXE_INC = \
     -I$(LIB_SRC)/meshTools/lnInclude
 
 EXE_LIBS = \
-    -lfiniteVolume \
-    -lmeshTools
+    -lfiniteVolume

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:  v2406                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/

applications/test/fieldMapping/pipe1D/constant/transportProperties

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

applications/test/fieldMapping/pipe1D/system/blockMeshDict

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

applications/test/fieldMapping/pipe1D/system/controlDict

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

applications/test/fieldMapping/pipe1D/system/fvSchemes

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

applications/test/fieldMapping/pipe1D/system/fvSolution

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

applications/test/fileOperation1/Test-fileOperation1.C

@@ -48,7 +48,7 @@ word toString(const fileOperation::procRangeType& group)
     {
         return word::null;
     }
-    return Foam::name(group.min()) + "-" + Foam::name(group.max());
+    return Foam::name(group.first()) + "-" + Foam::name(group.last());
 }
 
 

applications/test/globalIndex3/Make/files

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

applications/test/globalIndex3/Make/options

@@ -1,4 +0,0 @@
-include $(GENERAL_RULES)/mpi-rules
-
-EXE_INC = $(PFLAGS) $(PINC)
-EXE_LIBS = $(PLIBS)

applications/test/globalIndex3/Test-globalIndex3.cxx

@@ -1,578 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  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/>.
-
-Application
-    Test-globalIndex3
-
-Description
-    Tests for globalIndex with node-wise splitting
-
-\*---------------------------------------------------------------------------*/
-
-#include "globalIndex.H"
-#include "globalMeshData.H"
-#include "argList.H"
-#include "Time.H"
-#include "polyMesh.H"
-#include "IndirectList.H"
-#include "IOstreams.H"
-#include "Random.H"
-#include "openfoam_mpi.H"
-
-// pre-scan for "-split-size NUM"
-int option_splitsize(int argc, char *argv[])
-{
-    int ivalue = -1;
-    for (int argi = 1; argi < argc-1; ++argi)
-    {
-        if (strcmp(argv[argi], "-split-size") == 0)
-        {
-            ++argi;
-            ivalue = atoi(argv[argi]);
-        }
-    }
-
-    return ivalue;
-}
-
-using namespace Foam;
-
-template<class T>
-void printList(Ostream& os, const UList<T>& list)
-{
-    os << list.size() << " " << flatOutput(list) << nl;
-}
-
-void printGlobalIndex(Ostream& os, const globalIndex& gi)
-{
-    printList(os, gi.offsets());
-}
-
-
-template<class ProcIDsContainer, class Type>
-void globalIndexGather
-(
-    const labelUList& off,  // needed on master only
-    const label comm,
-    const ProcIDsContainer& procIDs,
-    const UList<Type>& fld,
-    UList<Type>& allFld,    // must be adequately sized on master
-    const int tag,
-    UPstream::commsTypes commsType,
-    bool useWindow = false
-)
-{
-    // low-level: no parRun guard
-    const int masterProci = procIDs.size() ? procIDs[0] : 0;
-
-    // Protection for disjoint calls
-    if (FOAM_UNLIKELY(!UPstream::is_rank(comm)))
-    {
-        FatalErrorInFunction
-            << "Calling with process not on the communicator"
-            << Foam::abort(FatalError);
-    }
-
-    // Require contiguous data for non-blocking
-    if constexpr (!is_contiguous_v<Type>)
-    {
-        if (commsType == UPstream::commsTypes::nonBlocking)
-        {
-            commsType = UPstream::commsTypes::scheduled;
-        }
-    }
-
-    const label startOfRequests = UPstream::nRequests();
-
-
-    // Very hard-coded at the moment
-    int returnCode = MPI_SUCCESS;
-    const int nCmpts = pTraits<Type>::nComponents;
-
-    MPI_Win win;
-    MPI_Datatype dataType = MPI_DOUBLE;
-    if (useWindow)
-    {
-        using cmptType = typename pTraits<Type>::cmptType;
-
-        if (std::is_same<float, cmptType>::value)
-        {
-            dataType = MPI_FLOAT;
-        }
-        else if (std::is_same<double, cmptType>::value)
-        {
-            dataType = MPI_DOUBLE;
-        }
-        else
-        {
-            // Not supported
-            useWindow = false;
-        }
-    }
-
-    if (useWindow)
-    {
-        MPI_Comm mpiComm =
-            PstreamUtils::Cast::to_mpi(UPstream::Communicator::lookup(comm));
-
-        char commName[MPI_MAX_OBJECT_NAME];
-        int nameLen = 0;
-
-        if
-        (
-            MPI_COMM_NULL != mpiComm
-         && MPI_SUCCESS == MPI_Comm_get_name(mpiComm, commName, &nameLen)
-         && (nameLen > 0)
-        )
-        {
-            Pout<< "window on " << commName << nl;
-        }
-
-        if (UPstream::myProcNo(comm) == masterProci || fld.empty())
-        {
-            // Collective
-            returnCode = MPI_Win_create
-            (
-                nullptr,
-                0,
-                1,  // disp_units
-                MPI_INFO_NULL,
-                mpiComm,
-               &win
-            );
-        }
-        else
-        {
-            // Collective
-            returnCode = MPI_Win_create
-            (
-                const_cast<char *>(fld.cdata_bytes()),
-                fld.size_bytes(),
-                sizeof(Type),  // disp_units
-                MPI_INFO_NULL,
-                mpiComm,
-               &win
-            );
-        }
-
-        if (MPI_SUCCESS != returnCode || MPI_WIN_NULL == win)
-        {
-            FatalErrorInFunction
-                << "MPI_Win_create() failed"
-                << Foam::abort(FatalError);
-            // return nullptr;
-        }
-    }
-
-
-    if (UPstream::myProcNo(comm) == masterProci)
-    {
-        const label total = off.back();  // == totalSize()
-
-        if (allFld.size() < total)
-        {
-            FatalErrorInFunction
-                << "[out] UList size=" << allFld.size()
-                << " too small to receive " << total << nl
-                << Foam::abort(FatalError);
-        }
-
-
-        // Assign my local data - respect offset information
-        // so that we can request 0 entries to be copied.
-        // Also handle the case where we have a slice of the full
-        // list.
-        {
-            SubList<Type> dst(allFld, off[1]-off[0], off[0]);
-            SubList<Type> src(fld, off[1]-off[0]);
-
-            if (!dst.empty() && (dst.data() != src.data()))
-            {
-                dst = src;
-            }
-        }
-
-        if (useWindow)
-        {
-            MPI_Win_lock_all(MPI_MODE_NOCHECK, win);
-        }
-
-        for (label i = 1; i < procIDs.size(); ++i)
-        {
-            SubList<Type> slot(allFld, off[i+1]-off[i], off[i]);
-
-            if (slot.empty())
-            {
-                // Nothing to do
-            }
-            else if (useWindow)
-            {
-                returnCode = MPI_Get
-                (
-                    // origin
-                    slot.data(),
-                    slot.size()*(nCmpts),
-                    dataType,
-
-                    // target
-                    procIDs[i],
-                    0,  // displacement
-                    slot.size()*(nCmpts),
-                    dataType,
-                    win
-                );
-
-                if (MPI_SUCCESS != returnCode)
-                {
-                    FatalErrorInFunction
-                        << "MPI_Get failed"
-                        << Foam::abort(FatalError);
-                    // return nullptr;
-                }
-            }
-            else if constexpr (is_contiguous_v<Type>)
-            {
-                UIPstream::read
-                (
-                    commsType,
-                    procIDs[i],
-                    slot,
-                    tag,
-                    comm
-                );
-            }
-            else
-            {
-                IPstream::recv(slot, procIDs[i], tag, comm);
-            }
-        }
-
-        if (useWindow)
-        {
-            MPI_Win_unlock_all(win);
-        }
-    }
-    else if (!useWindow)
-    {
-        if (fld.empty())
-        {
-            // Nothing to do
-        }
-        else if constexpr (is_contiguous_v<Type>)
-        {
-            UOPstream::write
-            (
-                commsType,
-                masterProci,
-                fld,
-                tag,
-                comm
-            );
-        }
-        else
-        {
-            OPstream::send(fld, commsType, masterProci, tag, comm);
-        }
-    }
-
-    if (useWindow)
-    {
-        // Collective
-        MPI_Win_free(&win);
-    }
-
-    if (commsType == UPstream::commsTypes::nonBlocking)
-    {
-        // Wait for outstanding requests
-        UPstream::waitRequests(startOfRequests);
-    }
-}
-
-
-// Report inter-node/intra-node offsets
-static void reportOffsets(const globalIndex& gi)
-{
-    labelList interNodeOffsets;
-    labelList localNodeOffsets;
-    labelRange nodeRange;
-
-    const label numProc = UPstream::nProcs(UPstream::commConstWorld());
-
-    gi.splitNodeOffsets
-    (
-        interNodeOffsets,
-        localNodeOffsets,
-        UPstream::worldComm
-    );
-
-    const auto interNodeComm = UPstream::commInterNode();
-
-    // Only communicate to the node leaders
-    labelList allOffsets;
-    if (UPstream::is_rank(interNodeComm))
-    {
-        // Send top-level offsets to the node leaders
-        if (UPstream::master(interNodeComm))
-        {
-            allOffsets = gi.offsets();
-        }
-        else  // ie, UPstream::is_subrank(interNodeComm)
-        {
-            allOffsets.resize_nocopy(numProc+1);
-        }
-
-        UPstream::broadcast
-        (
-            allOffsets.data_bytes(),
-            allOffsets.size_bytes(),
-            interNodeComm
-        );
-    }
-
-    // Ranges (node leaders only)
-    if (UPstream::is_rank(interNodeComm))
-    {
-        const auto& procIds = UPstream::procID(interNodeComm);
-        const int ranki = UPstream::myProcNo(interNodeComm);
-
-        // For reporting
-        nodeRange.reset
-        (
-            procIds[ranki],
-            (
-                (ranki+1 < procIds.size() ? procIds[ranki+1] : numProc)
-              - procIds[ranki]
-            )
-        );
-    }
-
-    Pout<< "node-range: " << nodeRange << nl;
-    Pout<< "all-offset: "; printList(Pout, allOffsets);
-    Pout<< "inter-offset: "; printList(Pout, interNodeOffsets);
-    Pout<< "intra-offset: "; printList(Pout, localNodeOffsets);
-}
-
-
-template<class Type>
-void globalIndexGather
-(
-    const globalIndex& gi,
-    const UList<Type>& sendData,
-    List<Type>& allData,
-    const int tag,
-    const UPstream::commsTypes commsType,
-    const label comm = UPstream::worldComm,
-    bool useWindow = false
-)
-{
-    if (!UPstream::parRun())
-    {
-        // Serial: direct copy
-        allData = sendData;
-        return;
-    }
-
-    if (UPstream::master(comm))
-    {
-        allData.resize_nocopy(gi.offsets().back());  // == totalSize()
-    }
-    else
-    {
-        allData.clear();  // zero-size on non-master
-    }
-
-
-    const auto& offsets = gi.offsets();  // needed on master only
-
-    Info<< "Using node-comms: " << UPstream::usingNodeComms(comm) << nl;
-
-    const auto interNodeComm = UPstream::commInterNode();
-    const auto localNodeComm = UPstream::commLocalNode();
-
-    if (UPstream::usingNodeComms(comm))
-    {
-        // Stage 0 : The inter-node/intra-node offsets
-        labelList interNodeOffsets;
-        labelList localNodeOffsets;
-
-        gi.splitNodeOffsets(interNodeOffsets, localNodeOffsets, comm);
-
-        // The first node re-uses the output (allData) when collecting
-        // content. All other nodes require temporary node-local storage.
-
-        List<Type> tmpNodeData;
-        if (UPstream::is_subrank(interNodeComm))
-        {
-            tmpNodeData.resize(localNodeOffsets.back());
-        }
-
-        List<Type>& nodeData =
-        (
-            UPstream::master(interNodeComm) ? allData : tmpNodeData
-        );
-
-
-        // Stage 1 : Gather data within the node
-        {
-            globalIndexGather
-            (
-                localNodeOffsets,  // (master only)
-                localNodeComm,
-                UPstream::allProcs(localNodeComm),
-                sendData,
-                nodeData,
-                tag,
-                commsType,
-                useWindow
-            );
-        }
-
-        // Stage 2 : Gather data between nodes
-        if (UPstream::is_rank(interNodeComm))
-        {
-            globalIndexGather
-            (
-                interNodeOffsets,  // (master only)
-                interNodeComm,
-                UPstream::allProcs(interNodeComm),
-                nodeData,
-                allData,
-                tag,
-                commsType,
-                useWindow
-            );
-        }
-    }
-    else
-    {
-        globalIndexGather
-        (
-            offsets,  // needed on master only
-            comm,
-            UPstream::allProcs(comm),   // All communicator ranks
-            sendData,
-            allData,
-            tag,
-            commsType,
-            useWindow
-        );
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-//  Main program:
-
-int main(int argc, char *argv[])
-{
-    argList::noCheckProcessorDirectories();
-    argList::addVerboseOption("Set UPstream::debug level");
-    argList::addOption("split-size", "NUM", "split with ncores/node");
-    argList::addBoolOption("builtin", "only use builtin globalIndex::gather");
-    argList::addBoolOption("window", "get data via window");
-
-    // Check -verbose before initialisation
-    UPstream::debug = argList::verbose(argc, argv);
-
-    // Check -split-size before initialisation
-    {
-        int splitSize = option_splitsize(argc, argv);
-
-        if (splitSize >= 0)
-        {
-            UPstream::nodeCommsControl_ = splitSize;
-        }
-    }
-
-    #include "setRootCase.H"
-
-    const bool useLocalComms = UPstream::usingNodeComms();
-    bool useWindow = args.found("window");
-    bool useBuiltin = args.found("builtin");
-
-    Info<< nl
-        << "Getting local-comms: " << Switch::name(useLocalComms) << nl
-        << "Getting data with window: " << Switch::name(useWindow) << nl
-        << nl;
-
-    if (useWindow && useBuiltin)
-    {
-        Info<< "Selected '-window' and '-builtin' : ignoring -builtin'"
-            << nl;
-        useBuiltin = false;
-    }
-
-    Random rng(31 + 2*UPstream::myProcNo());
-
-    const label localSize = (5*rng.position<label>(1, 15));
-
-    globalIndex globIndex
-    (
-        globalIndex::gatherOnly{},
-        localSize,
-        UPstream::commWorld()
-    );
-
-    Info<< "global-index: ";
-    printGlobalIndex(Info, globIndex);
-    reportOffsets(globIndex);
-
-    Field<scalar> allData;
-    Field<scalar> localFld(localSize, scalar(UPstream::myProcNo()));
-
-    if (useBuiltin)
-    {
-        globIndex.gather
-        (
-            localFld,
-            allData,
-            UPstream::msgType(),
-            UPstream::commsTypes::nonBlocking,
-            UPstream::commWorld()
-        );
-    }
-    else
-    {
-        globalIndexGather
-        (
-            globIndex,
-            localFld,
-            allData,
-            UPstream::msgType(),
-            UPstream::commsTypes::nonBlocking,
-            UPstream::commWorld(),
-            useWindow
-        );
-    }
-
-    Pout<< "local: " << flatOutput(localFld) << nl;
-    Info<< "field: " << flatOutput(allData) << nl;
-
-    Info<< "\nEnd\n" << endl;
-    return 0;
-}
-
-
-// ************************************************************************* //

applications/test/gravityMeshObject/case1/constant/banana

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

applications/test/gravityMeshObject/case1/constant/g

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

applications/test/gravityMeshObject/case1/constant/saturn

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

applications/test/gravityMeshObject/case1/system/controlDict

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

applications/test/hexRef8/block/constant/manualDecomposition

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

applications/test/hexRef8/block/constant/transportProperties

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

applications/test/hexRef8/block/system/blockMeshDict

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

applications/test/hexRef8/block/system/controlDict

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

applications/test/hexRef8/block/system/fvSchemes

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

applications/test/hexRef8/block/system/fvSolution

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

applications/test/invTensor/Test-invTensor.C

@@ -31,12 +31,13 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#include "complex.H"
 #include "tensor.H"
 #include "symmTensor.H"
 #include "transform.H"
 #include "unitConversion.H"
 #include "Random.H"
+#include "scalar.H"
+#include "complex.H"
 #include "sigFpe.H"
 
 using namespace Foam;

applications/test/mapDistributePolyMesh/cavity/0/U

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

applications/test/mapDistributePolyMesh/cavity/0/p

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

applications/test/mapDistributePolyMesh/cavity/0/phi

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