diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H index 62e7d42ed1..3446d3fd8e 100644 --- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H +++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H @@ -594,20 +594,22 @@ class vtkPV3Foam vtkMultiBlockDataSet* output ); - //- Point field - all selected parts + //- Point field - all selected parts, use specified display name template void convertPointFieldBlock ( + const word& displayName, const GeometricField&, vtkMultiBlockDataSet* output, const arrayRange&, const List& ); - //- Point fields + //- Point field, use specified display name template void convertPointField ( + const word& displayName, const GeometricField&, const GeometricField&, vtkMultiBlockDataSet* output, @@ -616,11 +618,11 @@ class vtkPV3Foam const polyDecomp& ); - //- Patch point field + //- Patch point field, use specified display name template void convertPatchPointField ( - const word& name, + const word& displayName, const Field&, vtkMultiBlockDataSet* output, const arrayRange&, diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamPointFields.H b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamPointFields.H index a243d81a7c..f762e03530 100644 --- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamPointFields.H +++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamPointFields.H @@ -76,6 +76,7 @@ void Foam::vtkPV3Foam::convertPointFields // Convert activated internalMesh regions convertPointFieldBlock ( + fieldName, ptf, output, arrayRangeVolume_, @@ -85,6 +86,7 @@ void Foam::vtkPV3Foam::convertPointFields // Convert activated cellZones convertPointFieldBlock ( + fieldName, ptf, output, arrayRangeCellZones_, @@ -94,6 +96,7 @@ void Foam::vtkPV3Foam::convertPointFields // Convert activated cellSets convertPointFieldBlock ( + fieldName, ptf, output, arrayRangeCellSets_, @@ -136,6 +139,7 @@ void Foam::vtkPV3Foam::convertPointFields template void Foam::vtkPV3Foam::convertPointFieldBlock ( + const word& displayName, const GeometricField& ptf, vtkMultiBlockDataSet* output, const arrayRange& range, @@ -150,6 +154,7 @@ void Foam::vtkPV3Foam::convertPointFieldBlock { convertPointField ( + displayName, ptf, GeometricField::null(), output, @@ -165,6 +170,7 @@ void Foam::vtkPV3Foam::convertPointFieldBlock template void Foam::vtkPV3Foam::convertPointField ( + const word& displayName, const GeometricField& ptf, const GeometricField& tf, vtkMultiBlockDataSet* output, @@ -192,7 +198,7 @@ void Foam::vtkPV3Foam::convertPointField pointData->SetNumberOfTuples(nPoints + addPointCellLabels.size()); pointData->SetNumberOfComponents(nComp); pointData->Allocate(nComp*(nPoints + addPointCellLabels.size())); - pointData->SetName(ptf.name().c_str()); + pointData->SetName(displayName.c_str()); if (debug) { diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamVolFields.H b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamVolFields.H index cad7ffb011..0046aed0b8 100644 --- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamVolFields.H +++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamVolFields.H @@ -113,8 +113,7 @@ void Foam::vtkPV3Foam::convertVolFields // The name for the interpolated patch point field must be consistent // with the interpolated volume point field. - // This could be done better. - const word pointFldName = "volPointInterpolate(" + tf.name() + ')'; + const word& pointFldName = tf.name(); for ( @@ -276,21 +275,14 @@ void Foam::vtkPV3Foam::convertVolFieldBlock const List& decompLst ) { + const word& pointFldName = tf.name(); + for (int partId = range.start(); partId < range.end(); ++partId) { const label datasetNo = partDataset_[partId]; if (datasetNo >= 0 && partStatus_[partId]) { - convertVolField - ( - tf, - output, - range, - datasetNo, - decompLst[datasetNo] - ); - if (!ptfPtr.valid()) { if (debug) @@ -305,8 +297,18 @@ void Foam::vtkPV3Foam::convertVolFieldBlock ); } + convertVolField + ( + tf, + output, + range, + datasetNo, + decompLst[datasetNo] + ); + convertPointField ( + pointFldName, ptfPtr(), tf, output,