zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com-OpenFOAM:OpenFOAM/OpenFOAM-dev

Browse Source
This commit is contained in:
Henry Weller
2019-07-19 23:38:44 +01:00
parent 5e7895daf0 7e65281f60
commit 5c49d24b7d
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
applications/utilities/miscellaneous/foamFormatConvert/foamFormatConvert.C
View File

@ -364,9 +364,8 @@ int main(int argc, char *argv[])
// Check for lagrangian // Check for lagrangian
stringList lagrangianDirs const fileName lagrangianDir
( (
1,
fileHandler().filePath fileHandler().filePath
( (
runTime.timePath() runTime.timePath()
@ -374,6 +373,11 @@ int main(int argc, char *argv[])
/ cloud::prefix / cloud::prefix
) )
); );
stringList lagrangianDirs
(
lagrangianDir == fileName::null ? 0 : 1,
lagrangianDir
);
combineReduce(lagrangianDirs, uniqueEqOp()); combineReduce(lagrangianDirs, uniqueEqOp());
@ -394,7 +398,7 @@ int main(int argc, char *argv[])
( (
IOobject IOobject
( (
polyMesh::defaultRegion, regionName,
runTime.timeName(), runTime.timeName(),
runTime, runTime,
Foam::IOobject::MUST_READ Foam::IOobject::MUST_READ

4
src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -338,7 +338,7 @@ Foam::ThermoCloud<CloudType>::sigmap() const
const scalar f = constProps_.f0(); const scalar f = constProps_.f0();
const scalarField& sumAreaP = radAreaP_->field(); const scalarField& sumAreaP = radAreaP_->field();
sigmap *= sumAreaP*(1.0 - f)*(1.0 - epsilon)/V/dt; sigmap = sumAreaP*(1.0 - f)*(1.0 - epsilon)/V/dt;
} }
return tsigmap; return tsigmap;