COMP: adjust CGAL rule for OSX (#2664 )

COMP: remove commented Make/options item (#2668) COMP: update include for CGAL-5.5 (#2665) old: Robust_circumcenter_filtered_traits_3 new: Robust_weighted_circumcenter_filtered_traits_3
2023-01-11 14:16:18 +01:00
55 changed files with 187 additions and 422 deletions
--- a/META-INFO/api-info
+++ b/META-INFO/api-info
@ -1,2 +1,2 @@
 api=2212
-patch=240625
+patch=230110
--- a/applications/solvers/compressible/rhoPimpleFoam/Make/options
+++ b/applications/solvers/compressible/rhoPimpleFoam/Make/options
@ -9,7 +9,7 @@ EXE_INC = \
    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
-    -I$(LIB_SRC)/regionFaModels/lnInclude
+    -I$(LIB_SRC)/regionFaModels\lnInclude

 EXE_LIBS = \
    -lfiniteVolume \
--- a/applications/solvers/compressible/rhoSimpleFoam/Make/options
+++ b/applications/solvers/compressible/rhoSimpleFoam/Make/options
@ -7,7 +7,7 @@ EXE_INC = \
    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
-    -I$(LIB_SRC)/regionFaModels/lnInclude
+    -I$(LIB_SRC)/regionFaModels\lnInclude

 EXE_LIBS = \
    -lfiniteVolume \
--- a/applications/solvers/heatTransfer/buoyantPimpleFoam/Make/options
+++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/Make/options
@ -10,7 +10,7 @@ EXE_INC = \
    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
    -I$(LIB_SRC)/dynamicMesh/lnInclude \
    -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
-    -I$(LIB_SRC)/regionFaModels/lnInclude
+    -I$(LIB_SRC)/regionFaModels\lnInclude

 EXE_LIBS = \
    -lfiniteVolume \
--- a/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options
+++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options
@ -7,7 +7,7 @@ EXE_INC = \
    -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
-    -I$(LIB_SRC)/regionFaModels/lnInclude
+    -I$(LIB_SRC)/regionFaModels\lnInclude

 EXE_LIBS = \
    -lfiniteVolume \
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options
@ -19,7 +19,7 @@ EXE_INC = \
    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
    -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
    -I$(LIB_SRC)/regionModels/regionModel/lnInclude \
-    -I$(LIB_SRC)/regionFaModels/lnInclude
+    -I$(LIB_SRC)/regionFaModels\lnInclude


 EXE_LIBS = \
--- a/applications/solvers/incompressible/pimpleFoam/Make/options
+++ b/applications/solvers/incompressible/pimpleFoam/Make/options
@ -8,7 +8,7 @@ EXE_INC = \
    -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
    -I$(LIB_SRC)/dynamicMesh/lnInclude \
    -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
-    -I$(LIB_SRC)/regionFaModels/lnInclude
+    -I$(LIB_SRC)/regionFaModels\lnInclude

 EXE_LIBS = \
    -lfiniteVolume \
--- a/etc/caseDicts/postProcessing/solvers/scalarTransport/scalarTransport
+++ b/etc/caseDicts/postProcessing/solvers/scalarTransport/scalarTransport
@ -18,8 +18,6 @@ Description
 type            scalarTransport;
 libs            ("libsolverFunctionObjects.so");

-writeControl    writeTime;
-
 field           s;
 schemesField    s;
 D               1e-09;
--- a/src/OpenFOAM/db/dictionary/functionEntries/evalEntry/evalEntry.C
+++ b/src/OpenFOAM/db/dictionary/functionEntries/evalEntry/evalEntry.C
@ -174,7 +174,7 @@ Foam::tokenList Foam::functionEntries::evalEntry::evaluate
        result.writeField(toks);
    }

-    return tokenList(std::move(toks.tokens()));
+    return std::move(toks);
 }


--- a/src/OpenFOAM/expressions/exprDriver/exprDriverFields.C
+++ b/src/OpenFOAM/expressions/exprDriver/exprDriverFields.C
@ -5,7 +5,7 @@
    \\  /    A nd           | www.openfoam.com
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2019-2023 OpenCFD Ltd.
+    Copyright (C) 2019-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -41,11 +41,9 @@ void Foam::expressions::exprDriver::fill_random
 {
    if (seed <= 0)
    {
-        const TimeState* ts = this->timeState();
-
-        if (ts)
+        if (timeStatePtr_)
        {
-            seed = (ts->timeIndex() - seed);
+            seed = (timeStatePtr_->timeIndex() - seed);
        }
        else
        {
--- a/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.C
+++ b/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.C
@ -152,11 +152,10 @@ slicedBoundaryField
                new SlicedPatchField<Type>
                (
                    mesh.boundary()[patchi],
-                    DimensionedField<Type, GeoMesh>::null()
+                    DimensionedField<Type, GeoMesh>::null(),
+                    bField[patchi]
                )
            );
-
-            bf[patchi].UList<Type>::shallowCopy(bField[patchi]);
        }
    }

--- a/src/OpenFOAM/matrices/Matrix/Matrix.C
+++ b/src/OpenFOAM/matrices/Matrix/Matrix.C
@ -201,8 +201,7 @@ inline Foam::Matrix<Form, Type>::Matrix
 )
 :
    mRows_(Mb.m()),
-    nCols_(Mb.n()),
-    v_(nullptr)
+    nCols_(Mb.n())
 {
    doAlloc();

@ -224,8 +223,7 @@ inline Foam::Matrix<Form, Type>::Matrix
 )
 :
    mRows_(Mb.m()),
-    nCols_(Mb.n()),
-    v_(nullptr)
+    nCols_(Mb.n())
 {
    doAlloc();

--- a/src/OpenFOAM/parallel/globalIndex/globalIndex.H
+++ b/src/OpenFOAM/parallel/globalIndex/globalIndex.H
@ -6,7 +6,7 @@
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
    Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2018-2023 OpenCFD Ltd.
+    Copyright (C) 2018-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -489,12 +489,12 @@ public:

        //- Collect indirect data in processor order on master
        //  Handles contiguous/non-contiguous data, skips empty fields.
-        template<class ProcIDsContainer, class Type, class Addr>
+        template<class Type, class Addr>
        static void gather
        (
            const labelUList& offsets,  //!< offsets (master only)
            const label comm,           //!< communicator
-            const ProcIDsContainer& procIDs,
+            const UList<int>& procIDs,
            const IndirectListBase<Type, Addr>& fld,
            List<Type>& allFld,         //! output field (master only)
            const int tag = UPstream::msgType(),
--- a/src/OpenFOAM/parallel/globalIndex/globalIndexTemplates.C
+++ b/src/OpenFOAM/parallel/globalIndex/globalIndexTemplates.C
@ -6,7 +6,7 @@
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
    Copyright (C) 2013-2017 OpenFOAM Foundation
-    Copyright (C) 2019-2023 OpenCFD Ltd.
+    Copyright (C) 2019-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -248,12 +248,12 @@ void Foam::globalIndex::gather
 }


-template<class ProcIDsContainer, class Type, class Addr>
+template<class Type, class Addr>
 void Foam::globalIndex::gather
 (
    const labelUList& off,  // needed on master only
    const label comm,
-    const ProcIDsContainer& procIDs,
+    const UList<int>& procIDs,
    const IndirectListBase<Type, Addr>& fld,
    List<Type>& allFld,
    const int tag,
@ -368,7 +368,7 @@ void Foam::globalIndex::gather
        (
            offsets_,  // needed on master only
            comm,
-            UPstream::allProcs(comm),   // All communicator ranks
+            UPstream::procID(comm),
            sendData,
            allData,
            tag,
@ -404,7 +404,7 @@ void Foam::globalIndex::gather
        (
            offsets_,  // needed on master only
            comm,
-            UPstream::allProcs(comm),   // All communicator ranks
+            UPstream::procID(comm),
            sendData,
            allData,
            tag,
@ -622,7 +622,7 @@ void Foam::globalIndex::mpiGather
            (
                offsets_,  // needed on master only
                comm,
-                UPstream::allProcs(comm),   // All communicator ranks
+                UPstream::procID(comm),
                sendData,
                allData,
                tag,
@ -967,7 +967,7 @@ void Foam::globalIndex::scatter
        (
            offsets_,  // needed on master only
            comm,
-            UPstream::allProcs(comm),  // All communicator ranks
+            UPstream::procID(comm),
            allData,
            localData,
            tag,
--- a/src/OpenFOAM/primitives/Tensor/TensorI.H
+++ b/src/OpenFOAM/primitives/Tensor/TensorI.H
@ -409,10 +409,6 @@ inline Foam::Tensor<Cmpt> Foam::Tensor<Cmpt>::T() 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>::inner(const Tensor<Cmpt>& t2) const
 {
@ -436,10 +432,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
 {
@ -875,10 +867,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)
 {
@ -893,10 +881,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)
 {
@ -911,10 +895,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)
 {
@ -937,10 +917,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)
 {
@ -981,10 +957,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/OpenFOAM/primitives/strings/word/word.C
+++ b/src/OpenFOAM/primitives/strings/word/word.C
@ -29,7 +29,6 @@ License
 #include "word.H"
 #include "debug.H"
 #include <cctype>
-#include <cstdint>
 #include <sstream>

 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
--- a/src/Pstream/mpi/UPstream.C
+++ b/src/Pstream/mpi/UPstream.C
@ -641,16 +641,7 @@ void Foam::UPstream::freePstreamCommunicator(const label communicator)
    }

    // Not touching the first two communicators (SELF, WORLD)
-    // or anything out-of bounds.
-    //
-    // No UPstream communicator indices when MPI is initialized outside
-    // of OpenFOAM - thus needs a bounds check too!
-
-    if
-    (
-        communicator > 1
-     && (communicator < PstreamGlobals::MPICommunicators_.size())
-    )
+    if (communicator > 1)
    {
        if (MPI_COMM_NULL != PstreamGlobals::MPICommunicators_[communicator])
        {
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModels.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModels.C
@ -6,7 +6,7 @@
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
    Copyright (C) 2013-2016 OpenFOAM Foundation
-    Copyright (C) 2022-2023 OpenCFD Ltd.
+    Copyright (C) 2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -131,9 +131,6 @@ makeLESModel(dynamicKEqn);
 #include "dynamicLagrangian.H"
 makeLESModel(dynamicLagrangian);

-#include "sigma.H"
-makeLESModel(sigma);
-
 #include "SpalartAllmarasDES.H"
 makeLESModel(SpalartAllmarasDES);

--- a/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/Casson/Casson.C
+++ b/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/Casson/Casson.C
@ -79,8 +79,8 @@ bool Foam::laminarModels::generalizedNewtonianViscosityModels::Casson::read

    coeffs.readEntry("m", m_);
    coeffs.readEntry("tau0", tau0_);
-    coeffs.readEntry("nuMin", nuMin_);
-    coeffs.readEntry("nuMax", nuMax_);
+    coeffs.readEntry("nuMin_", nuMin_);
+    coeffs.readEntry("nuMax_", nuMax_);

    return true;
 }
--- 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-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -122,8 +122,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;
@ -131,23 +130,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);
 }


@ -244,8 +235,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-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -48,6 +48,7 @@ SourceFiles

 namespace Foam
 {
+
 namespace fileFormats
 {

@ -73,18 +74,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
@ -92,20 +93,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
@ -135,9 +135,8 @@ int Foam::fileFormats::STLCore::detectBinaryHeader

        bad =
            (
-                dataFileSize < STLHeaderSize
-             || nTris < (dataFileSize - STLHeaderSize)/50
-             || nTris > (dataFileSize - STLHeaderSize)/25
+                nTris < int(dataFileSize - STLHeaderSize)/50
+             || nTris > int(dataFileSize - STLHeaderSize)/25
            );
    }

@ -209,9 +208,8 @@ Foam::fileFormats::STLCore::readBinaryHeader

        bad =
            (
-                dataFileSize < STLHeaderSize
-             || nTris < (dataFileSize - STLHeaderSize)/50
-             || nTris > (dataFileSize - STLHeaderSize)/25
+                nTris < int(dataFileSize - STLHeaderSize)/50
+             || nTris > int(dataFileSize - STLHeaderSize)/25
            );
    }

--- a/src/finiteArea/faMesh/faBoundaryMesh/faBoundaryMesh.C
+++ b/src/finiteArea/faMesh/faBoundaryMesh/faBoundaryMesh.C
@ -6,7 +6,7 @@
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
    Copyright (C) 2016-2017 Wikki Ltd
-    Copyright (C) 2018-2023 OpenCFD Ltd.
+    Copyright (C) 2018-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -180,26 +180,12 @@ Foam::faBoundaryMesh::faBoundaryMesh

 void Foam::faBoundaryMesh::calcGeometry()
 {
-    // processor initGeometry send/recv the following:
-    //   - edgeCentres() : faMesh::edgeCentres()
-    //   - edgeLengths() : faMesh::Le()
-    //   - edgeFaceCentres() : faMesh::areaCentres()
-    //
-    // faMesh::Le() has its own point-to-point communication (OK) but
-    // triggers either/or edgeAreaNormals(), pointAreaNormals()
-    // with their own communication that can block.
-
+    // processorFaPatch geometry triggers calculation of pointNormals.
    // This uses parallel comms and hence will not be trigggered
    // on processors that do not have a processorFaPatch so instead
    // force construction.
-
-    (void)mesh_.edgeAreaNormals();
    (void)mesh_.pointAreaNormals();

-    (void)mesh_.areaCentres();
-    (void)mesh_.faceAreaNormals();
-
-
    PstreamBuffers pBufs(Pstream::defaultCommsType);

    if
@ -787,15 +773,12 @@ bool Foam::faBoundaryMesh::checkDefinition(const bool report) const

 void Foam::faBoundaryMesh::movePoints(const pointField& p)
 {
-    // See comments in calcGeometry()
-
-    (void)mesh_.edgeAreaNormals();
+    // processorFaPatch geometry triggers calculation of pointNormals.
+    // This uses parallel comms and hence will not be trigggered
+    // on processors that do not have a processorFaPatch so instead
+    // force construction.
    (void)mesh_.pointAreaNormals();

-    (void)mesh_.areaCentres();
-    (void)mesh_.faceAreaNormals();
-
-
    PstreamBuffers pBufs(Pstream::defaultCommsType);

    if
--- a/src/finiteArea/faMesh/faMesh.C
+++ b/src/finiteArea/faMesh/faMesh.C
@ -6,7 +6,7 @@
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
    Copyright (C) 2016-2017 Wikki Ltd
-    Copyright (C) 2020-2023 OpenCFD Ltd.
+    Copyright (C) 2020-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -277,27 +277,6 @@ void Foam::faMesh::clearOut() const

 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //

-void Foam::faMesh::syncGeom()
-{
-    if (UPstream::parRun())
-    {
-        // areaCentres()
-        if (faceCentresPtr_)
-        {
-            faceCentresPtr_->boundaryFieldRef()
-                .evaluateCoupled<processorFaPatch>();
-        }
-
-        // faceAreaNormals()
-        if (faceAreaNormalsPtr_)
-        {
-            faceAreaNormalsPtr_->boundaryFieldRef()
-                .evaluateCoupled<processorFaPatch>();
-        }
-    }
-}
-
-
 bool Foam::faMesh::init(const bool doInit)
 {
    if (doInit)
@ -317,7 +296,18 @@ bool Foam::faMesh::init(const bool doInit)
    // Calculate the geometry for the patches (transformation tensors etc.)
    boundary_.calcGeometry();

-    syncGeom();
+    // Ensure processor/processor information is properly synchronised
+    if (Pstream::parRun())
+    {
+        const_cast<areaVectorField&>(areaCentres()).boundaryFieldRef()
+            .evaluateCoupled<processorFaPatch>();
+
+        // This roughly corresponds to what OpenFOAM-v2112 (and earlier) had,
+        // but should nominally be unnecessary.
+        //
+        /// const_cast<areaVectorField&>(faceAreaNormals()).boundaryFieldRef()
+        ///     .evaluateCoupled<processorFaPatch>();
+    }

    return false;
 }
@ -999,6 +989,7 @@ bool Foam::faMesh::movePoints()

    clearGeomNotAreas();

+    // To satisfy the motion interface for MeshObject, const cast is needed
    if (patchPtr_)
    {
        patchPtr_->movePoints(newPoints);
@ -1012,8 +1003,6 @@ bool Foam::faMesh::movePoints()

    // Note: Fluxes were dummy?

-    syncGeom();
-
    return true;
 }

--- a/src/finiteArea/faMesh/faMesh.H
+++ b/src/finiteArea/faMesh/faMesh.H
@ -6,7 +6,7 @@
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
    Copyright (C) 2016-2017 Wikki Ltd
-    Copyright (C) 2021-2023 OpenCFD Ltd.
+    Copyright (C) 2021-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -617,10 +617,6 @@ public:
        //- Initialise non-demand-driven data etc
        bool init(const bool doInit);

-        //- Processor/processor synchronisation for geometry fields.
-        //  Largely internal use only (slightly hacky).
-        void syncGeom();
-

    // Database

--- a/src/finiteArea/faMesh/faMeshDemandDrivenData.C
+++ b/src/finiteArea/faMesh/faMeshDemandDrivenData.C
@ -898,12 +898,6 @@ void Foam::faMesh::calcFaceCentres() const
            }
        }
    }
-
-    // Parallel consistency, exchange on processor patches
-    if (UPstream::parRun())
-    {
-        centres.boundaryFieldRef().evaluateCoupled<processorFaPatch>();
-    }
 }


@ -1116,12 +1110,6 @@ void Foam::faMesh::calcFaceAreaNormals() const
                = edgeNormalsBoundary[patchi];
        }
    }
-
-    // Parallel consistency, exchange on processor patches
-    if (UPstream::parRun())
-    {
-        faceNormals.boundaryFieldRef().evaluateCoupled<processorFaPatch>();
-    }
 }


--- a/src/finiteArea/faMesh/faMeshTools/faMeshTools.C
+++ b/src/finiteArea/faMesh/faMeshTools/faMeshTools.C
@ -6,7 +6,7 @@
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
    Copyright (C) 2012-2016 OpenFOAM Foundation
-    Copyright (C) 2015-2023 OpenCFD Ltd.
+    Copyright (C) 2015-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -61,8 +61,6 @@ void Foam::faMeshTools::forceDemandDriven(faMesh& mesh)
    (void)mesh.pointAreaNormals();
    (void)mesh.faceCurvatures();
    (void)mesh.edgeTransformTensors();
-
-    mesh.syncGeom();
 }


--- a/src/functionObjects/field/expressions/fvExpressionField.C
+++ b/src/functionObjects/field/expressions/fvExpressionField.C
@ -389,7 +389,7 @@ bool Foam::functionObjects::fvExpressionField::read(const dictionary& dict)
    }

    autowrite_ = dict.getOrDefault("autowrite", false);
-    store_ = dict.getOrDefault("store", true);
+    store_ = dict.getOrDefault("autowrite", true);

    // "dimensions" is optional
    dimensions_.clear();
--- a/src/functionObjects/utilities/ensightWrite/ensightWriteUpdate.C
+++ b/src/functionObjects/utilities/ensightWrite/ensightWriteUpdate.C
@ -103,7 +103,7 @@ bool Foam::functionObjects::ensightWrite::readSelection(const dictionary& dict)
    selectFields_.uniq();

    blockFields_.clear();
-    dict.readIfPresent("excludeFields", blockFields_);
+    dict.readIfPresent("blockFields", blockFields_);
    blockFields_.uniq();

    // Actions to define selection
--- a/src/fvOptions/corrections/limitVelocity/limitVelocity.C
+++ b/src/fvOptions/corrections/limitVelocity/limitVelocity.C
@ -6,7 +6,7 @@
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
    Copyright (C) 2016-2017 OpenFOAM Foundation
-    Copyright (C) 2018-2023 OpenCFD Ltd.
+    Copyright (C) 2018-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -71,7 +71,7 @@ Foam::fv::limitVelocity::limitVelocity
 :
    fv::cellSetOption(name, modelType, dict, mesh),
    writeFile(mesh, name, typeName, dict, false),
-    UName_("U"),
+    UName_(word::null),
    max_(0)
 {
    read(dict);
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectedParticleDistributionInjection/InjectedParticleDistributionInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectedParticleDistributionInjection/InjectedParticleDistributionInjection.C
@ -179,7 +179,7 @@ void Foam::InjectedParticleDistributionInjection<CloudType>::initialise()
                sumPow3 += pow3(diameters[particlei]);
            }

-            const scalar volume = sumPow3*mathematical::pi/6.0;
+            const scalar volume = sumPow3*mathematical::pi/16.0;
            sumVolume += volume;
            volumeFlowRate_[injectori] = volume/dTime;

--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectedParticleInjection/InjectedParticleInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectedParticleInjection/InjectedParticleInjection.C
@ -119,7 +119,7 @@ void Foam::InjectedParticleInjection<CloudType>::initialise()
    scalar sumVolume = 0;
    forAll(volume, i)
    {
-        scalar vol = pow3(diameter_[i])*mathematical::pi/6.0;
+        scalar vol = pow3(diameter_[i])*mathematical::pi/16.0;
        volume[i] = vol;
        sumVolume += vol;
    }
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C
@ -6,7 +6,7 @@
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
    Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2019-2023 OpenCFD Ltd.
+    Copyright (C) 2019-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -62,53 +62,6 @@ Foam::ThermoSurfaceFilm<CloudType>::ThermoSurfaceFilm

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

-template<class CloudType>
-template<class filmType>
-void Foam::ThermoSurfaceFilm<CloudType>::absorbInteraction
-(
-    filmType& film,
-    const parcelType& p,
-    const polyPatch& pp,
-    const label facei,
-    const scalar mass,
-    bool& keepParticle
-)
-{
-    DebugInfo<< "Parcel " << p.origId() << " absorbInteraction" << endl;
-
-    // Patch face normal
-    const vector& nf = pp.faceNormals()[facei];
-
-    // Patch velocity
-    const vector& Up = this->owner().U().boundaryField()[pp.index()][facei];
-
-    // Relative parcel velocity
-    const vector Urel(p.U() - Up);
-
-    // Parcel normal velocity
-    const vector Un(nf*(Urel & nf));
-
-    // Parcel tangential velocity
-    const vector Ut(Urel - Un);
-
-    film.addSources
-    (
-        pp.index(),
-        facei,
-        mass,                             // mass
-        mass*Ut,                          // tangential momentum
-        mass*mag(Un),                     // impingement pressure
-        mass*p.hs()                       // energy
-    );
-
-    this->nParcelsTransferred()++;
-
-    this->totalMassTransferred() += mass;
-
-    keepParticle = false;
-}
-
-
 template<class CloudType>
 bool Foam::ThermoSurfaceFilm<CloudType>::transferParcel
 (
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.H
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.H
@ -6,7 +6,7 @@
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
    Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2021-2023 OpenCFD Ltd.
+    Copyright (C) 2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -143,21 +143,6 @@ public:

    // Member Functions

-        // Interaction models
-
-            //- Absorb parcel into film
-            template<class filmType>
-            void absorbInteraction
-            (
-                filmType&,
-                const parcelType& p,
-                const polyPatch& pp,
-                const label facei,
-                const scalar mass,
-                bool& keepParticle
-            );
-
-
        // Evaluation

            //- Transfer parcel from cloud to surface film
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.C
@ -1368,7 +1368,6 @@ Foam::label Foam::snappyRefineDriver::refinementInterfaceRefine
                                (
                                    face2i != facei
                                 && surfaceIndex[face2i] != -1
-                                 && cutter.faceLevel(face2i) > cLevel
                                )
                                {
                                    // Get outwards pointing normal
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/faceAreaWeightAMI/faceAreaWeightAMI.C
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/faceAreaWeightAMI/faceAreaWeightAMI.C
@ -269,8 +269,7 @@ bool Foam::faceAreaWeightAMI::setNextFaces
        return false;
    }

-    const auto& srcPatch = this->srcPatch();
-    const labelList& srcNbrFaces = srcPatch.faceFaces()[srcFacei];
+    const labelList& srcNbrFaces = this->srcPatch().faceFaces()[srcFacei];

    // Initialise tgtFacei
    tgtFacei = -1;
@ -361,7 +360,6 @@ bool Foam::faceAreaWeightAMI::setNextFaces
    {
        FatalErrorInFunction
            << "Unable to set target face for source face " << srcFacei
-            << " with centre: " << srcPatch.faceCentres()[srcFacei]
            << abort(FatalError);
    }

--- a/src/meshTools/coordSet/writers/vtk/foamVtkCoordSetWriter.C
+++ b/src/meshTools/coordSet/writers/vtk/foamVtkCoordSetWriter.C
@ -80,19 +80,6 @@ void Foam::vtk::coordSetWriter::beginPiece()
        }
    }

-    // Update sizes, similar to
-    // vtk::polyWriter::beginPiece(const pointField&, const edgeList&)
-
-    numberOfPoints_ = nLocalPoints_;
-    numberOfCells_  = nLocalLines_;
-
-    // if (parallel_)
-    // {
-    //     reduce(numberOfPoints_, sumOp<label>());
-    //     reduce(numberOfCells_,  sumOp<label>());
-    // }
-
-
    // Nothing else to do for legacy
    if (legacy()) return;

@ -101,7 +88,7 @@ void Foam::vtk::coordSetWriter::beginPiece()
        format().openTag
        (
            vtk::fileTag::PIECE,
-            vtk::fileAttr::NUMBER_OF_POINTS, numberOfPoints_
+            vtk::fileAttr::NUMBER_OF_POINTS, nLocalPoints_
        );
        if (nLocalVerts_)
        {
@ -118,7 +105,7 @@ void Foam::vtk::coordSetWriter::beginPiece()

 void Foam::vtk::coordSetWriter::writePoints()
 {
-    this->beginPoints(numberOfPoints_);  //<- same as nLocalPoints_
+    this->beginPoints(nLocalPoints_);

    {
        for (const pointField& pts : points_)
--- 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,66 +94,38 @@ 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, freeFormat));
-            label b = readLabel(nextNasField(line, linei, 8, freeFormat));
+            label a = readLabel(nextNasField(line, linei, 8)); // 24-32
+            label b = readLabel(nextNasField(line, linei, 8)); // 32-40

            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.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, 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.append(index);
            dynPoints.append(point(x, y, z));
@ -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
--- a/src/meshTools/output/vtk/topoSet/foamVtkWritePointSet.C
+++ b/src/meshTools/output/vtk/topoSet/foamVtkWritePointSet.C
@ -155,7 +155,7 @@ bool Foam::vtk::writePointSet

    if (parallel)
    {
-        vtk::writeListParallel(format.ref(), mesh.points(), pointLabels);
+        vtk::writeListParallel(format(), mesh.points(), pointLabels);
    }
    else
    {
--- a/src/optimisation/adjointOptimisation/adjoint/ATCModel/ATCUaGradU/ATCUaGradU.C
+++ b/src/optimisation/adjointOptimisation/adjoint/ATCModel/ATCUaGradU/ATCUaGradU.C
@ -5,8 +5,8 @@
    \\  /    A nd           | www.openfoam.com
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2007-2023 PCOpt/NTUA
-    Copyright (C) 2013-2023 FOSS GP
+    Copyright (C) 2007-2021 PCOpt/NTUA
+    Copyright (C) 2013-2021 FOSS GP
    Copyright (C) 2019 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
@ -86,9 +86,10 @@ void ATCUaGradU::addATC(fvVectorMatrix& UaEqn)
    if (extraConvection_ > 0)
    {
        // Implicit part added to increase diagonal dominance
-        UaEqn += ATClimiter_*extraConvection_*fvm::div(-phi, Ua);
+        // Note: Maybe this needs to be multiplied with the ATClimiter ??
+        UaEqn += extraConvection_*fvm::div(-phi, Ua);

-        // Correct rhs due to implicitly augmenting the adjoint convection
+        // correct rhs due to implicitly augmenting the adjoint convection
        ATC_ += extraConvection_*(fvc::grad(UaForATC(), "gradUaATC")().T() & U);
    }

--- a/src/optimisation/adjointOptimisation/adjoint/ATCModel/ATCstandard/ATCstandard.C
+++ b/src/optimisation/adjointOptimisation/adjoint/ATCModel/ATCstandard/ATCstandard.C
@ -5,8 +5,8 @@
    \\  /    A nd           | www.openfoam.com
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2007-2023 PCOpt/NTUA
-    Copyright (C) 2013-2023 FOSS GP
+    Copyright (C) 2007-2021 PCOpt/NTUA
+    Copyright (C) 2013-2021 FOSS GP
    Copyright (C) 2019 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
@ -90,9 +90,10 @@ void ATCstandard::addATC(fvVectorMatrix& UaEqn)
    if (extraConvection_ > 0)
    {
        // Implicit part added to increase diagonal dominance
-        UaEqn += ATClimiter_*extraConvection_*fvm::div(-phi, Ua);
+        // Note: Maybe this needs to be multiplied with the ATClimiter ??
+        UaEqn += extraConvection_*fvm::div(-phi, Ua);

-        // Correct rhs due to implicitly augmenting the adjoint convection
+        // correct rhs due to implicitly augmenting the adjoint convection
        ATC_ += extraConvection_*(fvc::grad(Ua, "gradUaATC")().T() & U);
    }

--- a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
+++ b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
@ -1949,7 +1949,7 @@ Foam::distributedTriSurfaceMesh::independentlyDistributedBbs
 //        //globalBorderTris.gather
 //        //(
 //        //    UPstream::worldComm,
-//        //    UPstream::allProcs(UPstream::worldComm),
+//        //    UPstream::procID(Pstream::worldComm),
 //        //    globalBorderCentres
 //        //);
 //        pointField globalBorderCentres(allCentres);
@ -1996,7 +1996,7 @@ Foam::distributedTriSurfaceMesh::independentlyDistributedBbs
 //        //globalBorderTris.scatter
 //        //(
 //        //    UPstream::worldComm,
-//        //    UPstream::allProcs(UPstream::worldComm),
+//        //    UPstream::procID(Pstream::worldComm),
 //        //    isMasterPoint
 //        //);
 //        //boolList isMasterBorder(s.size(), false);
@ -2094,7 +2094,7 @@ Foam::distributedTriSurfaceMesh::independentlyDistributedBbs
            globalTris().gather
            (
                UPstream::worldComm,
-                UPstream::allProcs(UPstream::worldComm),
+                UPstream::procID(Pstream::worldComm),
                allCentres
            );
        }
@ -2144,7 +2144,7 @@ Foam::distributedTriSurfaceMesh::independentlyDistributedBbs
            globalTris().scatter
            (
                UPstream::worldComm,
-                UPstream::allProcs(UPstream::worldComm),
+                UPstream::procID(Pstream::worldComm),
                allDistribution,
                distribution
            );
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.C
@ -75,7 +75,7 @@ alphatPhaseChangeWallFunctionFvPatchScalarField

    if (dict.found("mDotL"))
    {
-        mDotL_ = scalarField("mDotL", dict, p.size());
+        dmdt_ = scalarField("mDotL", dict, p.size());
    }
 }

--- a/src/sampling/meshToMesh/meshToMeshTemplates.C
+++ b/src/sampling/meshToMesh/meshToMeshTemplates.C
@ -834,15 +834,15 @@ Foam::meshToMesh::mapTgtToSrc
        label srcPatchi = srcPatchID_[i];
        label tgtPatchi = tgtPatchID_[i];

-        if (!srcPatchFields.set(srcPatchi))
+        if (!srcPatchFields.set(tgtPatchi))
        {
            srcPatchFields.set
            (
                srcPatchi,
                fvPatchField<Type>::New
                (
-                    tgtBfld[tgtPatchi],
-                    srcMesh.boundary()[srcPatchi],
+                    tgtBfld[srcPatchi],
+                    srcMesh.boundary()[tgtPatchi],
                    DimensionedField<Type, volMesh>::null(),
                    directFvPatchFieldMapper
                    (
--- a/src/surfMesh/readers/boundary/boundaryDataSurfaceReaderTemplates.C
+++ b/src/surfMesh/readers/boundary/boundaryDataSurfaceReaderTemplates.C
@ -88,7 +88,7 @@ Foam::boundaryDataSurfaceReader::readField
 {
    refPtr<Time> timePtr(Time::New(argList::envGlobalPath()));

-    return readField<Type>(*timePtr, baseDir, timeDir, fieldName, avg);
+    return readField<Type>(baseDir, timeDir, fieldName, avg);
 }


--- a/src/surfMesh/readers/ensight/ensightSurfaceReaderTemplates.C
+++ b/src/surfMesh/readers/ensight/ensightSurfaceReaderTemplates.C
@ -82,7 +82,7 @@ Foam::tmp<Foam::Field<Type>> Foam::ensightSurfaceReader::readField
        }

        // Check that data type is as expected
-        // (assuming OpenFOAM generated the data set)
+        // (assumes OpenFOAM generated the data set)
        string primitiveType;
        is.read(primitiveType);

@ -90,8 +90,7 @@ Foam::tmp<Foam::Field<Type>> Foam::ensightSurfaceReader::readField

        if
        (
-            debug
-         && primitiveType != ensightPTraits<Type>::typeName
+            primitiveType != ensightPTraits<Type>::typeName
         && primitiveType != pTraits<Type>::typeName
        )
        {
--- 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-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -149,6 +149,7 @@ bool Foam::fileFormats::NASsurfaceFormat<Face>::read
    string line;
    while (is.good())
    {
+        string::size_type linei = 0;  // Parsing position within current line
        is.getLine(line);

        // ANSA extension
@ -222,30 +223,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);
@ -274,20 +261,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);
@ -331,21 +310,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.append(index);
            dynPoints.append(point(x, y, z));
@ -358,8 +327,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
--- 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/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.C
+++ b/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.C
@ -128,7 +128,7 @@ Foam::scalar Foam::ReversibleReaction
    const scalarField& c
 ) const
 {
-    return kfwd/max(this->Kc(p, T), VSMALL);
+    return kfwd/max(this->Kc(p, T), 1e-6);
 }


--- a/src/transportModels/incompressible/viscosityModels/Casson/Casson.C
+++ b/src/transportModels/incompressible/viscosityModels/Casson/Casson.C
@ -119,8 +119,8 @@ bool Foam::viscosityModels::Casson::read

    CassonCoeffs_.readEntry("m", m_);
    CassonCoeffs_.readEntry("tau0", tau0_);
-    CassonCoeffs_.readEntry("nuMin", nuMin_);
-    CassonCoeffs_.readEntry("nuMax", nuMax_);
+    CassonCoeffs_.readEntry("nuMin_", nuMin_);
+    CassonCoeffs_.readEntry("nuMax_", nuMax_);

    return true;
 }
--- a/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/scalarTransport
+++ b/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/scalarTransport
@ -7,7 +7,7 @@ tracer0
    log   off;

    resetOnStartUp  false;
-    writeControl    writeTime;
+    // writeControl    writeTime;
    // writeInterval   1;
    field           tracer0;
    D               0.001;
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/controlDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/controlDict
@ -61,8 +61,6 @@ functions
        fvOptions
        {
        }
-
-        writeControl    writeTime;
    }

    fileUpdate
--- a/wmake/rules/darwin64Clang/cgal
+++ b/wmake/rules/darwin64Clang/cgal
@ -0,0 +1,9 @@
+# ----------------------------------------------------------------------------
+# CGAL on Darwin - without mpfr
+# older CGAL (library version)
+# newer CGAL (header version)
+
+# include $(GENERAL_RULES)/cgal-no-mpfr
+include $(GENERAL_RULES)/cgal-header-no-mpfr
+
+# ----------------------------------------------------------------------------
--- a/wmake/rules/linux64Mingw/c++
+++ b/wmake/rules/linux64Mingw/c++
@ -35,7 +35,6 @@ LINKLIBSO   = $(CC) $(c++FLAGS) -shared \
    -Wl,--strip-all

 LINKEXE     = $(CC) $(c++FLAGS) \
-    -static-libgcc -static-libstdc++ \
    -Wl,--enable-auto-import \
    -Wl,--strip-all \
    -Wl,--force-exe-suffix