From 9ccae1d37f4ae27a8f5e6f4235c27e19970ef582 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 14 Jan 2019 16:56:55 +0100
Subject: [PATCH] ENH: support procIDs output for vtk::patchWriter
---
.../vtk/output/foamVtkInternalWriter.C | 4 +-
.../vtk/output/foamVtkPatchWriter.C | 234 +++++++++++++++++-
.../vtk/output/foamVtkPatchWriter.H | 10 +-
3 files changed, 244 insertions(+), 4 deletions(-)
diff --git a/src/conversion/vtk/output/foamVtkInternalWriter.C b/src/conversion/vtk/output/foamVtkInternalWriter.C
index 1179b8971fe..392f01b80ee 100644
--- a/src/conversion/vtk/output/foamVtkInternalWriter.C
+++ b/src/conversion/vtk/output/foamVtkInternalWriter.C
@@ -665,9 +665,9 @@ void Foam::vtk::internalWriter::writeCellIDs()
bool Foam::vtk::internalWriter::writeProcIDs()
{
- if (!Pstream::parRun())
+ if (!parallel_)
{
- // Skip serial output (meaningless)
+ // Disabled in serial output (meaningless)
return false;
}
diff --git a/src/conversion/vtk/output/foamVtkPatchWriter.C b/src/conversion/vtk/output/foamVtkPatchWriter.C
index 6b1f796cae4..b47c59cb323 100644
--- a/src/conversion/vtk/output/foamVtkPatchWriter.C
+++ b/src/conversion/vtk/output/foamVtkPatchWriter.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2016-2018 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2016-2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -663,4 +663,236 @@ void Foam::vtk::patchWriter::writePatchIDs()
}
+bool Foam::vtk::patchWriter::writeProcIDs()
+{
+ // This is different than for internalWriter.
+ // Here we allow procIDs whenever running in parallel, even if the
+ // output is serial. This allow diagnosis of processor patches.
+
+ if (!Pstream::parRun())
+ {
+ // Skip in non-parallel
+ return false;
+ }
+
+ if (isState(outputState::CELL_DATA))
+ {
+ ++nCellData_;
+ }
+ else
+ {
+ FatalErrorInFunction
+ << "Bad writer state (" << stateNames[state_]
+ << ") - should be (" << stateNames[outputState::CELL_DATA]
+ << ") for patchID field" << nl << endl
+ << exit(FatalError);
+ }
+
+ label nFaces = nLocalFaces_;
+
+ if (parallel_)
+ {
+ reduce(nFaces, sumOp<label>());
+ }
+
+ if (format_)
+ {
+ if (legacy())
+ {
+ legacy::intField<1>(format(), "procID", nFaces); // 1 component
+ }
+ else
+ {
+ const uint64_t payLoad =
+ vtk::sizeofData<label>(nFaces);
+
+ format().beginDataArray<label>("procID");
+ format().writeSize(payLoad);
+ }
+ }
+
+ bool good = false;
+
+ if (parallel_)
+ {
+ globalIndex procSizes(nLocalFaces_);
+
+ if (Pstream::master())
+ {
+ // Per-processor ids
+ for (label proci=0; proci < Pstream::nProcs(); ++proci)
+ {
+ label len = procSizes.localSize(proci);
+
+ while (len--)
+ {
+ format().write(proci);
+ }
+ }
+
+ good = true;
+ }
+ }
+ else
+ {
+ const label proci = Pstream::myProcNo();
+
+ label len = nLocalFaces_;
+
+ while (len--)
+ {
+ format().write(proci);
+ }
+
+ good = true;
+ }
+
+
+ if (format_)
+ {
+ format().flush();
+ format().endDataArray();
+ }
+
+ // MPI barrier
+ return parallel_ ? returnReduce(good, orOp<bool>()) : good;
+}
+
+
+bool Foam::vtk::patchWriter::writeNeighIDs()
+{
+ if (!Pstream::parRun())
+ {
+ // Skip in non-parallel
+ return false;
+ }
+
+ if (isState(outputState::CELL_DATA))
+ {
+ ++nCellData_;
+ }
+ else
+ {
+ FatalErrorInFunction
+ << "Bad writer state (" << stateNames[state_]
+ << ") - should be (" << stateNames[outputState::CELL_DATA]
+ << ") for patchID field" << nl << endl
+ << exit(FatalError);
+ }
+
+ const polyBoundaryMesh& patches = mesh_.boundaryMesh();
+
+ label nFaces = nLocalFaces_;
+
+ if (parallel_)
+ {
+ reduce(nFaces, sumOp<label>());
+ }
+
+ if (format_)
+ {
+ if (legacy())
+ {
+ legacy::intField<1>(format(), "neighID", nFaces); // 1 component
+ }
+ else
+ {
+ const uint64_t payLoad =
+ vtk::sizeofData<label>(nFaces);
+
+ format().beginDataArray<label>("neighID");
+ format().writeSize(payLoad);
+ }
+ }
+
+ bool good = false;
+
+ if (parallel_ ? Pstream::master() : true)
+ {
+ for (const label patchId : patchIDs_)
+ {
+ label count = patches[patchId].size();
+
+ const auto* pp = isA<processorPolyPatch>(patches[patchId]);
+
+ const label val = (pp ? pp->neighbProcNo() : -1);
+
+ while (count--)
+ {
+ format().write(val);
+ }
+ }
+
+ good = true;
+ }
+
+ if (parallel_)
+ {
+ if (Pstream::master())
+ {
+ labelList recv;
+
+ // Receive each pair
+ for
+ (
+ int slave=Pstream::firstSlave();
+ slave<=Pstream::lastSlave();
+ ++slave
+ )
+ {
+ IPstream fromSlave(Pstream::commsTypes::blocking, slave);
+
+ fromSlave >> recv;
+
+ for (label i=0; i < recv.size(); ++i)
+ {
+ label count = recv[i];
+ ++i;
+ const label val = recv[i];
+
+ while (count--)
+ {
+ format().write(val);
+ }
+ }
+ }
+ }
+ else
+ {
+ // Send to master
+ OPstream toMaster
+ (
+ Pstream::commsTypes::blocking,
+ Pstream::masterNo()
+ );
+
+ labelList send(2*patchIDs_.size());
+
+ // Encode as [size, id] pairs
+ label i = 0;
+ for (const label patchId : patchIDs_)
+ {
+ const auto* pp = isA<processorPolyPatch>(patches[patchId]);
+
+ send[i] = patches[patchId].size();
+ send[i+1] = (pp ? pp->neighbProcNo() : -1);
+
+ i += 2;
+ }
+
+ toMaster << send;
+ }
+ }
+
+ if (format_)
+ {
+ format().flush();
+ format().endDataArray();
+ }
+
+ // MPI barrier
+ return parallel_ ? returnReduce(good, orOp<bool>()) : good;
+}
+
+
// ************************************************************************* //
diff --git a/src/conversion/vtk/output/foamVtkPatchWriter.H b/src/conversion/vtk/output/foamVtkPatchWriter.H
index 3f19285ff0f..4e1b901a0e5 100644
--- a/src/conversion/vtk/output/foamVtkPatchWriter.H
+++ b/src/conversion/vtk/output/foamVtkPatchWriter.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2016-2018 OpenCFD Ltd.
+ \\ / A nd | Copyright (C) 2016-2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -222,6 +222,14 @@ public:
// Must be called within the CELL_DATA state.
void writePatchIDs();
+ //- Write processor ids as CellData. This is no-op in serial.
+ // Must be called within the CELL_DATA state.
+ bool writeProcIDs();
+
+ //- Write processor neighbour ids as CellData. This is no-op in serial.
+ // Must be called within the CELL_DATA state.
+ bool writeNeighIDs();
+
// Write
--
GitLab