From: Afeef Date: Tue, 30 Mar 2021 12:08:25 +0000 (+0200) Subject: Improve smesh GUI display() speed for viewing mesh X-Git-Tag: V9_7_0a1~4 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=cef1a8c26271998ff9a7e2a2b554010743242231;p=modules%2Fgui.git Improve smesh GUI display() speed for viewing mesh Primarily, VTKViewer_GeometryFilter is delegated to vtkGeometryFilter used by ParaView. At this point typical performance improvements are 5-10x over the mesh display, this dependes if multithreaded version of ParaView (consequently VTK) is used or not Use old routines for nonlinear cells (quadratic 1D and 2D): This should fix arc visulization for quadratic elements Bypass to old method for Polyhedron datat: Multi-threding of VTK causes problems for Polyhedron data, the code at the moment does not seem stable. To be investigated in future, if VTK can be patched. Addition to non-delegation list: Add all 3d quadratic, biquadratic and triquadratic elements to the list of elements which have to be handled natively. --- diff --git a/src/VTKViewer/VTKViewer_GeometryFilter.cxx b/src/VTKViewer/VTKViewer_GeometryFilter.cxx index 3244bb5ef..c3ecaaca5 100644 --- a/src/VTKViewer/VTKViewer_GeometryFilter.cxx +++ b/src/VTKViewer/VTKViewer_GeometryFilter.cxx @@ -144,6 +144,18 @@ static inline bool toShowEdge( vtkIdType id1, vtkIdType id2, vtkIdType cellId, v return ( cells[iCell] == cellId ); } +//------------------------------------------------------------------------------ +// Excluded faces are defined here. +struct vtkExcludedFaces +{ + vtkStaticCellLinksTemplate* Links; + vtkExcludedFaces() + : Links(nullptr) + { + } + ~vtkExcludedFaces() { delete this->Links; } +}; + int VTKViewer_GeometryFilter ::RequestData( @@ -151,29 +163,96 @@ VTKViewer_GeometryFilter vtkInformationVector **inputVector, vtkInformationVector *outputVector) { + // get the info objects - vtkInformation *inInfo = inputVector[0]->GetInformationObject(0); + vtkInformation *inInfo = inputVector[0]->GetInformationObject(0); vtkInformation *outInfo = outputVector->GetInformationObject(0); // get the input and ouptut vtkDataSet *input = vtkDataSet::SafeDownCast( - inInfo->Get(vtkDataObject::DATA_OBJECT())); + inInfo->Get(vtkDataObject::DATA_OBJECT())); vtkPolyData *output = vtkPolyData::SafeDownCast( - outInfo->Get(vtkDataObject::DATA_OBJECT())); + outInfo->Get(vtkDataObject::DATA_OBJECT())); vtkIdType numCells=input->GetNumberOfCells(); + vtkIdType numPts = input->GetNumberOfPoints(); - if (numCells == 0) + if (numPts == 0 || numCells == 0) { - return 0; + return 0; } - if (input->GetDataObjectType() == VTK_UNSTRUCTURED_GRID){ - return this->UnstructuredGridExecute(input, output, outInfo); - }else - return Superclass::RequestData(request,inputVector,outputVector); + if (delegateToVtk) + { - return 1; + // get the info objects excluded faces + vtkInformation* excInfo = inputVector[1]->GetInformationObject(0); + + vtkExcludedFaces exc; // Will delete exc->Links when goes out of scope + if (excInfo) + { + vtkPolyData* excFaces = vtkPolyData::SafeDownCast(excInfo->Get(vtkDataObject::DATA_OBJECT())); + vtkCellArray* excPolys = excFaces->GetPolys(); + if (excPolys->GetNumberOfCells() > 0) + { + exc.Links = new vtkStaticCellLinksTemplate; + exc.Links->ThreadedBuildLinks(numPts, excPolys->GetNumberOfCells(), excPolys); + } + } + + switch (input->GetDataObjectType()) + { + case VTK_POLY_DATA: + return this->vtkGeometryFilter::PolyDataExecute(input, output, &exc); + case VTK_UNSTRUCTURED_GRID: + { + vtkUnstructuredGrid* inputUnstrctured = static_cast(input); + bool NotFitForDelegation = false; + if ( vtkUnsignedCharArray* types = inputUnstrctured->GetCellTypesArray() ) + { + std::set ElementsNotFitToDelegate; + + // All quadratic, biquadratic, and triquadratic elements not fit for delegation + // as SMESH has special display with curves mode for meshes containing these + // elements hence such meshes are not handled by "vtkGeometryFilter" instead + // the native VTKViewer_GeometryFilter::UnstructuredGridExecute is used. + ElementsNotFitToDelegate.insert( VTK_QUADRATIC_EDGE ); + ElementsNotFitToDelegate.insert( VTK_QUADRATIC_TRIANGLE ); + ElementsNotFitToDelegate.insert( VTK_BIQUADRATIC_TRIANGLE ); + ElementsNotFitToDelegate.insert( VTK_QUADRATIC_QUAD ); + ElementsNotFitToDelegate.insert( VTK_BIQUADRATIC_QUAD ); + ElementsNotFitToDelegate.insert( VTK_QUADRATIC_POLYGON ); + ElementsNotFitToDelegate.insert( VTK_QUADRATIC_TETRA ); + ElementsNotFitToDelegate.insert( VTK_QUADRATIC_HEXAHEDRON ); + ElementsNotFitToDelegate.insert( VTK_TRIQUADRATIC_HEXAHEDRON ); + ElementsNotFitToDelegate.insert( VTK_QUADRATIC_WEDGE ); + ElementsNotFitToDelegate.insert( VTK_BIQUADRATIC_QUADRATIC_WEDGE ); + ElementsNotFitToDelegate.insert( VTK_QUADRATIC_PYRAMID ); + + // Some openMP tests reveal that meshes with polyhedrons can sometimes cause + // problems as such we avoide delegation = ElementsNotFitToDelegate. It would be + // nice to investigate and resolve the problem with multi-therding in future. + ElementsNotFitToDelegate.insert( VTK_POLYHEDRON ); + + for ( int i = 0; i < types->GetNumberOfTuples() && !NotFitForDelegation; ++i ) + NotFitForDelegation = ElementsNotFitToDelegate.count( types->GetValue(i) ); + } + if ( NotFitForDelegation ) + return this->UnstructuredGridExecute(input, output, outInfo); + else + return this->vtkGeometryFilter::UnstructuredGridExecute(input, output, nullptr, &exc); + } + } + + return this->vtkGeometryFilter::DataSetExecute(input, output, &exc); + } + else // !delegateToVtk + { + if (input->GetDataObjectType() == VTK_UNSTRUCTURED_GRID){ + return this->UnstructuredGridExecute(input, output, outInfo); + }else + return Superclass::RequestData(request,inputVector,outputVector); + } } int diff --git a/src/VTKViewer/VTKViewer_GeometryFilter.h b/src/VTKViewer/VTKViewer_GeometryFilter.h index c617dd5e0..7c5836895 100644 --- a/src/VTKViewer/VTKViewer_GeometryFilter.h +++ b/src/VTKViewer/VTKViewer_GeometryFilter.h @@ -35,6 +35,7 @@ #endif class vtkUnstructuredGrid; +struct vtkExcludedFaces; /*! \brief This class used same as vtkGeometryFilter. See documentation on VTK for more information. */ @@ -125,7 +126,7 @@ protected: */ ~VTKViewer_GeometryFilter(); - virtual int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *); + int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override; //special cases for performance @@ -140,6 +141,9 @@ protected: vtkPolyData *output, TMapOfVectorId& theDimension2VTK2ObjIds, bool triangulate = false); + + // Delegate VTKViewer_GeometryFilter::UnstructuredGridExecute to vtkGeometryFilter::UnstructuredGridExecute + bool delegateToVtk = true; private: TVectorId myVTK2ObjIds;