diff --git a/geos-posp/src/geos_posp/visu/PVUtils/paraviewTreatments.py b/geos-posp/src/geos_posp/visu/PVUtils/paraviewTreatments.py index ee09f715..239df5f8 100644 --- a/geos-posp/src/geos_posp/visu/PVUtils/paraviewTreatments.py +++ b/geos-posp/src/geos_posp/visu/PVUtils/paraviewTreatments.py @@ -12,8 +12,16 @@ ComponentNameEnum, GeosMeshOutputsEnum, ) -from paraview.modules.vtkPVVTKExtensionsMisc import ( # type: ignore[import-not-found] - vtkMergeBlocks, ) +from packaging.version import Version + +# TODO: remove this condition when all codes are adapted for Paraview 6.0 +import vtk +if Version( vtk.__version__ ) >= Version( "9.5" ): + from vtkmodules.vtkFiltersParallel import vtkMergeBlocks +else: + from paraview.modules.vtkPVVTKExtensionsMisc import ( # type: ignore[import-not-found] + vtkMergeBlocks, ) + from paraview.simple import ( # type: ignore[import-not-found] FindSource, GetActiveView, GetAnimationScene, GetDisplayProperties, GetSources, servermanager, ) diff --git a/geos-pv/src/geos/pv/utils/paraviewTreatments.py b/geos-pv/src/geos/pv/utils/paraviewTreatments.py index 42258ef7..41894e4f 100644 --- a/geos-pv/src/geos/pv/utils/paraviewTreatments.py +++ b/geos-pv/src/geos/pv/utils/paraviewTreatments.py @@ -8,8 +8,16 @@ import numpy as np import numpy.typing as npt import pandas as pd # type: ignore[import-untyped] -from paraview.modules.vtkPVVTKExtensionsMisc import ( # type: ignore[import-not-found] - vtkMergeBlocks, ) + +from packaging.version import Version + +# TODO: remove this condition when all codes are adapted for Paraview 6.0 +import vtk +if Version( vtk.__version__ ) >= Version( "9.5" ): + from vtkmodules.vtkFiltersParallel import vtkMergeBlocks +else: + from paraview.modules.vtkPVVTKExtensionsMisc import ( # type: ignore[import-not-found] + vtkMergeBlocks, ) from paraview.simple import ( # type: ignore[import-not-found] FindSource, GetActiveView, GetAnimationScene, GetDisplayProperties, GetSources, servermanager, )