From eeac186f9f3b10f138f445fb38bbbf6f4ffd80cb Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Wed, 14 Nov 2012 11:24:21 +0000
Subject: [PATCH] BUG: paraFoam: pointFields not on faceZones
---
.../PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H | 7 --
.../PV3FoamReader/vtkPV3Foam/vtkPV3FoamMesh.C | 3 +-
.../vtkPV3Foam/vtkPV3FoamMeshZone.C | 74 +------------------
.../vtkPV3Foam/vtkPV3FoamPointFields.H | 38 +++++++++-
4 files changed, 40 insertions(+), 82 deletions(-)
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H
index 397dc7ecc2e..363f09d7f3c 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H
@@ -446,13 +446,6 @@ class vtkPV3Foam
template<class PatchType>
vtkPolyData* patchVTKMesh(const word& name, const PatchType&);
- //- Add face zone mesh
- vtkPolyData* faceZoneVTKMesh
- (
- const fvMesh&,
- const labelList& faceLabels
- );
-
//- Add point zone
vtkPolyData* pointZoneVTKMesh
(
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMesh.C b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMesh.C
index b229da94790..b80acb49499 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMesh.C
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMesh.C
@@ -450,7 +450,8 @@ void Foam::vtkPV3Foam::convertMeshFaceZones
<< zoneName << endl;
}
- vtkPolyData* vtkmesh = faceZoneVTKMesh(mesh, zMesh[zoneId]);
+ vtkPolyData* vtkmesh = patchVTKMesh(zoneName, zMesh[zoneId]());
+
if (vtkmesh)
{
AddToBlock(output, vtkmesh, range, datasetNo, zoneName);
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshZone.C b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshZone.C
index 28a1fd4c5f4..bfa3e1acc90 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshZone.C
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshZone.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -35,78 +35,6 @@ License
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-vtkPolyData* Foam::vtkPV3Foam::faceZoneVTKMesh
-(
- const fvMesh& mesh,
- const labelList& faceLabels
-)
-{
- vtkPolyData* vtkmesh = vtkPolyData::New();
-
- if (debug)
- {
- Info<< "<beg> Foam::vtkPV3Foam::faceZoneVTKMesh" << endl;
- printMemory();
- }
-
- // Construct primitivePatch of faces in faceZone
-
- const faceList& meshFaces = mesh.faces();
- faceList patchFaces(faceLabels.size());
- forAll(faceLabels, faceI)
- {
- patchFaces[faceI] = meshFaces[faceLabels[faceI]];
- }
- primitiveFacePatch p(patchFaces, mesh.points());
-
-
- // The balance of this routine should be identical to patchVTKMesh
-
- // Convert OpenFOAM mesh vertices to VTK
- const pointField& points = p.localPoints();
-
- vtkPoints* vtkpoints = vtkPoints::New();
- vtkpoints->Allocate(points.size());
- forAll(points, i)
- {
- vtkInsertNextOpenFOAMPoint(vtkpoints, points[i]);
- }
-
- vtkmesh->SetPoints(vtkpoints);
- vtkpoints->Delete();
-
-
- // Add faces as polygons
- const faceList& faces = p.localFaces();
-
- vtkCellArray* vtkcells = vtkCellArray::New();
- vtkcells->Allocate(faces.size());
-
- forAll(faces, faceI)
- {
- const face& f = faces[faceI];
- vtkIdType nodeIds[f.size()];
-
- forAll(f, fp)
- {
- nodeIds[fp] = f[fp];
- }
- vtkcells->InsertNextCell(f.size(), nodeIds);
- }
-
- vtkmesh->SetPolys(vtkcells);
- vtkcells->Delete();
-
- if (debug)
- {
- Info<< "<end> Foam::vtkPV3Foam::faceZoneVTKMesh" << endl;
- printMemory();
- }
-
- return vtkmesh;
-}
-
-
vtkPolyData* Foam::vtkPV3Foam::pointZoneVTKMesh
(
const fvMesh& mesh,
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamPointFields.H b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamPointFields.H
index 78582fe7e37..e74937cd2f7 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamPointFields.H
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamPointFields.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -129,6 +129,42 @@ void Foam::vtkPV3Foam::convertPointFields
datasetNo
);
}
+
+ //
+ // Convert faceZones - if activated
+ //
+ for
+ (
+ int partId = arrayRangeFaceZones_.start();
+ partId < arrayRangeFaceZones_.end();
+ ++partId
+ )
+ {
+ const word zoneName = getPartName(partId);
+ const label datasetNo = partDataset_[partId];
+ const label zoneId = mesh.faceZones().findZoneID(zoneName);
+
+ if (!partStatus_[partId] || datasetNo < 0 || zoneId < 0)
+ {
+ continue;
+ }
+
+ // Extract the field on the zone
+ Field<Type> fld
+ (
+ ptf.internalField(),
+ mesh.faceZones()[zoneId]().meshPoints()
+ );
+
+ convertPatchPointField
+ (
+ fieldName,
+ fld,
+ output,
+ arrayRangeFaceZones_,
+ datasetNo
+ );
+ }
}
}
--
GitLab