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
2022-10-13 12:13:48 +01:00
parent 2972d16653 5b11f5a833
commit 3bde146b47
7 changed files with 49 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/functionObjects/field/layerAverage/layerAverage.C
View File

@ -33,6 +33,7 @@ License
#include "polyTopoChangeMap.H"
#include "polyMeshMap.H"
#include "polyDistributionMap.H"
#include "OSspecific.H"
#include "addToRunTimeSelectionTable.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@ -310,17 +311,18 @@ bool Foam::functionObjects::layerAverage::write()
#undef CollapseTypeFields
}
// Output directory
fileName outputPath =
mesh_.time().globalPath()/writeFile::outputPrefix/name();
if (mesh_.name() != fvMesh::defaultRegion)
{
outputPath = outputPath/mesh_.name();
}
// Write
if (Pstream::master() && layerCentre_.size())
{
// Make output directory
const fileName outputPath =
mesh_.time().globalPath()
/writeFile::outputPrefix
/(mesh_.name() != polyMesh::defaultRegion ? mesh_.name() : word())
/name()
/mesh_.time().timeName();
mkDir(outputPath);
scalarField layerDistance(layerCentre_.size(), 0);
for (label i = 1; i < layerCentre_.size(); ++ i)
{
@ -330,7 +332,7 @@ bool Foam::functionObjects::layerAverage::write()
formatter_->write
(
outputPath/mesh_.time().timeName(),
outputPath,
typeName,
coordSet
(

15
src/functionObjects/field/streamlines/streamlines.C
View File

@ -533,15 +533,12 @@ bool Foam::functionObjects::streamlines::write()
if (Pstream::master() && allPositions.size())
{
// Make output directory
fileName outputPath
(
mesh_.time().globalPath()/writeFile::outputPrefix/name()
);
if (mesh_.name() != fvMesh::defaultRegion)
{
outputPath = outputPath/mesh_.name();
}
outputPath = outputPath/mesh_.time().timeName();
const fileName outputPath =
mesh_.time().globalPath()
/writeFile::outputPrefix
/(mesh_.name() != polyMesh::defaultRegion ? mesh_.name() : word())
/name()
/mesh_.time().timeName();
mkDir(outputPath);
// Pass data to the formatter to write