diff --git a/src/3rdParty/salomesmesh/inc/SMDS_UnstructuredGrid.hxx b/src/3rdParty/salomesmesh/inc/SMDS_UnstructuredGrid.hxx index 4baa06f2a2..e8bfa90f4e 100644 --- a/src/3rdParty/salomesmesh/inc/SMDS_UnstructuredGrid.hxx +++ b/src/3rdParty/salomesmesh/inc/SMDS_UnstructuredGrid.hxx @@ -28,6 +28,7 @@ #include #include +#include #include #include @@ -95,7 +96,7 @@ public: std::map >& nodeQuadDomains); vtkCellLinks* GetLinks() { -#if VTK_VERSION_NUMBER_QUICK >= 90300000000 +#if VTK_VERSION_NUMBER >= VTK_VERSION_CHECK(9, 2, 20221112) return static_cast(vtkUnstructuredGrid::GetLinks()); #else return static_cast(GetCellLinks()); diff --git a/src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh.cpp b/src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh.cpp index 012a4d908c..c9a8c4a90c 100644 --- a/src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh.cpp +++ b/src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh.cpp @@ -53,6 +53,7 @@ #include #include #include +#include #include #include @@ -4712,7 +4713,7 @@ void SMDS_Mesh::dumpGrid(string ficdump) ficcon << endl; } ficcon << "-------------------------------- connectivity " << nbPoints << endl; -#if VTK_VERSION_NUMBER_QUICK >= 90300000000 +#if VTK_VERSION_NUMBER >= VTK_VERSION_CHECK(9, 2, 20221112) vtkCellLinks *links = static_cast(myGrid->GetLinks()); #else vtkCellLinks *links = static_cast(myGrid->GetCellLinks()); diff --git a/src/3rdParty/salomesmesh/src/SMDS/SMDS_MeshNode.cpp b/src/3rdParty/salomesmesh/src/SMDS/SMDS_MeshNode.cpp index f5fc373f5d..420c3a9baf 100644 --- a/src/3rdParty/salomesmesh/src/SMDS/SMDS_MeshNode.cpp +++ b/src/3rdParty/salomesmesh/src/SMDS/SMDS_MeshNode.cpp @@ -31,6 +31,7 @@ #include "SMDS_IteratorOfElements.hxx" #include "SMDS_Mesh.hxx" #include +#include #include "utilities.h" #include "Utils_SALOME_Exception.hxx" @@ -69,7 +70,7 @@ void SMDS_MeshNode::init(int id, int meshId, int shapeId, double x, double y, do SMDS_UnstructuredGrid * grid = mesh->getGrid(); vtkPoints *points = grid->GetPoints(); points->InsertPoint(myVtkID, x, y, z); -#if VTK_VERSION_NUMBER_QUICK >= 90300000000 +#if VTK_VERSION_NUMBER >= VTK_VERSION_CHECK(9, 2, 20221112) SMDS_CellLinks *cellLinks = dynamic_cast(grid->GetLinks()); #else SMDS_CellLinks *cellLinks = dynamic_cast(grid->GetCellLinks()); @@ -195,7 +196,7 @@ public: SMDS_ElemIteratorPtr SMDS_MeshNode:: GetInverseElementIterator(SMDSAbs_ElementType type) const { -#if VTK_VERSION_NUMBER_QUICK >= 90300000000 +#if VTK_VERSION_NUMBER >= VTK_VERSION_CHECK(9, 2, 20221112) vtkCellLinks::Link l = static_cast(SMDS_Mesh::_meshList[myMeshId]->getGrid()->GetLinks())->GetLink(myVtkID); #else vtkCellLinks::Link l = static_cast(SMDS_Mesh::_meshList[myMeshId]->getGrid()->GetCellLinks())->GetLink(myVtkID); @@ -259,7 +260,7 @@ elementsIterator(SMDSAbs_ElementType type) const return SMDS_MeshElement::elementsIterator(SMDSAbs_Node); else { -#if VTK_VERSION_NUMBER_QUICK >= 90300000000 +#if VTK_VERSION_NUMBER >= VTK_VERSION_CHECK(9, 2, 20221112) vtkCellLinks::Link l = static_cast(SMDS_Mesh::_meshList[myMeshId]->getGrid()->GetLinks())->GetLink(myVtkID); #else vtkCellLinks::Link l = static_cast(SMDS_Mesh::_meshList[myMeshId]->getGrid()->GetCellLinks())->GetLink(myVtkID); @@ -362,7 +363,7 @@ void SMDS_MeshNode::AddInverseElement(const SMDS_MeshElement* ME) const SMDS_MeshCell *cell = dynamic_cast (ME); assert(cell); SMDS_UnstructuredGrid* grid = SMDS_Mesh::_meshList[myMeshId]->getGrid(); -#if VTK_VERSION_NUMBER_QUICK >= 90300000000 +#if VTK_VERSION_NUMBER >= VTK_VERSION_CHECK(9, 2, 20221112) vtkCellLinks *Links = static_cast(grid->GetLinks()); #else vtkCellLinks *Links = static_cast(grid->GetCellLinks()); @@ -382,7 +383,7 @@ void SMDS_MeshNode::ClearInverseElements() bool SMDS_MeshNode::emptyInverseElements() { -#if VTK_VERSION_NUMBER_QUICK >= 90300000000 +#if VTK_VERSION_NUMBER >= VTK_VERSION_CHECK(9, 2, 20221112) vtkCellLinks::Link l = static_cast(SMDS_Mesh::_meshList[myMeshId]->getGrid()->GetLinks())->GetLink(myVtkID); #else vtkCellLinks::Link l = static_cast(SMDS_Mesh::_meshList[myMeshId]->getGrid()->GetCellLinks())->GetLink(myVtkID); @@ -398,7 +399,7 @@ bool SMDS_MeshNode::emptyInverseElements() int SMDS_MeshNode::NbInverseElements(SMDSAbs_ElementType type) const { -#if VTK_VERSION_NUMBER_QUICK >= 90300000000 +#if VTK_VERSION_NUMBER >= VTK_VERSION_CHECK(9, 2, 20221112) vtkCellLinks::Link l = static_cast(SMDS_Mesh::_meshList[myMeshId]->getGrid()->GetLinks())->GetLink(myVtkID); #else vtkCellLinks::Link l = static_cast(SMDS_Mesh::_meshList[myMeshId]->getGrid()->GetCellLinks())->GetLink(myVtkID); diff --git a/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp b/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp index bedf100002..24b4ce856b 100644 --- a/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp +++ b/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp @@ -1006,7 +1006,7 @@ void SMDS_UnstructuredGrid::BuildLinks() this->Links = SMDS_CellLinks::New(); GetLinks()->Allocate(this->GetNumberOfPoints()); GetLinks()->Register(this); -#if VTK_VERSION_NUMBER < VTK_VERSION_CHECK(9,3,0) +#if VTK_VERSION_NUMBER < VTK_VERSION_CHECK(9, 2, 20221112) GetLinks()->BuildLinks(this); #else GetLinks()->SetDataSet(this); diff --git a/src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshEditor.cpp b/src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshEditor.cpp index 49b5f99cd6..990e310d3d 100644 --- a/src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshEditor.cpp +++ b/src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshEditor.cpp @@ -57,6 +57,7 @@ #include "utilities.h" #include "chrono.hxx" +#include #include #include #include @@ -11348,7 +11349,7 @@ bool SMESH_MeshEditor::DoubleNodesOnGroupBoundaries( const std::vector= 90300000000 +#if VTK_VERSION_NUMBER >= VTK_VERSION_CHECK(9, 2, 20221112) vtkCellLinks::Link l = static_cast(grid->GetLinks())->GetLink(oldId); #else vtkCellLinks::Link l = static_cast(grid->GetCellLinks())->GetLink(oldId); @@ -11712,7 +11713,7 @@ bool SMESH_MeshEditor::DoubleNodesOnGroupBoundaries( const std::vectorfirst; //MESSAGE(" node " << oldId); -#if VTK_VERSION_NUMBER_QUICK >= 90300000000 +#if VTK_VERSION_NUMBER >= VTK_VERSION_CHECK(9, 2, 20221112) vtkCellLinks::Link l = static_cast(grid->GetLinks())->GetLink(oldId); #else vtkCellLinks::Link l = static_cast(grid->GetCellLinks())->GetLink(oldId); diff --git a/src/Mod/Fem/App/FemPostPipeline.h b/src/Mod/Fem/App/FemPostPipeline.h index b8218f5fed..424fc1d826 100644 --- a/src/Mod/Fem/App/FemPostPipeline.h +++ b/src/Mod/Fem/App/FemPostPipeline.h @@ -32,7 +32,7 @@ #include "FemResultObject.h" #include "VTKExtensions/vtkFemFrameSourceAlgorithm.h" -#if VTK_VERSION_NUMBER < VTK_VERSION_CHECK(9, 3, 0) +#if VTK_VERSION_NUMBER < VTK_VERSION_CHECK(9, 2, 20230125) # include "VTKExtensions/vtkCleanUnstructuredGrid.h" #else # include diff --git a/src/Mod/Fem/App/PreCompiled.h b/src/Mod/Fem/App/PreCompiled.h index fd94578e95..fe5d767cbf 100644 --- a/src/Mod/Fem/App/PreCompiled.h +++ b/src/Mod/Fem/App/PreCompiled.h @@ -151,7 +151,7 @@ #include #include #include -#if VTK_VERSION_NUMBER >= VTK_VERSION_CHECK(9, 3, 0) +#if VTK_VERSION_NUMBER >= VTK_VERSION_CHECK(9, 2, 20230125) # include #endif #include