zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mark Olesen
2022-08-19 12:50:50 +02:00
parent 1e02a4ae92 b6a6e40c27
commit 5218bfd721
12 changed files with 125 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/functionObjects/field/binField/binModels/binModel/binModel.C
View File

@ -148,6 +148,11 @@ Foam::binModel::binModel
bool Foam::binModel::read(const dictionary& dict)
{
if (!functionObjects::writeFile::read(dict))
{
return false;
}
patchSet_ = mesh_.boundaryMesh().patchSet(dict.get<wordRes>("patches"));
fieldNames_ = dict.get<wordHashSet>("fields").sortedToc();

9
src/functionObjects/field/binField/binModels/singleDirectionUniformBin/singleDirectionUniformBinTemplates.C
View File

@ -104,7 +104,7 @@ bool Foam::binModels::singleDirectionUniformBin::processField
return false;
}
if (Pstream::master() && !writtenHeader_)
if (writeToFile() && !writtenHeader_)
{
writeFileHeader<Type>(filePtrs_[fieldi]);
}
@ -183,7 +183,12 @@ bool Foam::binModels::singleDirectionUniformBin::processField
}
}
if (Pstream::master())
for (auto& binList : data)
{
reduce(binList, sumOp<List<Type>>());
}
if (writeToFile())
{
writeBinnedData(data, filePtrs_[fieldi]);
}

9
src/functionObjects/field/binField/binModels/uniformBin/uniformBinTemplates.C
View File

@ -98,7 +98,7 @@ bool Foam::binModels::uniformBin::processField(const label fieldi)
return false;
}
if (Pstream::master() && !writtenHeader_)
if (writeToFile() && !writtenHeader_)
{
writeFileHeader<Type>(filePtrs_[fieldi]);
}
@ -166,7 +166,12 @@ bool Foam::binModels::uniformBin::processField(const label fieldi)
}
}
if (Pstream::master())
for (auto& binList : data)
{
reduce(binList, sumOp<List<Type>>());
}
if (writeToFile())
{
writeBinnedData(data, filePtrs_[fieldi]);
}