From 90075836199687cce384d70a822d23760da5d77f Mon Sep 17 00:00:00 2001
From: Paloma Martinez <104762252+paloma-martinez@users.noreply.github.com>
Date: Wed, 8 Oct 2025 15:33:46 +0200
Subject: [PATCH 1/2] Fix import of vtkMergeBlocks for newer paraview

---
 .../src/geos_posp/visu/PVUtils/paraviewTreatments.py | 12 ++++++++++--
 geos-pv/src/geos/pv/utils/paraviewTreatments.py      | 12 ++++++++++--
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/geos-posp/src/geos_posp/visu/PVUtils/paraviewTreatments.py b/geos-posp/src/geos_posp/visu/PVUtils/paraviewTreatments.py
index ee09f715..ea4a2863 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 paraview
+if Version( paraview.__version__ ) >= Version( "6.0" ):
+    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..eeef5e5f 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 paraview
+if Version( paraview.__version__ ) >= Version( "6.0" ):
+    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,
 )

From 698eecf9e1417cd4af03d7210255aa015ec1f688 Mon Sep 17 00:00:00 2001
From: Paloma Martinez <104762252+paloma-martinez@users.noreply.github.com>
Date: Fri, 10 Oct 2025 11:08:44 +0200
Subject: [PATCH 2/2] Change condition strategy due to doc build issues

---
 geos-posp/src/geos_posp/visu/PVUtils/paraviewTreatments.py | 4 ++--
 geos-pv/src/geos/pv/utils/paraviewTreatments.py            | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/geos-posp/src/geos_posp/visu/PVUtils/paraviewTreatments.py b/geos-posp/src/geos_posp/visu/PVUtils/paraviewTreatments.py
index ea4a2863..239df5f8 100644
--- a/geos-posp/src/geos_posp/visu/PVUtils/paraviewTreatments.py
+++ b/geos-posp/src/geos_posp/visu/PVUtils/paraviewTreatments.py
@@ -15,8 +15,8 @@
 from packaging.version import Version
 
 # TODO: remove this condition when all codes are adapted for Paraview 6.0
-import paraview
-if Version( paraview.__version__ ) >= Version( "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]
diff --git a/geos-pv/src/geos/pv/utils/paraviewTreatments.py b/geos-pv/src/geos/pv/utils/paraviewTreatments.py
index eeef5e5f..41894e4f 100644
--- a/geos-pv/src/geos/pv/utils/paraviewTreatments.py
+++ b/geos-pv/src/geos/pv/utils/paraviewTreatments.py
@@ -12,8 +12,8 @@
 from packaging.version import Version
 
 # TODO: remove this condition when all codes are adapted for Paraview 6.0
-import paraview
-if Version( paraview.__version__ ) >= Version( "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]