Merge remote-tracking branch 'origin/master' into develop

src/OpenFOAM/db/dictionary/functionEntries/evalEntry/evalEntry.C

@@ -174,7 +174,7 @@ Foam::tokenList Foam::functionEntries::evalEntry::evaluate
         result.writeField(toks);
     }
 
-    return std::move(toks);
+    return tokenList(std::move(toks.tokens()));
 }
 
 

src/OpenFOAM/matrices/Matrix/Matrix.C

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

src/OpenFOAM/primitives/strings/word/word.C

@@ -29,8 +29,8 @@ License
 #include "word.H"
 #include "debug.H"
 #include <cctype>
-#include <sstream>
 #include <cstdint>
+#include <sstream>
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 

src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModels.C

@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2013-2016 OpenFOAM Foundation
-    Copyright (C) 2022 OpenCFD Ltd.
+    Copyright (C) 2022-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -131,6 +131,9 @@ makeLESModel(dynamicKEqn);
 #include "dynamicLagrangian.H"
 makeLESModel(dynamicLagrangian);
 
+#include "sigma.H"
+makeLESModel(sigma);
+
 #include "SpalartAllmarasDES.H"
 makeLESModel(SpalartAllmarasDES);
 

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/16.0;
+            const scalar volume = sumPow3*mathematical::pi/6.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/16.0;
+        scalar vol = pow3(diameter_[i])*mathematical::pi/6.0;
         volume[i] = vol;
         sumVolume += vol;
     }

src/meshTools/AMIInterpolation/AMIInterpolation/faceAreaWeightAMI/faceAreaWeightAMI.C

@@ -270,7 +270,8 @@ bool Foam::faceAreaWeightAMI::setNextFaces
         return false;
     }
 
-    const labelList& srcNbrFaces = this->srcPatch().faceFaces()[srcFacei];
+    const auto& srcPatch = this->srcPatch();
+    const labelList& srcNbrFaces = srcPatch.faceFaces()[srcFacei];
 
     // Initialise tgtFacei
     tgtFacei = -1;
@@ -361,6 +362,7 @@ bool Foam::faceAreaWeightAMI::setNextFaces
     {
         FatalErrorInFunction
             << "Unable to set target face for source face " << srcFacei
+            << " with centre: " << srcPatch.faceCentres()[srcFacei]
             << abort(FatalError);
     }
 

src/meshTools/output/vtk/topoSet/foamVtkWritePointSet.C

@@ -155,7 +155,7 @@ bool Foam::vtk::writePointSet
 
     if (parallel)
     {
-        vtk::writeListParallel(format(), mesh.points(), pointLabels);
+        vtk::writeListParallel(format.ref(), mesh.points(), pointLabels);
     }
     else
     {

src/surfMesh/readers/boundary/boundaryDataSurfaceReaderTemplates.C

@@ -88,7 +88,7 @@ Foam::boundaryDataSurfaceReader::readField
 {
     refPtr<Time> timePtr(Time::New(argList::envGlobalPath()));
 
-    return readField<Type>(baseDir, timeDir, fieldName, avg);
+    return readField<Type>(*timePtr, baseDir, timeDir, fieldName, avg);
 }
 
 

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), 1e-6);
+    return kfwd/max(this->Kc(p, T), VSMALL);
 }