BUG: globalIndex gather/scatter fails with multi-world (fixes #2706)

- was using UPstream::procIDs(), which returns the sub-ranks with
  respect to the parent communicator. This is normally just an
  identity list (single-world) but with multi-world the indexing
  is incorrect.  Use UPstream::allProcs() instead.

META-INFO/api-info

@@ -1,2 +1,2 @@
 api=2212
-patch=240625
+patch=230110

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;

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);
 }
 
 

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
         {

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]);
         }
     }
 

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();
 

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.

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)
 {

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 * * * * * * * * * * * * * //

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])
         {

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);
 

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

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
         );
 
 

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
             );
     }
 

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;
 

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;
     }

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
 (

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

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

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);
     }
 

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

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
     {

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());
     }
 }
 

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
                     (

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);
 }
 
 

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

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)
     {

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

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);
 }
 
 

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;

tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/controlDict

@@ -61,8 +61,6 @@ functions
         fvOptions
         {
         }
-
-        writeControl    writeTime;
     }
 
     fileUpdate