From a199fef957edffb02dd1b4fe6e71892f31440b8a Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 5 Dec 2018 22:54:50 +0100
Subject: [PATCH] STYLE: use globalPath() instead of path()/".." for parallel
---
.../db/functionObjects/writeFile/writeFile.C | 23 ++++++---------
.../isoAdvection/isoAdvection/isoAdvection.C | 20 +++++--------
.../field/streamLine/streamLineBase.C | 4 +--
.../graphics/runTimePostProcessing/scene.C | 14 ++++-----
.../CloudFunctionObject/CloudFunctionObject.C | 29 +++++++------------
src/sampling/probes/probes.C | 24 +++++++--------
.../sampledSet/sampledSets/sampledSets.C | 28 +++++-------------
7 files changed, 53 insertions(+), 89 deletions(-)
diff --git a/src/OpenFOAM/db/functionObjects/writeFile/writeFile.C b/src/OpenFOAM/db/functionObjects/writeFile/writeFile.C
index 94e02f6b0a9..3f1cc7c0356 100644
--- a/src/OpenFOAM/db/functionObjects/writeFile/writeFile.C
+++ b/src/OpenFOAM/db/functionObjects/writeFile/writeFile.C
@@ -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;
}
diff --git a/src/finiteVolume/fvMatrices/solvers/isoAdvection/isoAdvection/isoAdvection.C b/src/finiteVolume/fvMatrices/solvers/isoAdvection/isoAdvection/isoAdvection.C
index f722a5578e1..91b8cf92a48 100644
--- a/src/finiteVolume/fvMatrices/solvers/isoAdvection/isoAdvection/isoAdvection.C
+++ b/src/finiteVolume/fvMatrices/solvers/isoAdvection/isoAdvection/isoAdvection.C
@@ -968,15 +968,11 @@ void Foam::isoAdvection::writeIsoFaces
if (!writeIsoFacesToFile_ || !mesh_.time().writeTime()) return;
// Writing isofaces to obj file for inspection, e.g. in paraview
- const fileName dirName
+ const fileName outputFile
(
- Pstream::parRun() ?
- mesh_.time().path()/".."/"isoFaces"
- : mesh_.time().path()/"isoFaces"
- );
- const word fName
- (
- word::printf("isoFaces_%012d", mesh_.time().timeIndex())
+ mesh_.time().globalPath()
+ / "isoFaces"
+ / word::printf("isoFaces_%012d.obj", mesh_.time().timeIndex())
);
if (Pstream::parRun())
@@ -988,8 +984,8 @@ void Foam::isoAdvection::writeIsoFaces
if (Pstream::master())
{
- mkDir(dirName);
- OBJstream os(dirName/fName + ".obj");
+ mkDir(outputFile.path());
+ OBJstream os(outputFile);
Info<< nl << "isoAdvection: writing iso faces to file: "
<< os.name() << nl << endl;
@@ -1015,8 +1011,8 @@ void Foam::isoAdvection::writeIsoFaces
}
else
{
- mkDir(dirName);
- OBJstream os(dirName/fName + ".obj");
+ mkDir(outputFile.path());
+ OBJstream os(outputFile);
Info<< nl << "isoAdvection: writing iso faces to file: "
<< os.name() << nl << endl;
diff --git a/src/functionObjects/field/streamLine/streamLineBase.C b/src/functionObjects/field/streamLine/streamLineBase.C
index 86d26c54ecb..2b0665df23d 100644
--- a/src/functionObjects/field/streamLine/streamLineBase.C
+++ b/src/functionObjects/field/streamLine/streamLineBase.C
@@ -646,9 +646,7 @@ bool Foam::functionObjects::streamLineBase::writeToFile()
fileName vtkPath
(
- Pstream::parRun()
- ? time_.path()/".."/functionObject::outputPrefix/"sets"/name()
- : time_.path()/functionObject::outputPrefix/"sets"/name()
+ time_.globalPath()/functionObject::outputPrefix/"sets"/name()
);
if (mesh_.name() != fvMesh::defaultRegion)
{
diff --git a/src/functionObjects/graphics/runTimePostProcessing/scene.C b/src/functionObjects/graphics/runTimePostProcessing/scene.C
index 6af579dff40..63b4542113c 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/scene.C
+++ b/src/functionObjects/graphics/runTimePostProcessing/scene.C
@@ -389,16 +389,12 @@ void Foam::functionObjects::runTimePostPro::scene::saveImage
const Time& runTime = obr_.time();
- const fileName relPath
+ const fileName prefix
(
- functionObject::outputPrefix/name_/obr_.time().timeName()
- );
-
- fileName prefix
- (
- Pstream::parRun() ?
- runTime.path()/".."/relPath
- : runTime.path()/relPath
+ runTime.globalPath()
+ / functionObject::outputPrefix
+ / name_
+ / runTime.timeName()
);
mkDir(prefix);
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.C
index 11edced4d81..f81d689dbcf 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.C
@@ -55,28 +55,21 @@ Foam::CloudFunctionObject<CloudType>::CloudFunctionObject
)
:
CloudSubModelBase<CloudType>(modelName, owner, dict, typeName, objectType),
- outputDir_(owner.mesh().time().path())
+ outputDir_()
{
- const fileName relPath
+ // Put in undecomposed case
+ // (Note: gives problems for distributed data running)
+
+ outputDir_ =
(
- functionObject::outputPrefix
- /cloud::prefix
- /owner.name()
- /this->modelName()
+ owner.mesh().time().globalPath()
+ / functionObject::outputPrefix
+ / cloud::prefix
+ / owner.name()
+ / this->modelName()
);
-
- if (Pstream::parRun())
- {
- // Put in undecomposed case (Note: gives problems for
- // distributed data running)
- outputDir_ = outputDir_/".."/relPath;
- }
- else
- {
- outputDir_ = outputDir_/relPath;
- }
- outputDir_.clean();
+ outputDir_.clean(); // Remove unneeded ".."
}
diff --git a/src/sampling/probes/probes.C b/src/sampling/probes/probes.C
index 9849cc4e292..2035acfe132 100644
--- a/src/sampling/probes/probes.C
+++ b/src/sampling/probes/probes.C
@@ -195,26 +195,24 @@ Foam::label Foam::probes::prepare()
<< endl;
- fileName probeDir;
fileName probeSubDir = name();
if (mesh_.name() != polyMesh::defaultRegion)
{
probeSubDir = probeSubDir/mesh_.name();
}
- probeSubDir =
- functionObject::outputPrefix/probeSubDir/mesh_.time().timeName();
- if (Pstream::parRun())
- {
- // Put in undecomposed case
- // (Note: gives problems for distributed data running)
- probeDir = mesh_.time().path()/".."/probeSubDir;
- }
- else
- {
- probeDir = mesh_.time().path()/probeSubDir;
- }
+ // Put in undecomposed case
+ // (Note: gives problems for distributed data running)
+
+ fileName probeDir =
+ (
+ mesh_.time().globalPath()
+ / functionObject::outputPrefix
+ / probeSubDir
+ / mesh_.time().timeName()
+ );
+
probeDir.clean(); // Remove unneeded ".."
// ignore known fields, close streams for fields that no longer exist
diff --git a/src/sampling/sampledSet/sampledSets/sampledSets.C b/src/sampling/sampledSet/sampledSets/sampledSets.C
index fe00ddd5d8f..7589d5b3df5 100644
--- a/src/sampling/sampledSet/sampledSets/sampledSets.C
+++ b/src/sampling/sampledSet/sampledSets/sampledSets.C
@@ -97,16 +97,10 @@ Foam::sampledSets::sampledSets
interpolationScheme_(word::null),
writeFormat_(word::null)
{
- const fileName relPath(functionObject::outputPrefix/name);
-
- if (Pstream::parRun())
- {
- outputPath_ = mesh_.time().path()/".."/relPath;
- }
- else
- {
- outputPath_ = mesh_.time().path()/relPath;
- }
+ outputPath_ =
+ (
+ mesh_.time().globalPath()/functionObject::outputPrefix/name
+ );
if (mesh_.name() != fvMesh::defaultRegion)
{
@@ -136,16 +130,10 @@ Foam::sampledSets::sampledSets
interpolationScheme_(word::null),
writeFormat_(word::null)
{
- const fileName relPath(functionObject::outputPrefix/name);
-
- if (Pstream::parRun())
- {
- outputPath_ = mesh_.time().path()/".."/relPath;
- }
- else
- {
- outputPath_ = mesh_.time().path()/relPath;
- }
+ outputPath_ =
+ (
+ mesh_.time().globalPath()/functionObject::outputPrefix/name
+ );
if (mesh_.name() != fvMesh::defaultRegion)
{
--
GitLab