diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
index 602f68b2d048f973828d76498e5838c988f76dac..dcf612a663ef2440b4b53943ce2c3ab24f4ab796 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
@@ -341,6 +341,7 @@ int main(int argc, char *argv[])
#include "createTime.H"
+ const bool decomposePoly = !args.optionFound("poly");
const bool doWriteInternal = !args.optionFound("noInternal");
const bool doFaceZones = !args.optionFound("noFaceZones");
const bool doLinks = !args.optionFound("noLinks");
@@ -349,7 +350,7 @@ int main(int argc, char *argv[])
const bool noLagrangian = args.optionFound("noLagrangian");
// Decomposition of polyhedral cells into tets/pyramids cells
- vtkTopo::decomposePoly = !args.optionFound("poly");
+ vtkTopo::decomposePoly = decomposePoly;
if (binary && (sizeof(floatScalar) != 4 || sizeof(label) != 4))
{
@@ -410,8 +411,6 @@ int main(int argc, char *argv[])
args.optionReadIfPresent("pointSet", pointSetName);
- instantList timeDirs = timeSelector::select0(runTime, args);
-
#include "createNamedMesh.H"
// VTK/ directory in the case
@@ -449,6 +448,9 @@ int main(int argc, char *argv[])
mkDir(fvPath);
+ instantList timeDirs = timeSelector::select0(runTime, args);
+
+
// Mesh wrapper: does subsetting and decomposition
vtkMesh vMesh(mesh, cellSetName);
@@ -492,7 +494,7 @@ int main(int argc, char *argv[])
// Filename as if patch with same name.
mkDir(fvPath/set.name());
- fileName patchFileName
+ fileName outputName
(
fvPath/set.name()/set.name()
+ "_"
@@ -500,12 +502,12 @@ int main(int argc, char *argv[])
+ ".vtk"
);
- Info<< " FaceSet : " << patchFileName << endl;
-
- writeFaceSet(binary, vMesh.mesh(), set, patchFileName);
+ Info<< " faceSet : " << outputName << endl;
+ writeFaceSet(binary, vMesh.mesh(), set, outputName);
continue;
}
+
// If pointSet: write pointSet only (as polydata)
if (pointSetName.size())
{
@@ -515,7 +517,7 @@ int main(int argc, char *argv[])
// Filename as if patch with same name.
mkDir(fvPath/set.name());
- fileName patchFileName
+ fileName outputName
(
fvPath/set.name()/set.name()
+ "_"
@@ -523,10 +525,9 @@ int main(int argc, char *argv[])
+ ".vtk"
);
- Info<< " pointSet : " << patchFileName << endl;
-
- writePointSet(binary, vMesh.mesh(), set, patchFileName);
+ Info<< " pointSet : " << outputName << endl;
+ writePointSet(binary, vMesh.mesh(), set, outputName);
continue;
}
@@ -868,11 +869,11 @@ int main(int argc, char *argv[])
{
mkDir(fvPath/"allPatches");
- fileName patchFileName;
+ fileName outputName;
if (vMesh.useSubMesh())
{
- patchFileName =
+ outputName =
fvPath/"allPatches"/cellSetName
+ "_"
+ timeDesc
@@ -880,21 +881,21 @@ int main(int argc, char *argv[])
}
else
{
- patchFileName =
+ outputName =
fvPath/"allPatches"/"allPatches"
+ "_"
+ timeDesc
+ ".vtk";
}
- Info<< " Combined patches : " << patchFileName << endl;
+ Info<< " Combined patches : " << outputName << endl;
patchWriter writer
(
vMesh.mesh(),
binary,
nearCellValue,
- patchFileName,
+ outputName,
getSelectedPatches(patches, excludePatches)
);
@@ -946,11 +947,11 @@ int main(int argc, char *argv[])
{
mkDir(fvPath/pp.name());
- fileName patchFileName;
+ fileName outputName;
if (vMesh.useSubMesh())
{
- patchFileName =
+ outputName =
fvPath/pp.name()/cellSetName
+ "_"
+ timeDesc
@@ -958,22 +959,22 @@ int main(int argc, char *argv[])
}
else
{
- patchFileName =
+ outputName =
fvPath/pp.name()/pp.name()
+ "_"
+ timeDesc
+ ".vtk";
}
- Info<< " Patch : " << patchFileName << endl;
+ Info<< " Patch : " << outputName << endl;
patchWriter writer
(
vMesh.mesh(),
binary,
nearCellValue,
- patchFileName,
- labelList(1, patchi)
+ outputName,
+ labelList{patchi}
);
if (!isA<emptyPolyPatch>(pp))
@@ -1068,11 +1069,11 @@ int main(int argc, char *argv[])
mkDir(fvPath/fz.name());
- fileName patchFileName;
+ fileName outputName;
if (vMesh.useSubMesh())
{
- patchFileName =
+ outputName =
fvPath/fz.name()/cellSetName
+ "_"
+ timeDesc
@@ -1080,14 +1081,14 @@ int main(int argc, char *argv[])
}
else
{
- patchFileName =
+ outputName =
fvPath/fz.name()/fz.name()
+ "_"
+ timeDesc
+ ".vtk";
}
- Info<< " FaceZone : " << patchFileName << endl;
+ Info<< " FaceZone : " << outputName << endl;
indirectPrimitivePatch pp
(
@@ -1100,7 +1101,7 @@ int main(int argc, char *argv[])
binary,
pp,
fz.name(),
- patchFileName
+ outputName
);
// Number of fields
@@ -1131,14 +1132,13 @@ int main(int argc, char *argv[])
// Always create the cloud directory.
mkDir(fvPath/cloud::prefix/cloudName);
- fileName lagrFileName
+ fileName outputName
(
fvPath/cloud::prefix/cloudName/cloudName
+ "_" + timeDesc + ".vtk"
);
- Info<< " Lagrangian: " << lagrFileName << endl;
-
+ Info<< " Lagrangian: " << outputName << endl;
IOobjectList sprayObjs
(
@@ -1189,7 +1189,7 @@ int main(int argc, char *argv[])
(
vMesh.mesh(),
binary,
- lagrFileName,
+ outputName,
cloudName,
false
);
@@ -1219,7 +1219,7 @@ int main(int argc, char *argv[])
(
vMesh.mesh(),
binary,
- lagrFileName,
+ outputName,
cloudName,
true
);
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeFuns.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeFuns.H
index 1776eefe09e86d88737c60edc70f1f3cbf37bbcd..60fe2a6d01034da4ee0de19da4cecd93b346e354 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeFuns.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeFuns.H
@@ -104,6 +104,7 @@ public:
//- Append elements to DynamicList
static void insert(const labelList&, DynamicList<label>&);
+
template<class Type>
static void insert(const List<Type>&, DynamicList<floatScalar>&);
@@ -140,36 +141,6 @@ public:
const vtkMesh&
);
- //- Write generic GeometricFields
- template<class Type, template<class> class PatchField, class GeoMesh>
- static void write
- (
- std::ostream&,
- const bool binary,
- const PtrList<GeometricField<Type, PatchField, GeoMesh>>&,
- const vtkMesh&
- );
-
- //- Write generic dimensioned internal fields
- template<class Type>
- static void write
- (
- std::ostream&,
- const bool binary,
- const PtrList<DimensionedField<Type, volMesh>>&,
- const vtkMesh&
- );
-
- //- Interpolate and write volFields
- template<class Type>
- static void write
- (
- std::ostream&,
- const bool binary,
- const volPointInterpolation&,
- const PtrList<GeometricField<Type, fvPatchField, volMesh>>&,
- const vtkMesh&
- );
};
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeFunsTemplates.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeFunsTemplates.C
index a6778a461c3ff444769191591dc2648f019797a1..8929a1ad80eeab28e2509d1964b2f6d22d3a18a5 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeFunsTemplates.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeFunsTemplates.C
@@ -43,22 +43,6 @@ void Foam::writeFuns::insert
}
-//// Store List (indexed through map) in dest
-//template<class Type>
-//void Foam::writeFuns::insert
-//(
-// const labelList& map,
-// const List<Type>& source,
-// DynamicList<floatScalar>& dest
-//)
-//{
-// forAll(map, i)
-// {
-// insert(source[map[i]], dest);
-// }
-//}
-
-
template<class Type>
void Foam::writeFuns::write
(
@@ -159,53 +143,4 @@ void Foam::writeFuns::write
}
-template<class Type, template<class> class PatchField, class GeoMesh>
-void Foam::writeFuns::write
-(
- std::ostream& os,
- const bool binary,
- const PtrList<GeometricField<Type, PatchField, GeoMesh>>& flds,
- const vtkMesh& vMesh
-)
-{
- forAll(flds, i)
- {
- write(os, binary, flds[i].dimensionedInternalField(), vMesh);
- }
-}
-
-
-template<class Type>
-void Foam::writeFuns::write
-(
- std::ostream& os,
- const bool binary,
- const PtrList<DimensionedField<Type, volMesh>>& flds,
- const vtkMesh& vMesh
-)
-{
- forAll(flds, i)
- {
- write(os, binary, flds[i], vMesh);
- }
-}
-
-
-template<class Type>
-void Foam::writeFuns::write
-(
- std::ostream& os,
- const bool binary,
- const volPointInterpolation& pInterp,
- const PtrList<GeometricField<Type, fvPatchField, volMesh>>& flds,
- const vtkMesh& vMesh
-)
-{
- forAll(flds, i)
- {
- write(os, binary, flds[i], pInterp.interpolate(flds[i])(), vMesh);
- }
-}
-
-
// ************************************************************************* //