COMP: clear out memory in argList (#3065 )

- exit in constructor bypasses RAII
2023-12-21 17:40:29 +01:00
51 changed files with 487 additions and 732 deletions
--- a/META-INFO/api-info
+++ b/META-INFO/api-info
@ -1,2 +1,2 @@
 api=2312
-patch=240625
+patch=0
--- a/etc/config.csh/setup
+++ b/etc/config.csh/setup
@ -197,8 +197,8 @@ if ( "$FOAM_MPI" != dummy ) then
    _foamAddLib "${FOAM_LIBBIN}/${FOAM_MPI}"
 endif

-_foamAddLib  "$FOAM_SITE_LIBBIN"  # OpenFOAM group libraries
-_foamAddLib  "$FOAM_USER_LIBBIN"  # OpenFOAM user  libraries
+# OpenFOAM user, group libraries
+_foamAddLib  "${FOAM_USER_LIBBIN}:${FOAM_SITE_LIBBIN}"

 if ( -d "$WM_PROJECT_DIR/doc/man1" ) then
    _foamAddMan "$WM_PROJECT_DIR/doc"
--- a/etc/config.sh/setup
+++ b/etc/config.sh/setup
@ -229,8 +229,8 @@ then
    _foamAddLib "$FOAM_LIBBIN/$FOAM_MPI"
 fi

-_foamAddLib  "$FOAM_SITE_LIBBIN"  # OpenFOAM group libraries
-_foamAddLib  "$FOAM_USER_LIBBIN"  # OpenFOAM user  libraries
+# OpenFOAM user, group libraries
+_foamAddLib  "$FOAM_USER_LIBBIN:$FOAM_SITE_LIBBIN"

 if [ -d "$WM_PROJECT_DIR/doc/man1" ]
 then
--- a/modules/turbulence-community
+++ b/modules/turbulence-community
--- a/src/OpenFOAM/db/IOstreams/memory/memoryStreamBuffer.H
+++ b/src/OpenFOAM/db/IOstreams/memory/memoryStreamBuffer.H
@ -519,8 +519,7 @@ public:
                if (newCapacity < len)
                {
                    // Increase capacity (doubling)
-                    newCapacity =
-                        Foam::max(label(len), label(2*storage_.size()));
+                    newCapacity = max(len, label(2*storage_.size()));
                }

                // Info<<"request:" << len
--- a/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.C
+++ b/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.C
@ -176,11 +176,10 @@ makeBoundary
                new SlicedPatchField<Type>
                (
                    p,
-                    DimensionedField<Type, GeoMesh>::null()
+                    DimensionedField<Type, GeoMesh>::null(),
+                    bField[patchi]
                )
            );
-
-            bf[patchi].UList<Type>::shallowCopy(bField[patchi]);
        }
    }

--- a/src/OpenFOAM/global/argList/argList.C
+++ b/src/OpenFOAM/global/argList/argList.C
@ -1082,6 +1082,9 @@ Foam::argList::argList
                        << " -help-full' for extended usage" << nl
                        << nl;

+                    args_.clear();
+                    options_.clearStorage();
+
                    UPstream::exit(1);  // works for serial and parallel
                }

@ -1242,6 +1245,9 @@ void Foam::argList::parse

        if (quickExit)
        {
+            args_.clear();
+            options_.clearStorage();
+
            std::exit(0);
        }
    }
@ -1252,6 +1258,9 @@ void Foam::argList::parse
        foamVersion::printBuildInfo(Info.stdStream(), false);
        FatalError.write(Info, false);

+        args_.clear();
+        options_.clearStorage();
+
        UPstream::exit(1);  // works for serial and parallel
    }

--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverAgglomerateMatrix.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverAgglomerateMatrix.C
@ -6,7 +6,7 @@
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
    Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2023-2024 OpenCFD Ltd.
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -310,7 +310,13 @@ void Foam::GAMGSolver::gatherMatrices

    const auto& boundaryMap = agglomeration_.boundaryMap(destLevel);

-    PstreamBuffers pBufs(comm);
+    // Use PstreamBuffers
+    PstreamBuffers pBufs
+    (
+        UPstream::commsTypes::nonBlocking,
+        UPstream::msgType(),
+        comm
+    );

    // Send to master
    if (!UPstream::master(comm))
@ -326,49 +332,35 @@ void Foam::GAMGSolver::gatherMatrices

        const label proci = UPstream::myProcNo(comm);

-        // All interfaceBouCoeffs need to be sent across
-        bitSet validCoeffs(interfaces.size());
-        forAll(interfaceBouCoeffs, intI)
-        {
-            if (interfaceBouCoeffs.set(intI))
-            {
-                validCoeffs.set(intI);
-            }
-        }
-
-        // Only preserved interfaces need to be sent across
-        bitSet validInterface(interfaces.size());
+        labelList validInterface(interfaces.size(), -1);
        forAll(interfaces, intI)
        {
            const label allIntI = boundaryMap[proci][intI];
            if (interfaces.set(intI) && allIntI != -1)
            {
-                validInterface.set(intI);
+                validInterface[intI] = intI;
            }
        }

        UOPstream toMaster(UPstream::masterNo(), pBufs);

-        toMaster
-            << mat
-            << token::SPACE << validCoeffs
-            << token::SPACE << validInterface;
+        toMaster<< mat << token::SPACE << validInterface;

-        for (const label intI : validCoeffs)
+        forAll(validInterface, intI)
        {
-            toMaster
-                << interfaceBouCoeffs[intI]
-                << interfaceIntCoeffs[intI];
-        }
-        for (const label intI : validInterface)
-        {
-            const auto& interface = refCast<const GAMGInterfaceField>
-            (
-                interfaces[intI]
-            );
+            if (validInterface[intI] != -1)
+            {
+                const auto& interface = refCast<const GAMGInterfaceField>
+                (
+                    interfaces[intI]
+                );

-            toMaster << interface.type();
-            interface.write(toMaster);
+                toMaster
+                    << interfaceBouCoeffs[intI]
+                    << interfaceIntCoeffs[intI]
+                    << interface.type();
+                interface.write(toMaster);
+            }
        }
    }

@ -384,10 +376,10 @@ void Foam::GAMGSolver::gatherMatrices
        lduInterfacePtrsList destInterfaces = destMesh.interfaces();

        // Master.
-        otherMats.resize(nProcs-1);
-        otherBouCoeffs.resize(nProcs-1);
-        otherIntCoeffs.resize(nProcs-1);
-        otherInterfaces.resize(nProcs-1);
+        otherMats.setSize(nProcs-1);
+        otherBouCoeffs.setSize(nProcs-1);
+        otherIntCoeffs.setSize(nProcs-1);
+        otherInterfaces.setSize(nProcs-1);

        for (const int proci : UPstream::subProcs(comm))
        {
@ -397,41 +389,60 @@ void Foam::GAMGSolver::gatherMatrices

            otherMats.set(otherI, new lduMatrix(destMesh, fromProc));

-            // Receive bit-sets of valid interfaceCoeffs/interfaces
-            const bitSet validCoeffs(fromProc);
-            const bitSet validInterface(fromProc);
+            // Receive number of/valid interfaces
+            // >= 0 : remote interface index
+            // -1   : invalid interface
+            const labelList validInterface(fromProc);

-            otherBouCoeffs.emplace_set(otherI, validCoeffs.size());
-            otherIntCoeffs.emplace_set(otherI, validCoeffs.size());
-            otherInterfaces.emplace_set(otherI, validInterface.size());
+            otherBouCoeffs.set
+            (
+                otherI,
+                new FieldField<Field, scalar>(validInterface.size())
+            );
+            otherIntCoeffs.set
+            (
+                otherI,
+                new FieldField<Field, scalar>(validInterface.size())
+            );
+            otherInterfaces.set
+            (
+                otherI,
+                new PtrList<lduInterfaceField>(validInterface.size())
+            );

-            // Receive individual interface contributions
-            for (const label intI : validCoeffs)
+            forAll(validInterface, intI)
            {
-                otherBouCoeffs[otherI].emplace_set(intI, fromProc);
-                otherIntCoeffs[otherI].emplace_set(intI, fromProc);
-            }
-
-            // Receive individual interface contributions
-            for (const label intI : validInterface)
-            {
-                const word coupleType(fromProc);
-
-                const label allIntI = boundaryMap[proci][intI];
-
-                otherInterfaces[otherI].set
-                (
-                    intI,
-                    GAMGInterfaceField::New
+                if (validInterface[intI] != -1)
+                {
+                    otherBouCoeffs[otherI].set
                    (
-                        coupleType,
-                        refCast<const GAMGInterface>
+                        intI,
+                        new scalarField(fromProc)
+                    );
+                    otherIntCoeffs[otherI].set
+                    (
+                        intI,
+                        new scalarField(fromProc)
+                    );
+
+                    const word coupleType(fromProc);
+
+                    const label allIntI = boundaryMap[proci][intI];
+
+                    otherInterfaces[otherI].set
+                    (
+                        intI,
+                        GAMGInterfaceField::New
                        (
-                            destInterfaces[allIntI]
-                        ),
-                        fromProc
-                    ).release()
-                );
+                            coupleType,
+                            refCast<const GAMGInterface>
+                            (
+                                destInterfaces[allIntI]
+                            ),
+                            fromProc
+                        ).release()
+                    );
+                }
            }
        }
    }
--- a/src/OpenFOAM/matrices/schemes/schemesLookup.C
+++ b/src/OpenFOAM/matrices/schemes/schemesLookup.C
@ -6,7 +6,7 @@
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
    Copyright (C) 2011-2015 OpenFOAM Foundation
-    Copyright (C) 2019-2024 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -133,7 +133,7 @@ Foam::schemesLookup::schemesLookup
            obr.time().system(),
            obr,
            rOpt,
-            IOobjectOption::NO_WRITE
+            IOobject::NO_WRITE
        ),
        fallback
    ),
@ -153,23 +153,18 @@ Foam::schemesLookup::schemesLookup
    fluxRequiredDefault_(false),
    steady_(false)
 {
-    // Treat as READ_MODIFIED whenever possible
+    // Treat as MUST_READ_IF_MODIFIED whenever possible
    if
    (
-        readOpt() == IOobjectOption::MUST_READ
+        readOpt() == IOobject::MUST_READ
     || (isReadOptional() && headerOk())
    )
    {
-        readOpt(IOobjectOption::READ_MODIFIED);
+        readOpt(IOobject::MUST_READ_IF_MODIFIED);
        addWatch();
    }

-    // Update: from values read or copied in
-    if
-    (
-        readOpt() == IOobjectOption::READ_MODIFIED
-     || !dictionary::empty()
-    )
+    if (readOpt() == IOobject::MUST_READ_IF_MODIFIED)
    {
        read(selectedDict());
    }
--- a/src/OpenFOAM/matrices/solution/solution.C
+++ b/src/OpenFOAM/matrices/solution/solution.C
@ -6,7 +6,7 @@
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
    Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2019-2024 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -174,7 +174,7 @@ Foam::solution::solution
            obr.time().system(),
            obr,
            rOpt,
-            IOobjectOption::NO_WRITE
+            IOobject::NO_WRITE
        ),
        fallback
    ),
@ -184,23 +184,18 @@ Foam::solution::solution
    eqnRelaxDict_(),
    solvers_()
 {
-    // Treat as READ_MODIFIED whenever possible
+    // Treat as MUST_READ_IF_MODIFIED whenever possible
    if
    (
-        readOpt() == IOobjectOption::MUST_READ
+        readOpt() == IOobject::MUST_READ
     || (isReadOptional() && headerOk())
    )
    {
-        readOpt(IOobjectOption::READ_MODIFIED);
+        readOpt(IOobject::MUST_READ_IF_MODIFIED);
        addWatch();
    }

-    // Update: from values read or copied in
-    if
-    (
-        readOpt() == IOobjectOption::READ_MODIFIED
-     || !dictionary::empty()
-    )
+    if (readOpt() == IOobject::MUST_READ_IF_MODIFIED)
    {
        read(selectedDict());
    }
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshCheck/polyMeshCheck.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshCheck/polyMeshCheck.C
@ -123,13 +123,13 @@ bool Foam::polyMesh::checkFaceOrthogonality
    reduce(severeNonOrth, sumOp<label>());
    reduce(errorNonOrth, sumOp<label>());

+    const scalar maxNonOrth = radToDeg(::acos(clamp(minDDotS, -1, 1)));
+    const scalar aveNonOrth = radToDeg(::acos(clamp(sumDDotS/nSummed, -1, 1)));
+
    dictionary& meshDict = const_cast<dictionary&>(data().meshDict());

    if (nSummed > 0)
    {
-        scalar maxNonOrth = radToDeg(::acos(clamp(minDDotS, -1, 1)));
-        scalar aveNonOrth = radToDeg(::acos(clamp(sumDDotS/nSummed, -1, 1)));
-
        meshDict.set("maxNonOrth", maxNonOrth);
        meshDict.set("aveNonOrth", aveNonOrth);

--- a/src/OpenFOAM/primitives/Tensor/TensorI.H
+++ b/src/OpenFOAM/primitives/Tensor/TensorI.H
@ -538,10 +538,6 @@ inline Foam::Tensor<Cmpt> Foam::Tensor<Cmpt>::inv2D


 template<class Cmpt>
-#if defined(__GNUC__) && !defined(__clang__)
-// Workaround for gcc (11+) that fails to handle tensor dot vector
-__attribute__((optimize("no-tree-vectorize")))
-#endif
 inline Foam::Tensor<Cmpt>
 Foam::Tensor<Cmpt>::inner(const Tensor<Cmpt>& t2) const
 {
@ -565,10 +561,6 @@ Foam::Tensor<Cmpt>::inner(const Tensor<Cmpt>& t2) const


 template<class Cmpt>
-#if defined(__GNUC__) && !defined(__clang__)
-// Workaround for gcc (11+) that fails to handle tensor dot vector
-__attribute__((optimize("no-tree-vectorize")))
-#endif
 inline Foam::Tensor<Cmpt>
 Foam::Tensor<Cmpt>::schur(const Tensor<Cmpt>& t2) const
 {
@ -1111,10 +1103,6 @@ operator&(const Tensor<Cmpt>& t1, const Tensor<Cmpt>& t2)

 //- Inner-product of a SphericalTensor and a Tensor
 template<class Cmpt>
-#if defined(__GNUC__) && !defined(__clang__)
-// Workaround for gcc (11+) that fails to handle tensor dot vector
-__attribute__((optimize("no-tree-vectorize")))
-#endif
 inline Tensor<Cmpt>
 operator&(const SphericalTensor<Cmpt>& st1, const Tensor<Cmpt>& t2)
 {
@ -1129,10 +1117,6 @@ operator&(const SphericalTensor<Cmpt>& st1, const Tensor<Cmpt>& t2)

 //- Inner-product of a Tensor and a SphericalTensor
 template<class Cmpt>
-#if defined(__GNUC__) && !defined(__clang__)
-// Workaround for gcc (11+) that fails to handle tensor dot vector
-__attribute__((optimize("no-tree-vectorize")))
-#endif
 inline Tensor<Cmpt>
 operator&(const Tensor<Cmpt>& t1, const SphericalTensor<Cmpt>& st2)
 {
@ -1147,10 +1131,6 @@ operator&(const Tensor<Cmpt>& t1, const SphericalTensor<Cmpt>& st2)

 //- Inner-product of a SymmTensor and a Tensor
 template<class Cmpt>
-#if defined(__GNUC__) && !defined(__clang__)
-// Workaround for gcc (11+) that fails to handle tensor dot vector
-__attribute__((optimize("no-tree-vectorize")))
-#endif
 inline Tensor<Cmpt>
 operator&(const SymmTensor<Cmpt>& st1, const Tensor<Cmpt>& t2)
 {
@ -1173,10 +1153,6 @@ operator&(const SymmTensor<Cmpt>& st1, const Tensor<Cmpt>& t2)

 //- Inner-product of a Tensor and a SymmTensor
 template<class Cmpt>
-#if defined(__GNUC__) && !defined(__clang__)
-// Workaround for gcc (11+) that fails to handle tensor dot vector
-__attribute__((optimize("no-tree-vectorize")))
-#endif
 inline Tensor<Cmpt>
 operator&(const Tensor<Cmpt>& t1, const SymmTensor<Cmpt>& st2)
 {
@ -1217,10 +1193,6 @@ operator&(const Tensor<Cmpt>& t, const Vector<Cmpt>& v)

 //- Inner-product of a Vector and a Tensor
 template<class Cmpt>
-#if defined(__GNUC__) && !defined(__clang__)
-// Workaround for gcc (11+) that fails to handle tensor dot vector
-__attribute__((optimize("no-tree-vectorize")))
-#endif
 inline Vector<Cmpt>
 operator&(const Vector<Cmpt>& v, const Tensor<Cmpt>& t)
 {
--- a/src/fileFormats/nastran/NASCore.C
+++ b/src/fileFormats/nastran/NASCore.C
@ -5,7 +5,7 @@
    \\  /    A nd           | www.openfoam.com
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2017-2024 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -136,8 +136,7 @@ std::string Foam::fileFormats::NASCore::nextNasField
 (
    const std::string& str,
    std::string::size_type& pos,
-    const std::string::size_type width,
-    const bool free_format
+    std::string::size_type len
 )
 {
    const auto beg = pos;
@ -145,23 +144,15 @@ std::string Foam::fileFormats::NASCore::nextNasField

    if (end == std::string::npos)
    {
-        if (free_format)
-        {
-            // Nothing left
-            pos = str.size();
-            return str.substr(beg);
-        }
-
-        // Fixed format - continue after field width
-        pos = beg + width;
-        return str.substr(beg, width);
+        pos = beg + len;    // Continue after field width
    }
    else
    {
-        // Free format - continue after comma
-        pos = end + 1;
-        return str.substr(beg, (end - beg));
+        len = (end - beg);  // Efffective width
+        pos = end + 1;      // Continue after comma
    }
+
+    return str.substr(beg, len);
 }


@ -258,8 +249,8 @@ void Foam::fileFormats::NASCore::writeCoord
    // 2 ID   : point ID - requires starting index of 1
    // 3 CP   : coordinate system ID                (blank)
    // 4 X1   : point x coordinate
-    // 5 X2   : point y coordinate
-    // 6 X3   : point z coordinate
+    // 5 X2   : point x coordinate
+    // 6 X3   : point x coordinate
    // 7 CD   : coordinate system for displacements (blank)
    // 8 PS   : single point constraints            (blank)
    // 9 SEID : super-element ID
--- a/src/fileFormats/nastran/NASCore.H
+++ b/src/fileFormats/nastran/NASCore.H
@ -5,7 +5,7 @@
    \\  /    A nd           | www.openfoam.com
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2017-2024 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -47,6 +47,7 @@ SourceFiles

 namespace Foam
 {
+
 namespace fileFormats
 {

@ -78,18 +79,18 @@ public:
        //- Output load format
        enum loadFormat
        {
-            PLOAD2,     //!< Face load (eg, pressure)
-            PLOAD4      //!< Vertex load
+            PLOAD2,
+            PLOAD4
        };

-        //- Selection names for the NASTRAN load formats
+        //- Selection names for the NASTRAN file field formats
        static const Enum<loadFormat> loadFormatNames;


    // Constructors

        //- Default construct
-        NASCore() noexcept = default;
+        NASCore() = default;


    // Public Static Member Functions
@ -97,20 +98,18 @@ public:
        //- Extract numbers from things like "-2.358-8" (same as "-2.358e-8")
        static scalar readNasScalar(const std::string& str);

-        //- A std::string::substr() variant to handle fixed-format and
-        //- free-format NASTRAN.
-        //  Returns the substr until the next comma (if found)
-        //  or the given fixed width
+        //- A string::substr() to handle fixed-format and free-format NASTRAN.
+        //  Returns the substr to the next comma (if found) or the given length
+        //
+        //  \param str The string to extract from
+        //  \param pos On input, the position of the first character of the
+        //      substring. On output, advances to the next position to use.
+        //  \param len The fixed-format length to use if a comma is not found.
        static std::string nextNasField
        (
-            //! The string to extract from
            const std::string& str,
-            //! [in,out] The parse position within \p str
            std::string::size_type& pos,
-            //! The fixed-format width to use (if comma is not found)
-            const std::string::size_type width,
-            //! The input is known to be free-format
-            const bool free_format = false
+            std::string::size_type len
        );


--- a/src/fileFormats/stl/STLCore.C
+++ b/src/fileFormats/stl/STLCore.C
@ -6,7 +6,7 @@
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
    Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2016-2024 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -61,36 +61,6 @@ static bool startsWithSolid(const char header[STLHeaderSize])
 }


-// Check if file size appears to be reasonable for an STL binary file.
-// Compare file size with that expected from number of tris
-// If this is not sensible, it may be an ASCII file
-//
-// sizeof(STLtriangle) = 50 bytes [int16 + 4 * (3 float)]
-
-inline static bool checkBinaryFileSize
-(
-    const int64_t nTris,
-    const Foam::fileName& file
-)
-{
-    // When checking the content size, account for the header size (80),
-    // but ignore the nTris information (int32_t) to give some rounding
-
-    const int64_t contentSize =
-    (
-        int64_t(Foam::fileSize(file))
-      - int64_t(STLHeaderSize)
-    );
-
-    return
-    (
-        (contentSize >= 0)
-     && (nTris >= contentSize/50)
-     && (nTris <= contentSize/25)
-    );
-}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //

 bool Foam::fileFormats::STLCore::isBinaryName
@ -147,31 +117,31 @@ int Foam::fileFormats::STLCore::detectBinaryHeader


    // Read the number of triangles in the STL file
-    // (note: read as signed int so we can check whether >2^31).
-    //
-    // With nTris == 2^31, file size is 107.37 GB !
-    //
-    // However, the limit is more likely caused by the number of points
-    // that can be stored (label-size=32) when flattened for merging.
-    // So more like 715.8M triangles (~35.8 GB)
-
+    // (note: read as signed so we can check whether >2^31)
    int32_t nTris;
    is.read(reinterpret_cast<char*>(&nTris), sizeof(int32_t));

-    bool ok = (is && nTris >= 0);
+    // Check that stream is OK and number of triangles is positive,
+    // if not this may be an ASCII file

-    if (ok && unCompressed)
+    bool bad = (!is || nTris < 0);
+
+    if (!bad && unCompressed)
    {
-        ok = checkBinaryFileSize(nTris, filename);
+        // Compare file size with that expected from number of tris
+        // If this is not sensible, it may be an ASCII file
+
+        const off_t dataFileSize = Foam::fileSize(filename);
+
+        bad =
+            (
+                nTris < int(dataFileSize - STLHeaderSize)/50
+             || nTris > int(dataFileSize - STLHeaderSize)/25
+            );
    }

-    //if (ok)
-    //{
-    //    InfoErr<< "stlb : " << nTris << " triangles" << nl;
-    //}
-
    // Return number of triangles if it appears to be BINARY and good.
-    return (ok ? nTris : 0);
+    return (bad ? 0 : nTris);
 }


@ -219,27 +189,31 @@ Foam::fileFormats::STLCore::readBinaryHeader
            << exit(FatalError);
    }

-
-    // Read the number of triangles in the STL file
-    // (note: read as signed int so we can check whether >2^31).
-    //
-    // With nTris == 2^31, file size is 107.37 GB !
-    //
-    // However, the limit is more likely caused by the number of points
-    // that can be stored (label-size=32) when flattened for merging.
-    // So more like 715.8M triangles (~35.8 GB)
-
+    // Read the number of triangles in the STl file
+    // (note: read as int so we can check whether >2^31)
    int32_t nTris;
    is.read(reinterpret_cast<char*>(&nTris), sizeof(int32_t));

-    bool ok = (is && nTris >= 0);
+    // Check that stream is OK and number of triangles is positive,
+    // if not this maybe an ASCII file

-    if (ok && unCompressed)
+    bool bad = (!is || nTris < 0);
+
+    if (!bad && unCompressed)
    {
-        ok = checkBinaryFileSize(nTris, filename);
+        // Compare file size with that expected from number of tris
+        // If this is not sensible, it may be an ASCII file
+
+        const off_t dataFileSize = Foam::fileSize(filename);
+
+        bad =
+            (
+                nTris < int(dataFileSize - STLHeaderSize)/50
+             || nTris > int(dataFileSize - STLHeaderSize)/25
+            );
    }

-    if (!ok)
+    if (bad)
    {
        FatalErrorInFunction
            << "problem reading number of triangles, perhaps file is not binary"
--- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.C
@ -6,7 +6,7 @@
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
    Copyright (C) 2013-2017 OpenFOAM Foundation
-    Copyright (C) 2019-2024 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -444,14 +444,7 @@ void Foam::cyclicACMIFvPatchField<Type>::initEvaluate
            << " starting send&receive"
            << endl;

-        // Bypass polyPatch to get nbrId.
-        // - use cyclicACMIFvPatch::neighbPatch() virtual instead
-        const cyclicACMIFvPatch& neighbPatch = cyclicACMIPatch_.neighbPatch();
-        const labelUList& nbrFaceCells = neighbPatch.faceCells();
-        const Field<Type> pnf(this->primitiveField(), nbrFaceCells);
-
-        // Assert that all receives are known to have finished
-        if (!recvRequests_.empty())
+        if (!this->ready())
        {
            FatalErrorInFunction
                << "Outstanding recv request(s) on patch "
@ -460,8 +453,11 @@ void Foam::cyclicACMIFvPatchField<Type>::initEvaluate
                << abort(FatalError);
        }

-        // Assume that sends are also OK
-        sendRequests_.clear();
+        // By-pass polyPatch to get nbrId. Instead use cyclicACMIFvPatch virtual
+        // neighbPatch()
+        const cyclicACMIFvPatch& neighbPatch = cyclicACMIPatch_.neighbPatch();
+        const labelUList& nbrFaceCells = neighbPatch.faceCells();
+        const Field<Type> pnf(this->primitiveField(), nbrFaceCells);

        cyclicACMIPatch_.initInterpolate
        (
@ -519,10 +515,6 @@ void Foam::cyclicACMIFvPatchField<Type>::evaluate
            ).ptr()
        );

-        // Receive requests all handled by last function call
-        recvRequests_.clear();
-
-
        auto& patchNeighbourField = patchNeighbourFieldPtr_.ref();

        if (doTransform())
@ -567,16 +559,7 @@ void Foam::cyclicACMIFvPatchField<Type>::initInterfaceMatrixUpdate
            << " starting send&receive"
            << endl;

-        const labelUList& nbrFaceCells =
-            lduAddr.patchAddr(cyclicACMIPatch_.neighbPatchID());
-
-        solveScalarField pnf(psiInternal, nbrFaceCells);
-
-        // Transform according to the transformation tensors
-        transformCoupleField(pnf, cmpt);
-
-        // Assert that all receives are known to have finished
-        if (!recvRequests_.empty())
+        if (!this->ready())
        {
            FatalErrorInFunction
                << "Outstanding recv request(s) on patch "
@ -585,8 +568,13 @@ void Foam::cyclicACMIFvPatchField<Type>::initInterfaceMatrixUpdate
                << abort(FatalError);
        }

-        // Assume that sends are also OK
-        sendRequests_.clear();
+        const labelUList& nbrFaceCells =
+            lduAddr.patchAddr(cyclicACMIPatch_.neighbPatchID());
+
+        solveScalarField pnf(psiInternal, nbrFaceCells);
+
+        // Transform according to the transformation tensors
+        transformCoupleField(pnf, cmpt);

        cyclicACMIPatch_.initInterpolate
        (
@ -647,9 +635,6 @@ void Foam::cyclicACMIFvPatchField<Type>::updateInterfaceMatrix
                recvRequests_,
                scalarRecvBufs_
            );
-
-        // Receive requests all handled by last function call
-        recvRequests_.clear();
    }
    else
    {
@ -691,16 +676,7 @@ void Foam::cyclicACMIFvPatchField<Type>::initInterfaceMatrixUpdate
                << exit(FatalError);
        }

-        const labelUList& nbrFaceCells =
-            lduAddr.patchAddr(cyclicACMIPatch_.neighbPatchID());
-
-        Field<Type> pnf(psiInternal, nbrFaceCells);
-
-        // Transform according to the transformation tensors
-        transformCoupleField(pnf);
-
-        // Assert that all receives are known to have finished
-        if (!recvRequests_.empty())
+        if (!this->ready())
        {
            FatalErrorInFunction
                << "Outstanding recv request(s) on patch "
@ -709,8 +685,13 @@ void Foam::cyclicACMIFvPatchField<Type>::initInterfaceMatrixUpdate
                << abort(FatalError);
        }

-        // Assume that sends are also OK
-        sendRequests_.clear();
+        const labelUList& nbrFaceCells =
+            lduAddr.patchAddr(cyclicACMIPatch_.neighbPatchID());
+
+        Field<Type> pnf(psiInternal, nbrFaceCells);
+
+        // Transform according to the transformation tensors
+        transformCoupleField(pnf);

        cyclicACMIPatch_.initInterpolate
        (
@ -760,9 +741,6 @@ void Foam::cyclicACMIFvPatchField<Type>::updateInterfaceMatrix
                recvRequests_,
                recvBufs_
            );
-
-        // Receive requests all handled by last function call
-        recvRequests_.clear();
    }
    else
    {
--- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C
@ -6,7 +6,7 @@
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
    Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2019-2024 OpenCFD Ltd.
+    Copyright (C) 2019-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -446,27 +446,14 @@ void Foam::cyclicAMIFvPatchField<Type>::initEvaluate

        // Start sending

-        // Bypass polyPatch to get nbrId.
-        // - use cyclicACMIFvPatch::neighbPatch() virtual instead
+        // By-pass polyPatch to get nbrId. Instead use cyclicAMIFvPatch virtual
+        // neighbPatch()
        const cyclicAMIFvPatch& neighbPatch = cyclicAMIPatch_.neighbPatch();
        const labelUList& nbrFaceCells = neighbPatch.faceCells();
        const Field<Type> pnf(this->primitiveField(), nbrFaceCells);

        const cyclicAMIPolyPatch& cpp = cyclicAMIPatch_.cyclicAMIPatch();

-        // Assert that all receives are known to have finished
-        if (!recvRequests_.empty())
-        {
-            FatalErrorInFunction
-                << "Outstanding recv request(s) on patch "
-                << cyclicAMIPatch_.name()
-                << " field " << this->internalField().name()
-                << abort(FatalError);
-        }
-
-        // Assume that sends are also OK
-        sendRequests_.clear();
-
        cpp.initInterpolate
        (
            pnf,
@ -529,10 +516,6 @@ void Foam::cyclicAMIFvPatchField<Type>::evaluate
                defaultValues
            ).ptr()
        );
-
-        // Receive requests all handled by last function call
-        recvRequests_.clear();
-
        auto& patchNeighbourField = patchNeighbourFieldPtr_.ref();

        if (doTransform())
@ -580,19 +563,6 @@ void Foam::cyclicAMIFvPatchField<Type>::initInterfaceMatrixUpdate

        const cyclicAMIPolyPatch& cpp = cyclicAMIPatch_.cyclicAMIPatch();

-        // Assert that all receives are known to have finished
-        if (!recvRequests_.empty())
-        {
-            FatalErrorInFunction
-                << "Outstanding recv request(s) on patch "
-                << cyclicAMIPatch_.name()
-                << " field " << this->internalField().name()
-                << abort(FatalError);
-        }
-
-        // Assume that sends are also OK
-        sendRequests_.clear();
-
        cpp.initInterpolate
        (
            pnf,
@ -654,9 +624,6 @@ void Foam::cyclicAMIFvPatchField<Type>::updateInterfaceMatrix
                scalarRecvBufs_,
                defaultValues
            );
-
-        // Receive requests all handled by last function call
-        recvRequests_.clear();
    }
    else
    {
@ -715,19 +682,6 @@ void Foam::cyclicAMIFvPatchField<Type>::initInterfaceMatrixUpdate

        const cyclicAMIPolyPatch& cpp = cyclicAMIPatch_.cyclicAMIPatch();

-        // Assert that all receives are known to have finished
-        if (!recvRequests_.empty())
-        {
-            FatalErrorInFunction
-                << "Outstanding recv request(s) on patch "
-                << cyclicAMIPatch_.name()
-                << " field " << this->internalField().name()
-                << abort(FatalError);
-        }
-
-        // Assume that sends are also OK
-        sendRequests_.clear();
-
        cpp.initInterpolate
        (
            pnf,
@ -788,9 +742,6 @@ void Foam::cyclicAMIFvPatchField<Type>::updateInterfaceMatrix
                recvBufs_,
                defaultValues
            );
-
-        // Receive requests all handled by last function call
-        recvRequests_.clear();
    }
    else
    {
--- a/src/functionObjects/field/extractEulerianParticles/extractEulerianParticles/extractEulerianParticlesTemplates.C
+++ b/src/functionObjects/field/extractEulerianParticles/extractEulerianParticles/extractEulerianParticlesTemplates.C
@ -43,7 +43,7 @@ Type Foam::functionObjects::extractEulerianParticles::faceValue
    {
        label patchi = patchIDs_[localFacei];
        label pFacei = patchFaceIDs_[localFacei];
-        if (patchi != -1)
+        if (patchi != 0)
        {
            return field.boundaryField()[patchi][pFacei];
        }
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C
@ -302,7 +302,7 @@ void Foam::ThermoSurfaceFilm<CloudType>::cacheFilmFields
    TFilmPatch_ = film.Tf().primitiveField();

    // Direct copy (one-to-one mapping)
-    CpFilmPatch_ = film.Cp().primitiveField();
+    TFilmPatch_ = film.Cp().primitiveField();
 }


--- a/src/meshTools/AMIInterpolation/GAMG/interfaceFields/cyclicACMIGAMGInterfaceField/cyclicACMIGAMGInterfaceField.C
+++ b/src/meshTools/AMIInterpolation/GAMG/interfaceFields/cyclicACMIGAMGInterfaceField/cyclicACMIGAMGInterfaceField.C
@ -6,7 +6,7 @@
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
    Copyright (C) 2013 OpenFOAM Foundation
-    Copyright (C) 2019-2024 OpenCFD Ltd.
+    Copyright (C) 2019,2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -217,18 +217,6 @@ void Foam::cyclicACMIGAMGInterfaceField::initInterfaceMatrixUpdate
          : AMI.srcMap()
        );

-        // Assert that all receives are known to have finished
-        if (!recvRequests_.empty())
-        {
-            FatalErrorInFunction
-                << "Outstanding recv request(s) on patch "
-                << cyclicACMIInterface_.index()
-                << abort(FatalError);
-        }
-
-        // Assume that sends are also OK
-        sendRequests_.clear();
-
        // Insert send/receive requests (non-blocking). See e.g.
        // cyclicAMIPolyPatchTemplates.C
        const label oldWarnComm = UPstream::commWarn(AMI.comm());
@ -288,9 +276,6 @@ void Foam::cyclicACMIGAMGInterfaceField::updateInterfaceMatrix
        solveScalarField work;
        map.receive(recvRequests_, scalarRecvBufs_, work);

-        // Receive requests all handled by last function call
-        recvRequests_.clear();
-
        solveScalarField pnf(faceCells.size(), Zero);
        AMI.weightedSum
        (
--- a/src/meshTools/AMIInterpolation/GAMG/interfaceFields/cyclicAMIGAMGInterfaceField/cyclicAMIGAMGInterfaceField.C
+++ b/src/meshTools/AMIInterpolation/GAMG/interfaceFields/cyclicAMIGAMGInterfaceField/cyclicAMIGAMGInterfaceField.C
@ -6,7 +6,7 @@
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
    Copyright (C) 2011-2013 OpenFOAM Foundation
-    Copyright (C) 2019-2024 OpenCFD Ltd.
+    Copyright (C) 2019,2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -218,18 +218,6 @@ void Foam::cyclicAMIGAMGInterfaceField::initInterfaceMatrixUpdate
          : AMI.srcMap()
        );

-        // Assert that all receives are known to have finished
-        if (!recvRequests_.empty())
-        {
-            FatalErrorInFunction
-                << "Outstanding recv request(s) on patch "
-                << cyclicAMIInterface_.index()
-                << abort(FatalError);
-        }
-
-        // Assume that sends are also OK
-        sendRequests_.clear();
-
        // Insert send/receive requests (non-blocking). See e.g.
        // cyclicAMIPolyPatchTemplates.C
        const label oldWarnComm = UPstream::commWarn(AMI.comm());
@ -302,9 +290,6 @@ void Foam::cyclicAMIGAMGInterfaceField::updateInterfaceMatrix
        solveScalarField work;
        map.receive(recvRequests_, scalarRecvBufs_, work);

-        // Receive requests all handled by last function call
-        recvRequests_.clear();
-
        solveScalarField pnf(faceCells.size(), Zero);
        AMI.weightedSum
        (
--- a/src/meshTools/coordSet/writers/gltf/gltfCoordSetWriter.C
+++ b/src/meshTools/coordSet/writers/gltf/gltfCoordSetWriter.C
@ -5,7 +5,7 @@
    \\  /    A nd           | www.openfoam.com
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2021-2024 OpenCFD Ltd.
+    Copyright (C) 2021-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -70,7 +70,7 @@ static tmp<vectorField> getBoundedColours
    const scalar boundMax
 )
 {
-    const scalar boundDelta = (boundMax - boundMin + ROOTVSMALL);
+    const label boundDelta = (boundMax - boundMin + ROOTVSMALL);

    auto tresult = tmp<vectorField>::New(field.size());
    auto& result = tresult.ref();
@ -167,7 +167,7 @@ Foam::scalarMinMax Foam::coordSetWriters::gltfWriter::getFieldLimits
 {
    const dictionary fieldDict = fieldInfoDict_.subOrEmptyDict(fieldName);

-    scalarMinMax limits(-GREAT, GREAT);
+    scalarMinMax limits;

    fieldDict.readIfPresent("min", limits.min());
    fieldDict.readIfPresent("max", limits.max());
@ -191,7 +191,7 @@ Foam::coordSetWriters::gltfWriter::getAlphaField
    {
        // Not specified
    }
-    else if (!eptr->stream().peek().isWord())
+    else if (!eptr->stream().peek().isString())
    {
        // Value specified

--- a/src/meshTools/coordSet/writers/gltf/gltfCoordSetWriter.H
+++ b/src/meshTools/coordSet/writers/gltf/gltfCoordSetWriter.H
@ -5,7 +5,7 @@
    \\  /    A nd           | www.openfoam.com
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2021-2024 OpenCFD Ltd.
+    Copyright (C) 2021-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -45,27 +45,24 @@ Description
    \verbatim
    formatOptions
    {
-        gltf
+        // Apply colours flag (yes | no ) [optional]
+        colours     yes;
+
+        // List of options per field
+        fieldInfo
        {
-            // Apply colours flag (yes | no ) [optional]
-            colour      yes;
-
-            // List of options per field
-            fieldInfo
+            p
            {
-                p
-                {
-                    // Colour map [optional]
-                    colourMap       <colourMap>;
+                // Colour map [optional]
+                colourMap       <colourMap>;

-                    // Colour map minimum and maximum limits [optional]
-                    // Uses field min and max if not specified
-                    min             0;
-                    max             1;
+                // Colour map minimum and maximum limits [optional]
+                // Uses field min and max if not specified
+                min             0;
+                max             1;

-                    // Alpha channel [optional] (<scalar>)
-                    alpha           0.5;
-                }
+                // Alpha channel [optional] (<scalar>)
+                alpha           0.5;
            }
        }
    }
@ -76,38 +73,35 @@ Description
    \verbatim
    formatOptions
    {
-        gltf
+        // Apply colours flag (yes | no) [optional]
+        colours     yes;
+
+        // Animate tracks (yes | no) [optional]
+        animate     yes;
+
+        // Animation properties [optional]
+        animationInfo
        {
-            // Apply colours flag (yes | no) [optional]
-            colour      yes;
+            // Colour map [optional]
+            colourMap       <colourMap>;

-            // Animate tracks (yes | no) [optional]
-            animate     yes;
+            // Colour [optional] (<vector> | uniform | field)
+            colour          (1 0 0); // RGB in range [0-1]

-            // Animation properties [optional]
-            animationInfo
-            {
-                // Colour map [optional]
-                colourMap       <colourMap>;
+            //colour          uniform;
+            //colourValue     (1 0 0); // RGB in range [0-1]

-                // Colour [optional] (<vector> | uniform | field)
-                colour          (1 0 0); // RGB in range [0-1]
+            //colour          field;
+            //colourField     d;

-                //colour          uniform;
-                //colourValue     (1 0 0); // RGB in range [0-1]
+            // Colour map minimum and maximum limits [optional]
+            // Note: for colour = field option
+            // Uses field min and max if not specified
+            min             0;
+            max             1;

-                //colour          field;
-                //colourField     d;
-
-                // Colour map minimum and maximum limits [optional]
-                // Note: for colour = field option
-                // Uses field min and max if not specified
-                min             0;
-                max             1;
-
-                // Alpha channel [optional] (<scalar>)
-                alpha           0.5;
-            }
+            // Alpha channel [optional] (<scalar>)
+            alpha           0.5;
        }
    }
    \endverbatim
--- a/src/meshTools/edgeMesh/edgeFormats/nastran/NASedgeFormat.C
+++ b/src/meshTools/edgeMesh/edgeFormats/nastran/NASedgeFormat.C
@ -6,7 +6,7 @@
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
    Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2017-2024 OpenCFD Ltd.
+    Copyright (C) 2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -62,17 +62,13 @@ bool Foam::fileFormats::NASedgeFormat::read

    while (is.good())
    {
+        string::size_type linei = 0;  // parsing position within current line
        string line;
        is.getLine(line);

-        if (line.empty())
+        if (line.empty() || line[0] == '$')
        {
-            continue;  // Ignore empty
-        }
-        else if (line[0] == '$')
-        {
-            // Ignore comment
-            continue;
+            continue; // Skip empty or comment
        }

        // Check if character 72 is continuation
@ -98,69 +94,41 @@ bool Foam::fileFormats::NASedgeFormat::read
        }


-        // Parsing position within current line
-        std::string::size_type linei = 0;
-
-        // Is free format if line contains a comma
-        const bool freeFormat = line.contains(',');
-
        // First word (column 0-8)
        const word cmd(word::validate(nextNasField(line, linei, 8)));

        if (cmd == "CBEAM" || cmd == "CROD")
        {
-            // Fixed format:
-            //  8-16 : element id
-            // 16-24 : group id
-            // 24-32 : vertex
-            // 32-40 : vertex
+            // discard elementId (8-16)
+            (void) nextNasField(line, linei, 8); // 8-16
+            // discard groupId (16-24)
+            (void) nextNasField(line, linei, 8); // 16-24

-            // discard elementId
-            (void) nextNasField(line, linei, 8, freeFormat);
-            // discard groupId
-            (void) nextNasField(line, linei, 8, freeFormat);
+            label a = readLabel(nextNasField(line, linei, 8)); // 24-32
+            label b = readLabel(nextNasField(line, linei, 8)); // 32-40

-            label a = readLabel(nextNasField(line, linei, 8, freeFormat));
-            label b = readLabel(nextNasField(line, linei, 8, freeFormat));
-
-            dynEdges.emplace_back(a,b);
+            dynEdges.append(edge(a,b));
        }
        else if (cmd == "PLOTEL")
        {
-            // Fixed format:
-            //  8-16 : element id
-            // 16-24 : vertex
-            // 24-32 : vertex
-            // 32-40 : vertex
-
            // discard elementId (8-16)
-            (void) nextNasField(line, linei, 8, freeFormat);
+            (void) nextNasField(line, linei, 8); // 8-16

-            label a = readLabel(nextNasField(line, linei, 8, freeFormat));
-            label b = readLabel(nextNasField(line, linei, 8, freeFormat));
+            label a = readLabel(nextNasField(line, linei, 8)); // 16-24
+            label b = readLabel(nextNasField(line, linei, 8)); // 24-32

-            dynEdges.emplace_back(a,b);
+            dynEdges.append(edge(a,b));
        }
        else if (cmd == "GRID")
        {
-            // Fixed (short) format:
-            //  8-16 : point id
-            // 16-24 : coordinate system (unsupported)
-            // 24-32 : point x coordinate
-            // 32-40 : point y coordinate
-            // 40-48 : point z coordinate
-            // 48-56 : displacement coordinate system (optional, unsupported)
-            // 56-64 : single point constraints (optional, unsupported)
-            // 64-70 : super-element id (optional, unsupported)
+            label index = readLabel(nextNasField(line, linei, 8)); // 8-16
+            (void) nextNasField(line, linei, 8); // 16-24
+            scalar x = readNasScalar(nextNasField(line, linei, 8)); // 24-32
+            scalar y = readNasScalar(nextNasField(line, linei, 8)); // 32-40
+            scalar z = readNasScalar(nextNasField(line, linei, 8)); // 40-48

-            label index = readLabel(nextNasField(line, linei, 8, freeFormat));
-            (void) nextNasField(line, linei, 8, freeFormat);
-            scalar x = readNasScalar(nextNasField(line, linei, 8, freeFormat));
-            scalar y = readNasScalar(nextNasField(line, linei, 8, freeFormat));
-            scalar z = readNasScalar(nextNasField(line, linei, 8, freeFormat));
-
-            pointId.push_back(index);
-            dynPoints.emplace_back(x, y, z);
+            pointId.append(index);
+            dynPoints.append(point(x, y, z));
        }
        else if (cmd == "GRID*")
        {
@ -170,8 +138,6 @@ bool Foam::fileFormats::NASedgeFormat::read
            // GRID*      126   0 -5.55999875E+02 -5.68730474E+02
            // *         2.14897901E+02

-            // Cannot be long format and free format at the same time!
-
            label index = readLabel(nextNasField(line, linei, 16)); // 8-24
            (void) nextNasField(line, linei, 16); // 24-40
            scalar x = readNasScalar(nextNasField(line, linei, 16)); // 40-56
@ -191,8 +157,8 @@ bool Foam::fileFormats::NASedgeFormat::read
            (void) nextNasField(line, linei, 8); // 0-8
            scalar z = readNasScalar(nextNasField(line, linei, 16)); // 8-16

-            pointId.push_back(index);
-            dynPoints.emplace_back(x, y, z);
+            pointId.append(index);
+            dynPoints.append(point(x, y, z));
        }
    }

--- a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBaseI.H
+++ b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBaseI.H
@ -6,7 +6,7 @@
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
    Copyright (C) 2011-2015 OpenFOAM Foundation
-    Copyright (C) 2020-2021,2024 OpenCFD Ltd.
+    Copyright (C) 2020-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -201,10 +201,7 @@ Foam::mappedPatchBase::updateSampleMeshTime() const
 {
    if (!updateSampleMeshTimePtr_)
    {
-        // Note: explicitly register on our mesh instead of sampleMesh
-        // since otherwise the destructor might give problems since sampleMesh
-        // might have already been taken down before.
-        const auto& mesh = patch_.boundaryMesh().mesh();
+        const auto& mesh = sampleMesh();

        updateSampleMeshTimePtr_.reset
        (
--- a/src/meshTools/triangulatedPatch/triangulatedPatch.C
+++ b/src/meshTools/triangulatedPatch/triangulatedPatch.C
@ -5,7 +5,7 @@
    \\  /    A nd           | www.openfoam.com
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2023-2024 OpenCFD Ltd.
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -26,6 +26,7 @@ License
 \*---------------------------------------------------------------------------*/

 #include "triangulatedPatch.H"
+#include "triPointRef.H"

 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //

@ -49,8 +50,6 @@ bool Foam::triangulatedPatch::randomPoint

    // Find corresponding decomposed face triangle
    // Note: triWght_ is sized nTri+1 (zero added at start)
-    //
-    // TBD: binary search with findLower(triWght_, c) ??
    label trii = 0;
    for (label i = 0; i < triWght_.size() - 1; ++i)
    {
@ -63,9 +62,11 @@ bool Foam::triangulatedPatch::randomPoint

    // Find random point in triangle
    const pointField& points = patch_.points();
+    const face& tf = triFace_[trii];
+    const triPointRef tri(points[tf[0]], points[tf[1]], points[tf[2]]);

-    result = triFace_[trii].tri(points).randomPoint(rnd);
-    facei = triFace_[trii].index();
+    result = tri.randomPoint(rnd);
+    facei = triToFace_[trii];
    celli = patch_.faceCells()[facei];

    if (perturbTol_ > 0)
@ -96,6 +97,7 @@ Foam::triangulatedPatch::triangulatedPatch
    patch_(patch),
    perturbTol_(perturbTol),
    triFace_(),
+    triToFace_(),
    triWght_()
 {
    update();
@ -113,95 +115,70 @@ Foam::triangulatedPatch::triangulatedPatch
 {}


-// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
-
-void Foam::triangulatedPatch::triangulate
-(
-    const polyPatch& pp,
-    List<labelledTri>& tris
-)
-{
-    const pointField& points = pp.points();
-
-    // Triangulate the patch faces and create addressing
-    label nTris = 0;
-    for (const face& f : pp)
-    {
-        nTris += f.nTriangles();
-    }
-
-    DynamicList<labelledTri> dynTris(nTris);
-    DynamicList<face> tfaces(8);  // work array
-
-    label facei = 0;
-    for (const face& f : pp)
-    {
-        tfaces.clear();
-        f.triangles(points, tfaces);
-
-        for (const auto& t : tfaces)
-        {
-            dynTris.emplace_back(t[0], t[1], t[2], facei);
-        }
-        ++facei;
-    }
-
-    tris.transfer(dynTris);
-}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //

 void Foam::triangulatedPatch::update()
 {
-    triFace_.clear();
-    triWght_.clear();
-
-    triangulate(patch_, triFace_);
-
    const pointField& points = patch_.points();

-    const label myProci = UPstream::myProcNo();
-    const label numProc = UPstream::nProcs();
-
-    // Calculate the cumulative triangle weights
-    triWght_.resize_nocopy(triFace_.size()+1);
-
-    auto iter = triWght_.begin();
+    // Triangulate the patch faces and create addressing
+    DynamicList<label> triToFace(2*patch_.size());
+    DynamicList<face> triFace(2*patch_.size());
+    DynamicList<scalar> triWght(2*patch_.size());
+    DynamicList<face> tris(8);

    // Set zero value at the start of the tri area/weight list
-    scalar patchArea = 0;
-    *iter = patchArea;
-    ++iter;
+    triWght.push_back(0);

-    // Calculate cumulative and total area (processor-local at this point)
-    for (const auto& t : triFace_)
+    forAll(patch_, facei)
    {
-        patchArea += t.mag(points);
+        const face& f = patch_[facei];

-        *iter = patchArea;
-        ++iter;
+        tris.clear();
+        f.triangles(points, tris);
+
+        for (const auto& t : tris)
+        {
+            triToFace.push_back(facei);
+            triFace.push_back(t);
+            triWght.push_back(t.mag(points));
+        }
    }

-    // FIXME: use allGatherList of subslice
-    scalarList procSumWght(numProc+1, Foam::zero{});
-    procSumWght[myProci+1] = patchArea;
+    scalarList procSumWght(Pstream::nProcs()+1, Zero);
+    procSumWght[Pstream::myProcNo()+1] = sum(triWght);
    Pstream::listCombineReduce(procSumWght, maxEqOp<scalar>());

-    // Convert to cumulative
    for (label i = 1; i < procSumWght.size(); ++i)
    {
+        // Convert to cumulative
        procSumWght[i] += procSumWght[i-1];
    }

-    const scalar offset = procSumWght[myProci];
-    const scalar totalArea = procSumWght.back();
-
-    // Apply processor offset and normalise - for a global 0-1 interval
-    for (scalar& w : triWght_)
+    const scalar offset = procSumWght[Pstream::myProcNo()];
+    forAll(triWght, i)
    {
-        w = (w + offset) / totalArea;
+        if (i)
+        {
+            // Convert to cumulative
+            triWght[i] += triWght[i-1];
+        }
+
+        // Apply processor offset
+        triWght[i] += offset;
    }
+
+    // Normalise
+    const scalar sumWght = procSumWght.back();
+    for (scalar& w : triWght)
+    {
+        w /= sumWght;
+    }
+
+    // Transfer to persistent storage
+    triFace_.transfer(triFace);
+    triToFace_.transfer(triToFace);
+    triWght_.transfer(triWght);
 }


@ -213,14 +190,6 @@ bool Foam::triangulatedPatch::randomLocalPoint
    label& celli
 ) const
 {
-    if (triWght_.empty())
-    {
-        result = point::min;
-        facei = -1;
-        celli = -1;
-        return false;
-    }
-
    const scalar c = rnd.position<scalar>(triWght_.front(), triWght_.back());

    return randomPoint(rnd, c, result, facei, celli);
@ -235,23 +204,20 @@ bool Foam::triangulatedPatch::randomGlobalPoint
    label& celli
 ) const
 {
-    if (UPstream::parRun())
+    boolList valid(UPstream::nProcs(), false);
+    valid[UPstream::myProcNo()] = randomLocalPoint(rnd, result, facei, celli);
+    UPstream::listGatherValues(valid);
+
+    forAll(valid, proci)
    {
-        const scalar c = rnd.sample01<scalar>();
-        const bool ok = randomPoint(rnd, c, result, facei, celli);
-
-        boolList valid(UPstream::listGatherValues(ok));
-
-        // Select the first valid processor
-        label proci = valid.find(true);
-        Pstream::broadcast(proci);
-
-        return (proci == UPstream::myProcNo());
-    }
-    else
-    {
-        return randomLocalPoint(rnd, result, facei, celli);
+        // Choose first valid processor
+        if (valid[proci])
+        {
+            return (proci == UPstream::myProcNo());
+        }
    }
+
+    return false;
 }


--- a/src/meshTools/triangulatedPatch/triangulatedPatch.H
+++ b/src/meshTools/triangulatedPatch/triangulatedPatch.H
@ -5,7 +5,7 @@
    \\  /    A nd           | www.openfoam.com
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2023-2024 OpenCFD Ltd.
+    Copyright (C) 2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -35,7 +35,6 @@ Description
 #define Foam_triangulatedPatch_H

 #include "polyMesh.H"
-#include "labelledTri.H"
 #include "Random.H"

 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -56,12 +55,13 @@ class triangulatedPatch
        //- Perturbation tolerance to move the point towards the cell centre
        bool perturbTol_;

-        //- The polyPatch faces as triangles, the index of each corresponds
-        //- to the undecomposed patch face index.
-        List<labelledTri> triFace_;
+        //- Face triangles
+        faceList triFace_;

-        //- The cumulative triangle area per triangle face,
-        //- globally normalised as a 0-1 interval.
+        //- Triangle to patch face addressing
+        labelList triToFace_;
+
+        //- Triangle weights
        scalarList triWght_;


@ -81,11 +81,6 @@ class triangulatedPatch
        ) const;


-    // Static Member Functions
-
-        //- Triangulate the patch faces and create addressing
-        static void triangulate(const polyPatch& pp, List<labelledTri>& tris);
-
 public:

    //- Constructors
--- a/src/optimisation/adjointOptimisation/adjoint/solvers/adjointSolvers/incompressible/incompressibleAdjointSolver/incompressibleAdjointSolver.C
+++ b/src/optimisation/adjointOptimisation/adjoint/solvers/adjointSolvers/incompressible/incompressibleAdjointSolver/incompressibleAdjointSolver.C
@ -420,21 +420,19 @@ void Foam::incompressibleAdjointSolver::accumulateBCSensitivityIntegrand
        fvPatchVectorField& Uab = UaBoundary[patchI];
        if (isA<adjointVectorBoundaryCondition>(Uab))
        {
-            tmp<tensorField> dxdbMult =
-                refCast<adjointVectorBoundaryCondition>(Uab).dxdbMult();
-            if (dxdbMult)
-            {
-                const fvPatch& patch = mesh_.boundary()[patchI];
-                tmp<vectorField> tnf = patch.nf();
-                const scalarField& magSf = patch.magSf();
+            const fvPatch& patch = mesh_.boundary()[patchI];
+            tmp<vectorField> tnf = patch.nf();
+            const scalarField& magSf = patch.magSf();

-                tmp<vectorField> DvDbMult =
-                    nuEffBoundary[patchI]
-                   *(Uab.snGrad() + (gradUabf[patchI] & tnf))
-        //        - (nf*pa.boundaryField()[patchI])
-                  + adjointTurbulence().adjointMomentumBCSource()[patchI];
-                bcDxDbMult()[patchI] += (DvDbMult & dxdbMult())*magSf*dt;
-            }
+            tmp<vectorField> DvDbMult =
+                nuEffBoundary[patchI]*(Uab.snGrad() + (gradUabf[patchI] & tnf))
+    //        - (nf*pa.boundaryField()[patchI])
+              + adjointTurbulence().adjointMomentumBCSource()[patchI];
+            bcDxDbMult()[patchI] +=
+                (
+                    DvDbMult
+                  & refCast<adjointVectorBoundaryCondition>(Uab).dxdbMult()
+                )*magSf*dt;
        }
    }
 }
--- a/src/sampling/sampledSurface/sampledMeshedSurface/sampledMeshedSurfaceTemplates.C
+++ b/src/sampling/sampledSurface/sampledMeshedSurface/sampledMeshedSurfaceTemplates.C
@ -6,7 +6,7 @@
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
    Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2016-2024 OpenCFD Ltd.
+    Copyright (C) 2016-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -39,11 +39,7 @@ Foam::sampledMeshedSurface::sampleOnFaces
 {
    const Type deflt
    (
-        defaultValues_.getOrDefault<Type>
-        (
-            sampler.psi().name(),
-            Foam::zero{}
-        )
+        defaultValues_.getOrDefault<Type>(sampler.psi().name(), Zero)
    );

    const labelList& elements = sampleElements_;
@ -75,16 +71,13 @@ Foam::sampledMeshedSurface::sampleOnFaces

    const polyBoundaryMesh& pbm = mesh().boundaryMesh();

-    Field<Type> bVals(mesh().nBoundaryFaces(), deflt);
+    Field<Type> bVals(mesh().nBoundaryFaces(), Zero);

    const auto& bField = sampler.psi().boundaryField();

    forAll(bField, patchi)
    {
-        // Note: restrict transcribing to actual size of the patch field
-        // - handles "empty" patch type etc.
-        const auto& pfld = bField[patchi];
-        SubList<Type>(bVals, pfld.size(), pbm[patchi].offset()) = pfld;
+        SubList<Type>(bVals, pbm[patchi].range()) = bField[patchi];
    }

    // Sample within the flat boundary field
@ -116,11 +109,7 @@ Foam::sampledMeshedSurface::sampleOnPoints
 {
    const Type deflt
    (
-        defaultValues_.getOrDefault<Type>
-        (
-            interpolator.psi().name(),
-            Foam::zero{}
-        )
+        defaultValues_.getOrDefault<Type>(interpolator.psi().name(), Zero)
    );

    const labelList& elements = sampleElements_;
--- a/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.C
@ -6,7 +6,7 @@
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
    Copyright (C) 2011-2015 OpenFOAM Foundation
-    Copyright (C) 2017-2024 OpenCFD Ltd.
+    Copyright (C) 2017-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -183,6 +183,8 @@ bool Foam::fileFormats::NASsurfaceFormat<Face>::read

    while (is.good())
    {
+        // Parsing position within current line
+        std::string::size_type linei = 0;
        is.getLine(line);

        if (NASCore::debug > 1) Info<< "Process: " << line << nl;
@ -317,30 +319,16 @@ bool Foam::fileFormats::NASsurfaceFormat<Face>::read
            }
        }

-
-        // Parsing position within current line
-        std::string::size_type linei = 0;
-
-        // Is free format if line contains a comma
-        const bool freeFormat = line.contains(',');
-
        // First word (column 0-8)
        const word cmd(word::validate(nextNasField(line, linei, 8)));

        if (cmd == "CTRIA3")
        {
-            // Fixed format:
-            //  8-16 : element id
-            // 16-24 : group id
-            // 24-32 : vertex
-            // 32-40 : vertex
-            // 40-48 : vertex
-
-            label elemId = readLabel(nextNasField(line, linei, 8, freeFormat));
-            label groupId = readLabel(nextNasField(line, linei, 8, freeFormat));
-            const auto a = readLabel(nextNasField(line, linei, 8, freeFormat));
-            const auto b = readLabel(nextNasField(line, linei, 8, freeFormat));
-            const auto c = readLabel(nextNasField(line, linei, 8, freeFormat));
+            label elemId = readLabel(nextNasField(line, linei, 8)); // 8-16
+            label groupId = readLabel(nextNasField(line, linei, 8)); // 16-24
+            const auto a = readLabel(nextNasField(line, linei, 8)); // 24-32
+            const auto b = readLabel(nextNasField(line, linei, 8)); // 32-40
+            const auto c = readLabel(nextNasField(line, linei, 8)); // 40-48

            // Convert groupId into zoneId
            const auto iterZone = zoneLookup.cfind(groupId);
@ -369,20 +357,12 @@ bool Foam::fileFormats::NASsurfaceFormat<Face>::read
        }
        else if (cmd == "CQUAD4")
        {
-            // Fixed format:
-            //  8-16 : element id
-            // 16-24 : group id
-            // 24-32 : vertex
-            // 32-40 : vertex
-            // 40-48 : vertex
-            // 48-56 : vertex
-
-            label elemId = readLabel(nextNasField(line, linei, 8, freeFormat));
-            label groupId = readLabel(nextNasField(line, linei, 8, freeFormat));
-            const auto a = readLabel(nextNasField(line, linei, 8, freeFormat));
-            const auto b = readLabel(nextNasField(line, linei, 8, freeFormat));
-            const auto c = readLabel(nextNasField(line, linei, 8, freeFormat));
-            const auto d = readLabel(nextNasField(line, linei, 8, freeFormat));
+            label elemId = readLabel(nextNasField(line, linei, 8)); // 8-16
+            label groupId = readLabel(nextNasField(line, linei, 8)); // 16-24
+            const auto a = readLabel(nextNasField(line, linei, 8)); // 24-32
+            const auto b = readLabel(nextNasField(line, linei, 8)); // 32-40
+            const auto c = readLabel(nextNasField(line, linei, 8)); // 40-48
+            const auto d = readLabel(nextNasField(line, linei, 8)); // 48-56

            // Convert groupId into zoneId
            const auto iterZone = zoneLookup.cfind(groupId);
@ -426,21 +406,11 @@ bool Foam::fileFormats::NASsurfaceFormat<Face>::read
        }
        else if (cmd == "GRID")
        {
-            // Fixed (short) format:
-            //  8-16 : point id
-            // 16-24 : coordinate system (not supported)
-            // 24-32 : point x coordinate
-            // 32-40 : point y coordinate
-            // 40-48 : point z coordinate
-            // 48-56 : displacement coordinate system (optional, unsupported)
-            // 56-64 : single point constraints (optional, unsupported)
-            // 64-70 : super-element id (optional, unsupported)
-
-            label index = readLabel(nextNasField(line, linei, 8, freeFormat));
-            (void) nextNasField(line, linei, 8, freeFormat);
-            scalar x = readNasScalar(nextNasField(line, linei, 8, freeFormat));
-            scalar y = readNasScalar(nextNasField(line, linei, 8, freeFormat));
-            scalar z = readNasScalar(nextNasField(line, linei, 8, freeFormat));
+            label index = readLabel(nextNasField(line, linei, 8)); // 8-16
+            (void) nextNasField(line, linei, 8); // 16-24
+            scalar x = readNasScalar(nextNasField(line, linei, 8)); // 24-32
+            scalar y = readNasScalar(nextNasField(line, linei, 8)); // 32-40
+            scalar z = readNasScalar(nextNasField(line, linei, 8)); // 40-48

            pointId.push_back(index);
            dynPoints.emplace_back(x, y, z);
@ -453,8 +423,6 @@ bool Foam::fileFormats::NASsurfaceFormat<Face>::read
            // GRID*      126   0 -5.55999875E+02 -5.68730474E+02
            // *         2.14897901E+02

-            // Cannot be long format and free format at the same time!
-
            label index = readLabel(nextNasField(line, linei, 16)); // 8-24
            (void) nextNasField(line, linei, 16); // 24-40
            scalar x = readNasScalar(nextNasField(line, linei, 16)); // 40-56
@ -484,10 +452,7 @@ bool Foam::fileFormats::NASsurfaceFormat<Face>::read
            // have the 'weird' format where the immediately preceeding
            // comment contains the information.

-            // Fixed format:
-            //  8-16 : pshell id
-
-            label groupId = readLabel(nextNasField(line, linei, 8, freeFormat));
+            label groupId = readLabel(nextNasField(line, linei, 8)); // 8-16

            if (lastComment.size() > 1 && !nameLookup.contains(groupId))
            {
--- a/src/surfMesh/writers/nastran/nastranSurfaceWriter.C
+++ b/src/surfMesh/writers/nastran/nastranSurfaceWriter.C
@ -6,7 +6,7 @@
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
    Copyright (C) 2012-2016 OpenFOAM Foundation
-    Copyright (C) 2015-2024 OpenCFD Ltd.
+    Copyright (C) 2015-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -307,10 +307,16 @@ void Foam::surfaceWriters::nastranWriter::writeGeometry
 Foam::surfaceWriters::nastranWriter::nastranWriter()
 :
    surfaceWriter(),
-    writeFormat_(fieldFormat::FREE),
+    writeFormat_(fieldFormat::SHORT),
+    fieldMap_(),
    commonGeometry_(false),
-    separator_(",")  // FREE format
-{}
+    separator_()
+{
+    // if (writeFormat_ == fieldFormat::FREE)
+    // {
+    //     separator_ = ",";
+    // }
+}


 Foam::surfaceWriters::nastranWriter::nastranWriter
@ -325,10 +331,12 @@ Foam::surfaceWriters::nastranWriter::nastranWriter
        (
            "format",
            options,
-            fieldFormat::FREE
+            fieldFormat::LONG
        )
    ),
-    commonGeometry_(options.getOrDefault("commonGeometry", false))
+    fieldMap_(),
+    commonGeometry_(options.getOrDefault("commonGeometry", false)),
+    separator_()
 {
    if (writeFormat_ == fieldFormat::FREE)
    {
--- a/src/surfMesh/writers/nastran/nastranSurfaceWriter.H
+++ b/src/surfMesh/writers/nastran/nastranSurfaceWriter.H
@ -6,7 +6,7 @@
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
    Copyright (C) 2012-2016 OpenFOAM Foundation
-    Copyright (C) 2015-2024 OpenCFD Ltd.
+    Copyright (C) 2015-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -33,13 +33,13 @@ Description
    The formatOptions for nastran:
    \table
        Property    | Description                           | Reqd | Default
-        format      | Nastran format (short/long/free)      | no  | free
+        fields      | Field pairs for PLOAD2/PLOAD4         | yes |
+        format      | Nastran format (short/long/free)      | no  | long
        scale       | Output geometry scaling               | no  | 1
        transform   | Output coordinate transform           | no  |
        fieldLevel  | Subtract field level before scaling   | no  | empty dict
        fieldScale  | Output field scaling                  | no  | empty dict
        commonGeometry | use separate geometry files        | no  | false
-        fields      | Field pairs for PLOAD2/PLOAD4         | yes |
    \endtable

    For example,
@ -48,6 +48,13 @@ Description
    {
        nastran
        {
+            // OpenFOAM field name to NASTRAN load types
+            fields
+            (
+                (pMean  PLOAD2)
+                (p      PLOAD4)
+            );
+
            format  free;     // format type

            scale   1000;     // [m] -> [mm]
@ -55,13 +62,6 @@ Description
            {
               "p.*"   0.01;  // [Pa] -> [mbar]
            }
-
-            // OpenFOAM field name to NASTRAN load types
-            fields
-            (
-                (pMean  PLOAD2)
-                (p      PLOAD4)
-            );
        }
    }
    \endverbatim
@ -93,6 +93,7 @@ Description

 Note
    Output variable scaling does not apply to integer types such as Ids.
+    Field pairs default to PLOAD2 for scalars and PLOAD4 for vectors etc.

 SourceFiles
    nastranSurfaceWriter.C
@ -220,10 +221,10 @@ public:

    // Constructors

-        //- Default construct. Default FREE format
+        //- Default construct. Default SHORT format
        nastranWriter();

-        //- Construct with some output options. Default FREE format
+        //- Construct with some output options. Default LONG format
        explicit nastranWriter(const dictionary& options);

        //- Construct from components
--- a/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/0/muTilda
+++ b/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/0/muTilda
@ -10,11 +10,11 @@ FoamFile
    version     2.0;
    format      ascii;
    class       volScalarField;
-    object      nuTilda;
+    object      muTilda;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

-dimensions      [0 2 -1 0 0 0 0];
+dimensions      [1 -1 -1 0 0 0 0];

 internalField   uniform 0;

--- a/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/system/fvSchemes
+++ b/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/system/fvSchemes
@ -36,7 +36,7 @@ divSchemes

    div(phi,k)      Gauss limitedLinear 1;
    div(phi,B)      Gauss limitedLinear 1;
-    div(phi,nuTilda) Gauss limitedLinear 1;
+    div(phi,muTilda) Gauss limitedLinear 1;
    div(B)          Gauss linear;

    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
@ -57,9 +57,5 @@ snGradSchemes
    default         corrected;
 }

-wallDist
-{
-    method          meshWave;
-}

 // ************************************************************************* //
--- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/Allrun.pre
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/Allrun.pre
@ -13,8 +13,8 @@ rm -rf 0/domain3 constant/domain3 system/domain3
 # Remove fluid fields from solid regions (important for post-processing)
 for region in $(foamListRegions solid)
 do
-    rm -f 0/$region/{rho,nut,alphat,epsilon,k,U,p_rgh,qr,G,IDefault}
-    rm -f processor*/0/$region/{rho,nut,alphat,epsilon,k,U,p_rgh,qr,G,IDefault}
+    rm -f 0/$region/{rho,mut,alphat,epsilon,k,U,p_rgh,qr,G,IDefault}
+    rm -f processor*/0/$region/{rho,mut,alphat,epsilon,k,U,p_rgh,qr,G,IDefault}
 done

 # Set the initial fields
--- a/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/Allrun.pre
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/solarBeamWithTrees/Allrun.pre
@ -15,8 +15,8 @@ rm -rf 0/domain3 constant/domain3 system/domain3
 # Remove fluid fields from solid regions (important for post-processing)
 for region in $(foamListRegions solid)
 do
-    rm -f 0/"$region"/{rho,nut,alphat,epsilon,k,U,p_rgh,qr,G,IDefault}
-    rm -f processor*/0/"$region"/{rho,nut,alphat,epsilon,k,U,p_rgh,qr,G,IDefault}
+    rm -f 0/"$region"/{rho,mut,alphat,epsilon,k,U,p_rgh,qr,G,IDefault}
+    rm -f processor*/0/"$region"/{rho,mut,alphat,epsilon,k,U,p_rgh,qr,G,IDefault}
 done

 # Set the initial fields
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/mut
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/0.orig/cabin/mut
@ -0,0 +1,60 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2312                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      binary;
+    class       volScalarField;
+    object      mut;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [1 -1 -1 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    inlet
+    {
+        type            calculated;
+        value           uniform 0;
+    }
+
+    outlet
+    {
+        type            calculated;
+        value           uniform 0;
+    }
+
+    symmetry
+    {
+        type            symmetryPlane;
+    }
+
+    walls
+    {
+        type            mutkWallFunction;
+        Cmu             0.09;
+        kappa           0.41;
+        E               9.8;
+        value           uniform 0;
+    }
+
+    cabin_to_ice
+    {
+        type            mutkWallFunction;
+        Cmu             0.09;
+        kappa           0.41;
+        E               9.8;
+        value           uniform 0;
+    }
+}
+
+
+// ************************************************************************* //
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/constrained/SQP/system/fvSchemes
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/laminar/opt/constrained/SQP/system/fvSchemes
@ -29,7 +29,8 @@ divSchemes
    default         Gauss linear;

    div(phi,U)      bounded Gauss linearUpwind gradUConv;
-    div(-phi,Ua)    bounded Gauss linearUpwind gradUaConv;
+    div(-phi,Uaas1) bounded Gauss linearUpwind gradUaConv;
+    div(-phi,Uavol) bounded Gauss linearUpwind gradUaConv;

    div((nuEff*dev(grad(U).T()))) Gauss linear;
    div((nuEff*dev(grad(Ua).T()))) Gauss linear;
--- a/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op2/0.orig/U
+++ b/tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op2/0.orig/U
@ -16,7 +16,7 @@ FoamFile

 dimensions      [ 0 1 -1 0 0 0 0 ];

-internalField   uniform ( 4.95 0 0 );
+internalField   uniform ( 0.3 0 0 );

 boundaryField
 {
@ -46,7 +46,7 @@ boundaryField
    Inlet
    {
        type            fixedValue;
-        value           uniform ( 4.95 0 0 );
+        value           uniform ( 0.3 0 0 );
    }

    Outlet
--- a/tutorials/incompressible/adjointOptimisationFoam/topologyOptimisation/monoFluidAero/laminar/1_Inlet_2_Outlet_Dual_Bottleneck/losses-mass-30-70/system/controlDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/topologyOptimisation/monoFluidAero/laminar/1_Inlet_2_Outlet_Dual_Bottleneck/losses-mass-30-70/system/controlDict
@ -22,13 +22,13 @@ startTime       0;

 stopAt          endTime;

-endTime         100;
+endTime         70;

 deltaT          1;

 writeControl    timeStep;

-writeInterval   100;
+writeInterval   70;

 purgeWrite      0;

--- a/tutorials/incompressible/adjointOptimisationFoam/topologyOptimisation/monoFluidAero/laminar/1_Inlet_2_Outlet_Dual_Bottleneck/losses-mass-30-70/system/optimisationDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/topologyOptimisation/monoFluidAero/laminar/1_Inlet_2_Outlet_Dual_Bottleneck/losses-mass-30-70/system/optimisationDict
@ -108,7 +108,7 @@ adjointManagers
                            type              flowRatePartition;
                            inletPatches      (inlet);
                            outletPatches     (outlet outlet-right);
-                            targetFractions   (0.3 0.7);
+                            targetFractions   (0.5 0.5);
                            target            1.e-05;
                            normalize         true;
                        }
--- a/tutorials/incompressible/adjointOptimisationFoam/topologyOptimisation/monoFluidAero/laminar/1_Inlet_2_Outlet_Dual_Bottleneck/losses-mass-70-30/system/optimisationDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/topologyOptimisation/monoFluidAero/laminar/1_Inlet_2_Outlet_Dual_Bottleneck/losses-mass-70-30/system/optimisationDict
@ -108,7 +108,7 @@ adjointManagers
                            type              flowRatePartition;
                            inletPatches      (inlet);
                            outletPatches     (outlet outlet-right);
-                            targetFractions   (0.7 0.3);
+                            targetFractions   (0.5 0.5);
                            target            1.e-05;
                            normalize         true;
                        }
--- a/tutorials/incompressible/adjointOptimisationFoam/topologyOptimisation/monoFluidAero/laminar/3DBox/losses-mass-uniformity-SQP/system/decomposeParDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/topologyOptimisation/monoFluidAero/laminar/3DBox/losses-mass-uniformity-SQP/system/decomposeParDict
@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2306                                 |
+|  \\    /   O peration     | Version:  v2312                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@ -15,11 +15,6 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

 numberOfSubdomains 60;
-method          hierarchical;
-coeffs
-{
-    n              (5 4 3); 
-}
-
+method          scotch;

 // ************************************************************************* //
--- a/tutorials/incompressible/adjointOptimisationFoam/topologyOptimisation/monoFluidAero/laminar/3DBox/losses-mass-uniformity-SQP/system/fvSolution
+++ b/tutorials/incompressible/adjointOptimisationFoam/topologyOptimisation/monoFluidAero/laminar/3DBox/losses-mass-uniformity-SQP/system/fvSolution
@ -29,9 +29,8 @@ solvers
        relTol          0.01;
    }

-    "U|Ua.*"
+    "U|Ua.*"   smoothSolver
    {
-        solver      smoothSolver;
        smoother    GaussSeidel;
        tolerance   1e-12;
        relTol      0.1;
--- a/tutorials/incompressible/adjointOptimisationFoam/topologyOptimisation/monoFluidAero/laminar/3DBox/losses-mass-uniformity/system/decomposeParDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/topologyOptimisation/monoFluidAero/laminar/3DBox/losses-mass-uniformity/system/decomposeParDict
@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2306                                 |
+|  \\    /   O peration     | Version:  v2312                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@ -15,11 +15,6 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

 numberOfSubdomains 60;
-method          hierarchical;
-coeffs
-{
-    n              (5 4 3); 
-}
-
+method          scotch;

 // ************************************************************************* //
--- a/tutorials/incompressible/adjointOptimisationFoam/topologyOptimisation/monoFluidAero/laminar/3DBox/losses-mass-uniformity/system/fvSolution
+++ b/tutorials/incompressible/adjointOptimisationFoam/topologyOptimisation/monoFluidAero/laminar/3DBox/losses-mass-uniformity/system/fvSolution
@ -29,9 +29,8 @@ solvers
        relTol          0.01;
    }

-    "U|Ua.*"
+    "U|Ua.*"   smoothSolver
    {
-        solver      smoothSolver;
        smoother    GaussSeidel;
        tolerance   1e-12;
        relTol      0.1;
--- a/tutorials/incompressible/adjointOptimisationFoam/topologyOptimisation/monoFluidAero/laminar/3DBox/losses-mass/system/decomposeParDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/topologyOptimisation/monoFluidAero/laminar/3DBox/losses-mass/system/decomposeParDict
@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2306                                 |
+|  \\    /   O peration     | Version:  v2312                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@ -15,11 +15,6 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

 numberOfSubdomains 60;
-method          hierarchical;
-coeffs
-{
-    n              (5 4 3); 
-}
-
+method          scotch;

 // ************************************************************************* //
--- a/tutorials/incompressible/adjointOptimisationFoam/topologyOptimisation/monoFluidAero/laminar/3DBox/losses-mass/system/fvSolution
+++ b/tutorials/incompressible/adjointOptimisationFoam/topologyOptimisation/monoFluidAero/laminar/3DBox/losses-mass/system/fvSolution
@ -29,9 +29,8 @@ solvers
        relTol          0.01;
    }

-    "U|Ua.*"
+    "U|Ua.*"   smoothSolver
    {
-        solver      smoothSolver;
        smoother    GaussSeidel;
        tolerance   1e-12;
        relTol      0.1;
--- a/tutorials/incompressible/adjointOptimisationFoam/topologyOptimisation/monoFluidAero/laminar/3DBox/losses/system/decomposeParDict
+++ b/tutorials/incompressible/adjointOptimisationFoam/topologyOptimisation/monoFluidAero/laminar/3DBox/losses/system/decomposeParDict
@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2306                                 |
+|  \\    /   O peration     | Version:  v2312                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@ -15,11 +15,6 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

 numberOfSubdomains 60;
-method          hierarchical;
-coeffs
-{
-    n              (5 4 3); 
-}
-
+method          scotch;

 // ************************************************************************* //
--- a/tutorials/incompressible/adjointOptimisationFoam/topologyOptimisation/monoFluidAero/laminar/3DBox/losses/system/fvSolution
+++ b/tutorials/incompressible/adjointOptimisationFoam/topologyOptimisation/monoFluidAero/laminar/3DBox/losses/system/fvSolution
@ -29,9 +29,8 @@ solvers
        relTol          0.01;
    }

-    "U|Ua.*"
+    "U|Ua.*"   smoothSolver
    {
-        solver      smoothSolver;
        smoother    GaussSeidel;
        tolerance   1e-12;
        relTol      0.1;
--- a/tutorials/incompressible/adjointOptimisationFoam/topologyOptimisation/monoFluidAero/turbulent/1_Inlet_2_Outlet/porosityBased/BP/uniformity-losses/Allrun
+++ b/tutorials/incompressible/adjointOptimisationFoam/topologyOptimisation/monoFluidAero/turbulent/1_Inlet_2_Outlet/porosityBased/BP/uniformity-losses/Allrun
@ -12,7 +12,7 @@ runParallel $(getApplication)
 if [[ ! -z $(which cartesian2DMesh) ]]
 then 
    cd reEval
-        ./AllrunReEval > log.AllrunReEval 2>&1 && echo "End" >> log.AllrunReEval 
+        ./AllrunReEval > log.AllrunReEval 2>&1 & 
    cd ..    
 fi