From 56878a9fc7b7f154fe7caed32d2ede02a7fd073b Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Tue, 10 Jun 2008 14:48:39 +0100
Subject: [PATCH] changed point field data again - no need to use anything
 other than fieldname (removed vpi prefix)

---
 .../vtkPV3Foam/vtkPV3FoamConvertPatchPointField.H    | 10 ++--------
 .../vtkPV3Foam/vtkPV3FoamConvertPointFields.H        | 12 +++---------
 .../vtkPV3Foam/vtkPV3FoamConvertVolFields.H          |  2 +-
 3 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamConvertPatchPointField.H b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamConvertPatchPointField.H
index 91e6a981a8f..9720edd6202 100644
--- a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamConvertPatchPointField.H
+++ b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamConvertPatchPointField.H
@@ -54,10 +54,7 @@ void Foam::vtkPV3Foam::convertPatchPointField
     pointData->SetNumberOfTuples(pptf.size());
     pointData->SetNumberOfComponents(Type::nComponents);
     pointData->Allocate(Type::nComponents*pptf.size());
-//    pointData->SetName(name.c_str());
-    string dataSetName = name;
-    string newDataSetName = dataSetName.replace("volPointInterpolate", "vpi");
-    pointData->SetName(newDataSetName.c_str());
+    pointData->SetName(name.c_str());
 
     float vec[Type::nComponents];
 
@@ -95,10 +92,7 @@ void Foam::vtkPV3Foam::convertPatchPointField
     pointData->SetNumberOfTuples(ppsf.size());
     pointData->SetNumberOfComponents(1);
     pointData->Allocate(ppsf.size());
-//    pointData->SetName(name.c_str());
-    string dataSetName = name;
-    string newDataSetName = dataSetName.replace("volPointInterpolate", "vpi");
-    pointData->SetName(newDataSetName.c_str());
+    pointData->SetName(name.c_str());
 
     for (int i=0; i<ppsf.size(); i++)
     {
diff --git a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamConvertPointFields.H b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamConvertPointFields.H
index d9d9e6f9464..96c7e1ec35b 100644
--- a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamConvertPointFields.H
+++ b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamConvertPointFields.H
@@ -118,7 +118,7 @@ void Foam::vtkPV3Foam::convertPointFields
                         {
                             convertPatchPointField
                             (
-                                ptf.name(),
+                                fieldName,
                                 ptf.boundaryField()[patchI]
                                    .patchInternalField()(),
                                 output,
@@ -154,10 +154,7 @@ void Foam::vtkPV3Foam::convertPointField
     pointData->SetNumberOfTuples(ptf.size() + addPointCellLabels_.size());
     pointData->SetNumberOfComponents(Type::nComponents);
     pointData->Allocate(Type::nComponents*ptf.size());
-//    pointData->SetName(ptf.name().c_str());
-    string dataSetName = ptf.name();
-    string newDataSetName = dataSetName.replace("volPointInterpolate", "vpi");
-    pointData->SetName(newDataSetName.c_str());
+    pointData->SetName(tf.name().c_str());
 
     float vec[Type::nComponents];
 
@@ -226,10 +223,7 @@ void Foam::vtkPV3Foam::convertPointField
     pointData->SetNumberOfTuples(psf.size() + addPointCellLabels_.size());
     pointData->SetNumberOfComponents(1);
     pointData->Allocate(psf.size());
-//    pointData->SetName(psf.name().c_str());
-    string dataSetName = psf.name();
-    string newDataSetName = dataSetName.replace("volPointInterpolate", "vpi");
-    pointData->SetName(newDataSetName.c_str());
+    pointData->SetName(sf.name().c_str());
 
     for (int i=0; i<psf.size(); i++)
     {
diff --git a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamConvertVolFields.H b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamConvertVolFields.H
index ab771d6a350..8a5905d2e0e 100644
--- a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamConvertVolFields.H
+++ b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamConvertVolFields.H
@@ -194,7 +194,7 @@ void Foam::vtkPV3Foam::convertVolFields
 
             convertPatchPointField
             (
-                tptf().name(),
+                tf.name(),
                 tptf().boundaryField()[patchId]
                     .patchInternalField()(),
                 output,
-- 
GitLab