diff --git a/applications/utilities/miscellaneous/foamFormatConvert/foamFormatConvert.C b/applications/utilities/miscellaneous/foamFormatConvert/foamFormatConvert.C index fb94503d83..7c62e63b15 100644 --- a/applications/utilities/miscellaneous/foamFormatConvert/foamFormatConvert.C +++ b/applications/utilities/miscellaneous/foamFormatConvert/foamFormatConvert.C @@ -364,9 +364,8 @@ int main(int argc, char *argv[]) // Check for lagrangian - stringList lagrangianDirs + const fileName lagrangianDir ( - 1, fileHandler().filePath ( runTime.timePath() @@ -374,6 +373,11 @@ int main(int argc, char *argv[]) / cloud::prefix ) ); + stringList lagrangianDirs + ( + lagrangianDir == fileName::null ? 0 : 1, + lagrangianDir + ); combineReduce(lagrangianDirs, uniqueEqOp()); @@ -394,7 +398,7 @@ int main(int argc, char *argv[]) ( IOobject ( - polyMesh::defaultRegion, + regionName, runTime.timeName(), runTime, Foam::IOobject::MUST_READ diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H index fda4a3beff..be2ce12f9a 100644 --- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H +++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -338,7 +338,7 @@ Foam::ThermoCloud::sigmap() const const scalar f = constProps_.f0(); 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;