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: parallel and xml output for vtk topoSet writers (issue #926)

Browse Source 
- introduce lower-level vtk::indirectPatchWriter class
This commit is contained in:
Mark Olesen
2018-09-17 15:41:58 +02:00
parent 0e47b0717d
commit 0d2dbaf61b
12 changed files with 1251 additions and 350 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
applications/utilities/mesh/manipulation/setSet/setSet.C
View File

@ -43,9 +43,7 @@ Description
#include "topoSetSource.H"
#include "Fstream.H"
#include "demandDrivenData.H"
#include "foamVtkWriteCellSetFaces.H"
#include "foamVtkWriteFaceSet.H"
#include "foamVtkWritePointSet.H"
#include "foamVtkWriteTopoSet.H"
#include "IOobjectList.H"
#include "cellZoneSet.H"
#include "faceZoneSet.H"
@ -70,47 +68,26 @@ using namespace Foam;
void writeVTK
(
const polyMesh& mesh,
const topoSet& currentSet,
const fileName& vtkBaseName
const topoSet& currSet,
const fileName& outputName
)
{
if (isA<faceSet>(currentSet))
{
// Faces of set with OpenFOAM faceID as value
vtk::writeFaceSet
if
(
!vtk::writeTopoSet
(
mesh,
dynamicCast<const faceSet&>(currentSet),
mesh.time().path()/vtkBaseName,
vtk::formatType::LEGACY_BINARY
);
}
else if (isA<cellSet>(currentSet))
{
// External faces of cellset with OpenFOAM cellID as value
vtk::writeCellSetFaces
(
mesh,
dynamicCast<const cellSet&>(currentSet),
mesh.time().path()/vtkBaseName,
vtk::formatType::LEGACY_BINARY
);
}
else if (isA<pointSet>(currentSet))
{
vtk::writePointSet
(
mesh,
dynamicCast<const pointSet&>(currentSet),
mesh.time().path()/vtkBaseName,
vtk::formatType::LEGACY_BINARY
);
}
else
currSet,
vtk::formatType::INLINE_BASE64, // XML-binary
// vtk::formatType::LEGACY_BINARY,
outputName,
false // Not parallel
)
)
{
WarningInFunction
<< "Don't know how to handle set of type " << currentSet.type()
<< endl;
<< "Don't know how to handle set of type "
<< currSet.type() << nl;
}
}
@ -502,35 +479,35 @@ bool doCommand
if (!noSync) currentSet.sync(mesh);
// Write
Info<< " Writing " << currentSet.name()
<< " (size "
<< returnReduce(currentSet.size(), sumOp<label>())
<< ") to "
<< (
currentSet.instance()/currentSet.local()
/ currentSet.name()
);
if (writeVTKFile)
{
mkDir(mesh.time().path()/"VTK"/currentSet.name());
fileName vtkName
fileName outputName
(
"VTK"/currentSet.name()/currentSet.name()
+ "_"
+ name(mesh.time().timeIndex())
mesh.time().path()/"VTK"/currentSet.name()
/ currentSet.name() + "_"
+ Foam::name(mesh.time().timeIndex())
);
mkDir(outputName.path());
Info<< " Writing " << currentSet.name()
<< " (size "
<< returnReduce(currentSet.size(), sumOp<label>())
<< ") to "
<< currentSet.instance()/currentSet.local()
/currentSet.name()
<< " and to vtk file " << vtkName << endl << endl;
Info<< " and to vtk file "
<< outputName.relative(mesh.time().path())
<< nl << nl;
writeVTK(mesh, currentSet, vtkName);
writeVTK(mesh, currentSet, outputName);
}
else
{
Info<< " Writing " << currentSet.name()
<< " (size "
<< returnReduce(currentSet.size(), sumOp<label>())
<< ") to "
<< currentSet.instance()/currentSet.local()
/currentSet.name() << endl << endl;
Info<< nl << nl;
}
if (writeCurrentTime)

50
applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
View File

@ -168,8 +168,7 @@ Note
#include "foamVtkPatchWriter.H"
#include "foamVtkSurfaceMeshWriter.H"
#include "foamVtkLagrangianWriter.H"
#include "foamVtkWriteFaceSet.H"
#include "foamVtkWritePointSet.H"
#include "foamVtkWriteTopoSet.H"
#include "foamVtkWriteSurfFields.H"
#include "memInfo.H"
@ -629,21 +628,25 @@ int main(int argc, char *argv[])
vtuMeshCells.clear();
}
// Attempt topoSets first
bool shortCircuit = false;
// If faceSet: write faceSet only (as polydata)
if (faceSetName.size())
{
// Load the faceSet
// Load
faceSet set(mesh, faceSetName);
// Filename as if patch with same name.
mkDir(fvPath/set.name());
fileName outputName
const fileName outputName
(
fvPath/set.name()/set.name()
+ "_"
+ timeDesc
fvPath/set.name()
/ set.name() + "_" + timeDesc
);
mkDir(outputName.path());
Info<< " faceSet : "
<< outputName.relative(runTime.path()) << nl;
@ -651,27 +654,29 @@ int main(int argc, char *argv[])
(
meshProxy.mesh(),
set,
fmtType,
outputName,
fmtType
false // In parallel (later)
);
continue;
shortCircuit = true;
}
// If pointSet: write pointSet only (as polydata)
if (pointSetName.size())
{
// Load the pointSet
// Load
pointSet set(mesh, pointSetName);
// Filename as if patch with same name.
mkDir(fvPath/set.name());
fileName outputName
const fileName outputName
(
fvPath/set.name()/set.name()
+ "_"
+ timeDesc
fvPath/set.name()
/ set.name() + "_" + timeDesc
);
mkDir(outputName.path());
Info<< " pointSet : "
<< outputName.relative(runTime.path()) << nl;
@ -679,9 +684,16 @@ int main(int argc, char *argv[])
(
meshProxy.mesh(),
set,
fmtType,
outputName,
fmtType
false // In parallel (later)
);
shortCircuit = true;
}
if (shortCircuit)
{
continue;
}