diff --git a/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3FoamReader/PV3FoamReader_SM.xml b/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3FoamReader/PV3FoamReader_SM.xml index 59c118281f5dc2979b31b9d7509d91c6a2dc83ff..93bb9ffe9dac6602dafc8f67de2442b6aeaa3528 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 70a6230bfe17dcf99d5085b866c3d3a25dc05f2e..c0a32e40daaba3e2d0535b5cf7fed51f8b6b3972 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 10ccf691263ef8069171407b7f3aeb858a045a93..75baf87517f34d11602639d537743c3858751dbb 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 ada85c137322fc457c615792384664c938e1f850..f4d7c32b112d45bb6238da2d2845f65e2132d49c 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 d1b0492235c56aa1d63717439bba31f062a4b650..ec5e87a4ba12b062c2d5d362142b42fed893aeda 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(); + 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 bacaa0f63d01724660e68655768b7033f7e21903..bbe324b9434d7a7c696e2821b6a10ea3bdda12eb 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 * * * * * * * * * * * * * //