diff --git a/src/OpenFOAM/db/dictionary/functionEntries/evalEntry/evalEntry.C b/src/OpenFOAM/db/dictionary/functionEntries/evalEntry/evalEntry.C index 1efaa7790c..a95a7191d6 100644 --- 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 std::move(toks); + return tokenList(std::move(toks.tokens())); } diff --git a/src/OpenFOAM/matrices/Matrix/Matrix.C b/src/OpenFOAM/matrices/Matrix/Matrix.C index a0234a9d39..8dc780a6ad 100644 --- a/src/OpenFOAM/matrices/Matrix/Matrix.C +++ b/src/OpenFOAM/matrices/Matrix/Matrix.C @@ -201,7 +201,8 @@ inline Foam::Matrix::Matrix ) : mRows_(Mb.m()), - nCols_(Mb.n()) + nCols_(Mb.n()), + v_(nullptr) { doAlloc(); @@ -223,7 +224,8 @@ inline Foam::Matrix::Matrix ) : mRows_(Mb.m()), - nCols_(Mb.n()) + nCols_(Mb.n()), + v_(nullptr) { doAlloc(); diff --git a/src/OpenFOAM/primitives/strings/word/word.C b/src/OpenFOAM/primitives/strings/word/word.C index a1a66656d8..556efdc475 100644 --- a/src/OpenFOAM/primitives/strings/word/word.C +++ b/src/OpenFOAM/primitives/strings/word/word.C @@ -29,8 +29,8 @@ License #include "word.H" #include "debug.H" #include -#include #include +#include // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModels.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModels.C index 7b2b78cd8e..2c002892b7 100644 --- 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 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); diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectedParticleDistributionInjection/InjectedParticleDistributionInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectedParticleDistributionInjection/InjectedParticleDistributionInjection.C index 3cdad615ab..8bc762c114 100644 --- 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::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; diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectedParticleInjection/InjectedParticleInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectedParticleInjection/InjectedParticleInjection.C index 76e05f08fa..cd3f5ae344 100644 --- 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::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; } diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/faceAreaWeightAMI/faceAreaWeightAMI.C b/src/meshTools/AMIInterpolation/AMIInterpolation/faceAreaWeightAMI/faceAreaWeightAMI.C index 1a7c197aee..a762bd7110 100644 --- a/src/meshTools/AMIInterpolation/AMIInterpolation/faceAreaWeightAMI/faceAreaWeightAMI.C +++ b/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); } diff --git a/src/meshTools/output/vtk/topoSet/foamVtkWritePointSet.C b/src/meshTools/output/vtk/topoSet/foamVtkWritePointSet.C index 41d5e17892..3a1e6847c7 100644 --- 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(), mesh.points(), pointLabels); + vtk::writeListParallel(format.ref(), mesh.points(), pointLabels); } else { diff --git a/src/surfMesh/readers/boundary/boundaryDataSurfaceReaderTemplates.C b/src/surfMesh/readers/boundary/boundaryDataSurfaceReaderTemplates.C index 66b7bb226b..c19b7cf05c 100644 --- a/src/surfMesh/readers/boundary/boundaryDataSurfaceReaderTemplates.C +++ b/src/surfMesh/readers/boundary/boundaryDataSurfaceReaderTemplates.C @@ -88,7 +88,7 @@ Foam::boundaryDataSurfaceReader::readField { refPtr