From 8ab09daad0c23f12c28ae4237e3ed99416b2890b Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Mon, 8 Apr 2019 11:53:50 +0200 Subject: [PATCH] BUG: foamToVTK writes to undecomposed case (closes #1271) - when running in serial but within a processor directory, argList::globalPath() is to be used instead of Time.globalPath() For other cases there is no difference. --- .../dataConversion/foamToVTK/convertLagrangian.H | 2 +- .../dataConversion/foamToVTK/convertSurfaceFields.H | 4 ++-- .../dataConversion/foamToVTK/convertTopoSet.H | 4 ++-- .../dataConversion/foamToVTK/convertVolumeFields.H | 6 +++--- .../postProcessing/dataConversion/foamToVTK/foamToVTK.C | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/convertLagrangian.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/convertLagrangian.H index 2719ccc85a..07341e6dad 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/convertLagrangian.H +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/convertLagrangian.H @@ -94,7 +94,7 @@ if (doLagrangian) ); Info<< " Lagrangian: " - << runTime.relativePath(writer.output()) << nl; + << args.relativePath(writer.output()) << nl; writer.writeTimeValue(mesh.time().value()); writer.writeGeometry(); diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/convertSurfaceFields.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/convertSurfaceFields.H index 5ab48ff99d..a35a3de15e 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/convertSurfaceFields.H +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/convertSurfaceFields.H @@ -107,7 +107,7 @@ Description ); Info<< " Surface : " - << runTime.relativePath(writer.output()) << nl; + << args.relativePath(writer.output()) << nl; writer.writeTimeValue(timeValue); @@ -211,7 +211,7 @@ Description ); Info<< " FaceZone : " - << runTime.relativePath(writer.output()) << nl; + << args.relativePath(writer.output()) << nl; writer.beginFile(fz.name()); diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/convertTopoSet.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/convertTopoSet.H index e2a96e898f..270843cf7f 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/convertTopoSet.H +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/convertTopoSet.H @@ -42,7 +42,7 @@ if (faceSetName.size()) ); Info<< " faceSet : " - << runTime.relativePath(outputName) << nl; + << args.relativePath(outputName) << nl; vtk::writeFaceSet ( @@ -70,7 +70,7 @@ if (pointSetName.size()) ); Info<< " pointSet : " - << runTime.relativePath(outputName) << nl; + << args.relativePath(outputName) << nl; vtk::writePointSet ( diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/convertVolumeFields.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/convertVolumeFields.H index 763b3fa3d9..ad4e27ef51 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/convertVolumeFields.H +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/convertVolumeFields.H @@ -113,7 +113,7 @@ Description ); Info<< " Internal : " - << runTime.relativePath(internalWriter->output()) << nl; + << args.relativePath(internalWriter->output()) << nl; internalWriter->writeTimeValue(mesh.time().value()); internalWriter->writeGeometry(); @@ -163,7 +163,7 @@ Description ); Info<< " Boundaries: " - << runTime.relativePath(writer->output()) << nl; + << args.relativePath(writer->output()) << nl; writer->writeTimeValue(timeValue); writer->writeGeometry(); @@ -229,7 +229,7 @@ Description ); Info<< " Boundary : " - << runTime.relativePath(writer->output()) << nl; + << args.relativePath(writer->output()) << nl; writer->writeTimeValue(timeValue); writer->writeGeometry(); diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C index 2d727012ce..9108061b3a 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C @@ -575,7 +575,7 @@ int main(int argc, char *argv[]) fvMeshSubsetProxy::subsetType cellSubsetType = fvMeshSubsetProxy::NONE; - string vtkName = runTime.globalCaseName(); + string vtkName = args.globalCaseName(); if (regionNames.size() == 1) { @@ -628,7 +628,7 @@ int main(int argc, char *argv[]) // Sub-directory for output const word vtkDirName = args.opt("name", "VTK"); - const fileName outputDir(runTime.globalPath()/vtkDirName); + const fileName outputDir(args.globalPath()/vtkDirName); if (Pstream::master()) { @@ -650,7 +650,7 @@ int main(int argc, char *argv[]) if (args.found("overwrite") && isDir(regionDir)) { Info<< "Removing old directory " - << runTime.relativePath(regionDir) + << args.relativePath(regionDir) << nl << endl; rmDir(regionDir); }