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

ENH: simplify use of case-relative paths

Browse Source 
- provide relativePath() for argList and for Time.
  These are relative to the case globalPath().
  Eg,

     Info<< "output: " << runTime.relativePath(outputFile) << nl;
This commit is contained in:
Mark Olesen
2018-12-15 13:26:55 +01:00
parent ce6cd338a8
commit 455c8ef540
24 changed files with 271 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/functionObjects/field/streamLine/streamLineBase.C
View File

@ -786,7 +786,7 @@ bool Foam::functionObjects::streamLineBase::writeToFile()
propsDict.add
(
"file",
scalarVtkFile.relative(time_.globalPath(), true)
time_.relativePath(scalarVtkFile, true)
);
setProperty(fieldName, propsDict);
}
@ -798,7 +798,7 @@ bool Foam::functionObjects::streamLineBase::writeToFile()
propsDict.add
(
"file",
vectorVtkFile.relative(time_.globalPath(), true)
time_.relativePath(vectorVtkFile, true)
);
setProperty(fieldName, propsDict);
}

2
src/functionObjects/lagrangian/dataCloud/dataCloud.C
View File

@ -238,7 +238,7 @@ bool Foam::functionObjects::dataCloud::write()
if (writeCloud(outputName, cloudName))
{
Log << " cloud : "
<< outputName.relative(time_.globalPath()) << endl;
<< time_.relativePath(outputName) << endl;
}
}

7
src/functionObjects/lagrangian/vtkCloud/vtkCloud.C
View File

@ -318,13 +318,12 @@ bool Foam::functionObjects::vtkCloud::writeCloud
// }
// }
// Shorten file name to be case-local and use "<case>" shortcut
// to make the content relocatable
// Case-local file name with "<case>" to make relocatable
dictionary propsDict;
propsDict.add
(
"file",
file.relative(time_.globalPath(), true)
time_.relativePath(file, true)
);
propsDict.add("fields", written);
@ -503,7 +502,7 @@ bool Foam::functionObjects::vtkCloud::write()
if (writeCloud(outputName, cloudName))
{
Log << " cloud : "
<< outputName.relative(time_.globalPath()) << endl;
<< time_.relativePath(outputName) << endl;
if (Pstream::master())
{

6
src/functionObjects/utilities/vtkWrite/vtkWrite.C
View File

@ -380,7 +380,7 @@ bool Foam::functionObjects::vtkWrite::write()
);
Info<< " Internal : "
<< internalWriter->output().relative(time_.globalPath())
<< time_.relativePath(internalWriter->output())
<< endl;
// No sub-block for internal
@ -432,7 +432,7 @@ bool Foam::functionObjects::vtkWrite::write()
);
Info<< " Boundaries: "
<< writer->output().relative(time_.globalPath()) << nl;
<< time_.relativePath(writer->output()) << nl;
writer->writeTimeValue(timeValue);
@ -497,7 +497,7 @@ bool Foam::functionObjects::vtkWrite::write()
);
Info<< " Boundary : "
<< writer->output().relative(time_.globalPath()) << nl;
<< time_.relativePath(writer->output()) << nl;
writer->writeTimeValue(timeValue);
writer->writeGeometry();