From de195bf1fd973d82bb6ade029c7c01d39b9e948b Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Tue, 5 Aug 2008 21:41:47 +0200
Subject: [PATCH] PV3FoamReader - minor changes

  - remove TimeRange property from XML. Not needed for discrete time data
  - represent Lagrangian data as VTK_VERTEX for simple visualization
---
 .../PV3FoamReader/PV3FoamReader_SM.xml              |  7 -------
 .../PV3FoamReader/vtkPV3FoamReader.cxx              |  1 -
 .../graphics/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C  |  8 +++-----
 .../graphics/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H  |  1 +
 .../vtkPV3Foam/vtkPV3FoamMeshLagrangian.C           | 13 ++++++++++++-
 .../PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshPatch.C  |  2 +-
 6 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3FoamReader/PV3FoamReader_SM.xml b/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3FoamReader/PV3FoamReader_SM.xml
index 59c118281f..93bb9ffe9d 100644
--- a/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3FoamReader/PV3FoamReader_SM.xml
+++ b/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3FoamReader/PV3FoamReader_SM.xml
@@ -27,13 +27,6 @@
       </Documentation>
     </DoubleVectorProperty>
 
-    <!-- Send continuous time info to the animation panel -->
-    <DoubleVectorProperty
-      name="TimeRange"
-      information_only="1">
-      <TimeRangeInformationHelper/>
-    </DoubleVectorProperty>
-
     <!-- Available Parts (volume, patches, lagrangian) array -->
     <StringVectorProperty
       name="PartArrayInfo"
diff --git a/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3FoamReader/vtkPV3FoamReader.cxx b/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3FoamReader/vtkPV3FoamReader.cxx
index 70a6230bfe..c0a32e40da 100644
--- a/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3FoamReader/vtkPV3FoamReader.cxx
+++ b/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3FoamReader/vtkPV3FoamReader.cxx
@@ -186,7 +186,6 @@ int vtkPV3FoamReader::RequestInformation
     int nTimeSteps = 0;
     double* timeSteps = foamData_->findTimes(nTimeSteps);
 
-
     // set identical time steps for all ports
     for (int infoI = 0; infoI < nInfo; ++infoI)
     {
diff --git a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C
index 10ccf69126..75baf87517 100644
--- a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C
+++ b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C
@@ -103,10 +103,8 @@ int Foam::vtkPV3Foam::setTime(const double& requestedTime)
     // Get times list
     instantList Times = runTime.times();
 
-    int foundIndex = Time::findClosestTimeIndex(Times, requestedTime);
-    int nearestIndex = foundIndex;
-
-    if (foundIndex < 0)
+    int nearestIndex = Time::findClosestTimeIndex(Times, requestedTime);
+    if (nearestIndex < 0)
     {
         nearestIndex = 0;
     }
@@ -146,7 +144,7 @@ int Foam::vtkPV3Foam::setTime(const double& requestedTime)
             << " fieldsChanged=" << fieldsChanged_ << endl;
     }
 
-    return foundIndex;
+    return nearestIndex;
 }
 
 
diff --git a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H
index ada85c1373..f4d7c32b11 100644
--- a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H
+++ b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H
@@ -716,6 +716,7 @@ public:
            return timeIndex_;
         }
 
+
      // Access
 
         //- Debug information
diff --git a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshLagrangian.C b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshLagrangian.C
index d1b0492235..ec5e87a4ba 100644
--- a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshLagrangian.C
+++ b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshLagrangian.C
@@ -36,6 +36,7 @@ Description
 #include "vtkPV3FoamPoints.H"
 
 // VTK includes
+#include "vtkCellArray.h"
 #include "vtkPoints.h"
 #include "vtkPolyData.h"
 
@@ -75,15 +76,25 @@ vtkPolyData* Foam::vtkPV3Foam::lagrangianVTKMesh
 
         vtkmesh = vtkPolyData::New();
         vtkPoints* vtkpoints = vtkPoints::New();
-        vtkpoints->Allocate( parcels.size() );
+        vtkCellArray* vtkcells = vtkCellArray::New();
 
+        vtkpoints->Allocate( parcels.size() );
+        vtkcells->Allocate( parcels.size() );
+
+        vtkIdType particleId = 0;
         forAllConstIter(Cloud<passiveParticle>, parcels, iter)
         {
             vtkPV3FoamInsertNextPoint(vtkpoints, iter().position());
+
+            vtkcells->InsertNextCell(1, &particleId);
+            particleId++;
         }
 
         vtkmesh->SetPoints(vtkpoints);
         vtkpoints->Delete();
+
+        vtkmesh->SetVerts(vtkcells);
+        vtkcells->Delete();
     }
 
     if (debug)
diff --git a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshPatch.C b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshPatch.C
index bacaa0f63d..bbe324b943 100644
--- a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshPatch.C
+++ b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshPatch.C
@@ -35,8 +35,8 @@ Description
 
 // VTK includes
 #include "vtkCellArray.h"
+#include "vtkPoints.h"
 #include "vtkPolyData.h"
-#include "vtkUnstructuredGrid.h"
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //