From 10c81a6e0c6540398fe64da362aff9cfe0ecd580 Mon Sep 17 00:00:00 2001 From: henry Date: Mon, 28 Jun 2010 11:48:39 +0100 Subject: [PATCH] PV3FoamReader: Use the vol-field name rather than volPointInterpolate for the VTK point fields --- .../PV3FoamReader/vtkPV3Foam/vtkPV3FoamPointFields.H | 5 ++++- .../PV3FoamReader/vtkPV3Foam/vtkPV3FoamVolFields.H | 10 ++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamPointFields.H b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamPointFields.H index a243d81a7c..c8e9dd2925 100644 --- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamPointFields.H +++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamPointFields.H @@ -192,7 +192,10 @@ void Foam::vtkPV3Foam::convertPointField pointData->SetNumberOfTuples(nPoints + addPointCellLabels.size()); pointData->SetNumberOfComponents(nComp); pointData->Allocate(nComp*(nPoints + addPointCellLabels.size())); - pointData->SetName(ptf.name().c_str()); + + // Note: using the name of the original volField + // not the name generated by the interpolation "volPointInterpolate()" + pointData->SetName(tf.name().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..2abf0b2aa3 100644 --- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamVolFields.H +++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamVolFields.H @@ -110,12 +110,6 @@ void Foam::vtkPV3Foam::convertVolFields // // Convert patches - if activated // - - // 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() + ')'; - for ( int partId = arrayRangePatches_.start(); @@ -162,7 +156,7 @@ void Foam::vtkPV3Foam::convertVolFields convertPatchPointField ( - pointFldName, + tf.name(), ppInterpList[patchId].faceToPointInterpolate(tpptf)(), output, arrayRangePatches_, @@ -182,7 +176,7 @@ void Foam::vtkPV3Foam::convertVolFields convertPatchPointField ( - pointFldName, + tf.name(), ppInterpList[patchId].faceToPointInterpolate(ptf)(), output, arrayRangePatches_,