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

STYLE: use globalPath() instead of path()/".." for parallel

Browse Source
This commit is contained in:
Mark Olesen
2018-12-05 22:54:50 +01:00
parent d3a2544bfa
commit a199fef957
7 changed files with 53 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/OpenFOAM/db/functionObjects/writeFile/writeFile.C
View File

@ -46,18 +46,14 @@ void Foam::functionObjects::writeFile::initStream(Ostream& os) const
Foam::fileName Foam::functionObjects::writeFile::baseFileDir() const
{
fileName baseDir = fileObr_.time().path();
// Put in undecomposed case
// (Note: gives problems for distributed data running)
if (Pstream::parRun())
{
// Put in undecomposed case (Note: gives problems for
// distributed data running)
baseDir = baseDir/".."/functionObject::outputPrefix;
}
else
{
baseDir = baseDir/functionObject::outputPrefix;
}
fileName baseDir =
(
fileObr_.time().globalPath()
/ functionObject::outputPrefix
);
// Append mesh name if not default region
if (isA<polyMesh>(fileObr_))
@ -65,12 +61,11 @@ Foam::fileName Foam::functionObjects::writeFile::baseFileDir() const
const polyMesh& mesh = refCast<const polyMesh>(fileObr_);
if (mesh.name() != polyMesh::defaultRegion)
{
baseDir = baseDir/mesh.name();
baseDir /= mesh.name();
}
}
// Remove any ".."
baseDir.clean();
baseDir.clean(); // Remove unneeded ".."
return baseDir;
}