Merge branch 'python310' into 'master'

[py] Bump minimum Python to 3.10.

See merge request ogs/ogs!5408

Author: bilke

.pre-commit-config.yaml

@@ -9,7 +9,7 @@ repos:
         exclude: "^Tests/Data/.*|^Tests/Python/res/test_docu_scripts/|^web/static|^Documentation/.vale/.*|.*\\.patch"
       - id: check-added-large-files
         args: [--maxkb 1024]
-        exclude: "^Tests/Data/uv.lock"
+        exclude: "uv.lock"
       - id: check-merge-conflict
       - id: check-xml
         exclude: '^Tests/Data/.*\.xml'

Applications/Python/ogs/dev/ogs_log_summary.py

@@ -118,7 +118,7 @@ def parse_ogs_log(log_fh):
         except KeyError:
             continue
         assert len(abs_norm) == len(rel_norm)
-        for comp, (a, r) in enumerate(zip(abs_norm, rel_norm)):
+        for comp, (a, r) in enumerate(zip(abs_norm, rel_norm, strict=False)):
             new_rec = dict(rec)
             new_rec["abs_maximum_norm"] = a
             new_rec["rel_maximum_norm"] = r

Tests/Data/HMPhaseField/GreatCell/GreatCellHM_VPF.py

@@ -317,7 +317,9 @@ def truncated_cmap(name, minval=0.3, maxval=0.9, n=6):
 
     top_points_x, top_points_y = [], []
 
-    for i, (x, y, value) in enumerate(zip(circle_x, circle_y, scaled_values)):
+    for i, (x, y, value) in enumerate(
+        zip(circle_x, circle_y, scaled_values, strict=False)
+    ):
         unit_vector = np.array([x, y]) / circle_radius
         line_end = np.array([x, y]) + unit_vector * value / 1e6
 

Tests/Data/LIE/HydroMechanics/GreatCelljupyterNotebook/GreatCellHM.py

@@ -76,7 +76,7 @@ def truncated_cmap(name, minval=0.3, maxval=0.9, n=6):
 # # Great cell
 #
 # The GREAT cell is a  poly-axial rock-testing device that reproduces subsurface conditions down to 3.5 km depth on 200 mm-diameter samples. It imposes a rotating stress field, injects fluid through a central borehole, and records both fiber-optic strain and pore-pressure data—providing a rich dataset for validating coupled hydro-mechanical models. For full details, see the GREAT cell benchmark docs:
-# [https://www.opengeosys.org/docs/benchmarks/small-deformation/greatcell/](https://www.opengeosys.org/docs/benchmarks/small-deformation/greatcell/)
+# [www.opengeosys.org/docs/benchmarks/small-deformations/greatcell/](https://www.opengeosys.org/docs/benchmarks/small-deformations/greatcell/)
 #
 #
 # Here, in our 2D, small-deformation benchmark suite, we employ the LIE (lower-dimensional interface element) hydro-mechanical process to model fractures as interfaces. The cases are:
@@ -282,7 +282,9 @@ def truncated_cmap(name, minval=0.3, maxval=0.9, n=6):
 
     top_points_x, top_points_y = [], []
 
-    for i, (x, y, value) in enumerate(zip(circle_x, circle_y, scaled_values)):
+    for i, (x, y, value) in enumerate(
+        zip(circle_x, circle_y, scaled_values, strict=False)
+    ):
         unit_vector = np.array([x, y]) / circle_radius
         line_end = np.array([x, y]) + unit_vector * value / 1e6
 

Tests/Data/LIE/Mechanics/GreatCelljupyterNotebook/GreatCellM.py

@@ -370,7 +370,9 @@ def truncated_cmap(name, minval=0.3, maxval=0.9, n=6):
 
     top_points_x, top_points_y = [], []
 
-    for i, (x, y, value) in enumerate(zip(circle_x, circle_y, scaled_values)):
+    for i, (x, y, value) in enumerate(
+        zip(circle_x, circle_y, scaled_values, strict=False)
+    ):
         unit_vector = np.array([x, y]) / circle_radius
         line_end = np.array([x, y]) + unit_vector * value / 1e6
 

Tests/Data/LIE/Mechanics/GreatCelljupyterNotebook/Plotter.py

@@ -1,7 +1,7 @@
 import colorsys
 import math
 from pathlib import Path
-from typing import ClassVar, Optional
+from typing import ClassVar
 
 import matplotlib.pyplot as plt
 import numpy as np
@@ -222,7 +222,7 @@ def plot_volumetric_strain_vs_angle(
         ylim_range=None,
         layout="single",
         downsample: int = 1,
-        markevery: Optional[int] = None,
+        markevery: int | None = None,
         external_data=None,
     ):
         self.setup_plot_style()
@@ -455,7 +455,7 @@ def extract_lie_aperture_from_list(
         self, file_list: list[str], material_names: list[str], fracture_mat_id=3
     ) -> dict[str, tuple[np.ndarray, np.ndarray]]:
         by_material: dict[str, tuple[np.ndarray, np.ndarray]] = {}
-        for vtu_file, mat_name in zip(file_list, material_names):
+        for vtu_file, mat_name in zip(file_list, material_names, strict=False):
             mesh = ot.MeshSeries(self.output_dir / vtu_file)[-1]
             sub = self.get_sub_mesh_by_material(mesh, fracture_mat_id)
             coords = sub.points
@@ -484,7 +484,7 @@ def extract_vpf_width_from_list(
         self, file_list: list[str], material_names: list[str]
     ) -> dict[str, tuple[np.ndarray, np.ndarray]]:
         width_by_material: dict[str, tuple[np.ndarray, np.ndarray]] = {}
-        for vtu_file, material_name in zip(file_list, material_names):
+        for vtu_file, material_name in zip(file_list, material_names, strict=False):
             mesh = ot.MeshSeries(self.output_dir / vtu_file)[-1]
             cell_data = mesh.cell_data
 
@@ -513,7 +513,7 @@ def extract_vpf_stress_from_list(
         stress_type: str = "normal",
     ) -> dict[str, tuple[np.ndarray, np.ndarray]]:
         stress_by_material: dict[str, tuple[np.ndarray, np.ndarray]] = {}
-        for vtu_file, material_name in zip(file_list, material_names):
+        for vtu_file, material_name in zip(file_list, material_names, strict=False):
             mesh = ot.MeshSeries(self.output_dir / vtu_file)[-1]
             cell_data = mesh.cell_data
             point_data = mesh.point_data
@@ -662,10 +662,10 @@ def plot_avg_width_vs_stress(
         self,
         pee_load_values: dict[str, list[float]],
         metric: str = "width",
-        methods_to_include: Optional[list[str]] = None,
-        ylim_range: Optional[tuple[float, float]] = None,
-        external_data: Optional[dict[str, dict[str, dict[str, list[float]]]]] = None,
-        benchmark_tag: Optional[str] = None,
+        methods_to_include: list[str] | None = None,
+        ylim_range: tuple[float, float] | None = None,
+        external_data: dict[str, dict[str, dict[str, list[float]]]] | None = None,
+        benchmark_tag: str | None = None,
     ) -> np.ndarray:
         if methods_to_include is None:
             methods_to_include = ["VPF", "LIE"]
@@ -836,12 +836,11 @@ def plot_fracture_aperture_profiles(
         widthProfile: dict[str, dict[str, tuple[np.ndarray, np.ndarray]]],
         benchmark_tag: str,
         downsample: int = 1,
-        markevery: Optional[int] = None,
-        ylim: Optional[tuple[float, float]] = None,
+        markevery: int | None = None,
+        ylim: tuple[float, float] | None = None,
         method_label: str = "FEM",
-        external_data: Optional[
-            dict[str, dict[str, dict[str, dict[str, list[float]]]]]
-        ] = None,
+        external_data: dict[str, dict[str, dict[str, dict[str, list[float]]]]]
+        | None = None,
     ) -> None:
         self.setup_plot_style()
         for load_case, mat_prof in widthProfile.items():
@@ -974,7 +973,7 @@ def plot_fracture_aperture_profiles(
 
     @staticmethod
     def load_external_data(
-        ext_dir: str | Path, benchmark_tag: Optional[str] = None
+        ext_dir: str | Path, benchmark_tag: str | None = None
     ) -> dict[str, dict]:
         """
         Scans ext_dir for extracted_*.npz and returns dicts:

Tests/Data/LargeDeformation/CooksMembrane/CooksMembraneFbar.py

@@ -121,7 +121,7 @@ def run_single_test(mesh_name, output_prefix, use_fbar=False, use_load_increment
 
 uys_at_top_fbar = []
 for mesh_name, load_increment_label, output_prefix in zip(
-    mesh_names, load_increment_labels, output_prefices
+    mesh_names, load_increment_labels, output_prefices, strict=False
 ):
     uy_at_top = run_single_test(
         mesh_name,
@@ -154,7 +154,7 @@ def run_single_test(mesh_name, output_prefix, use_fbar=False, use_load_increment
 
 uys_at_top_non_fbar = []
 for mesh_name, load_increment_label, output_prefix in zip(
-    mesh_names, load_increment_labels, output_prefices_non_fbar
+    mesh_names, load_increment_labels, output_prefices_non_fbar, strict=False
 ):
     uy_at_top = run_single_test(
         mesh_name,
@@ -233,7 +233,7 @@ def contour_plot(pvd_file_name, title, fig_name=None):
 # #### 2.1. Non F-bar: Vertical displacement (left column) and vertical stress (right column):
 
 # %%
-for nedge, output_prefix in zip(nedges, output_prefices_non_fbar):
+for nedge, output_prefix in zip(nedges, output_prefices_non_fbar, strict=False):
     contour_plot(
         output_prefix + ".pvd",
         f"Number of elements per side: {nedge}",
@@ -244,7 +244,7 @@ def contour_plot(pvd_file_name, title, fig_name=None):
 # #### 2.1. F-bar: Vertical displacement (left column) and vertical stress (right column):
 
 # %%
-for nedge, output_prefix in zip(nedges, output_prefices):
+for nedge, output_prefix in zip(nedges, output_prefices, strict=False):
     contour_plot(
         output_prefix + ".pvd",
         f"Number of elements per side: {nedge}",

Tests/Data/Mechanics/CooksMembrane/CooksMembraneBbar.py

@@ -140,7 +140,7 @@ def run_single_test(mesh_name, output_prefix, use_bbar="false"):
 ]
 
 uys_at_top_non_bbar = []
-for mesh_name, output_prefix in zip(mesh_names, output_prefices_non_bbar):
+for mesh_name, output_prefix in zip(mesh_names, output_prefices_non_bbar, strict=False):
     uy_at_top = run_single_test(mesh_name, output_prefix)
     uys_at_top_non_bbar.append(uy_at_top)
 
@@ -169,7 +169,7 @@ def run_single_test(mesh_name, output_prefix, use_bbar="false"):
 ]
 
 uys_at_top_bbar = []
-for mesh_name, output_prefix in zip(mesh_names, output_prefices):
+for mesh_name, output_prefix in zip(mesh_names, output_prefices, strict=False):
     uy_at_top = run_single_test(mesh_name, output_prefix, "true")
     uys_at_top_bbar.append(uy_at_top)
 
@@ -262,14 +262,14 @@ def contour_plot(pvd_file_name, title):
 # #### Results obtained without the B bar method:
 
 # %%
-for nedge, output_prefix in zip(nedges, output_prefices_non_bbar):
+for nedge, output_prefix in zip(nedges, output_prefices_non_bbar, strict=False):
     contour_plot(output_prefix + ".pvd", "Number of elements per side: " + nedge)
 
 # %% [markdown]
 # #### Results obtained with the B bar method:
 
 # %%
-for nedge, output_prefix in zip(nedges, output_prefices):
+for nedge, output_prefix in zip(nedges, output_prefices, strict=False):
     contour_plot(output_prefix + ".pvd", "Number of elements per side: " + nedge)
 
 # %% [markdown]

Tests/Data/Mechanics/Linear/PythonHertzContact/post.py

@@ -121,7 +121,7 @@ def get_y_top(t):
 add_leg = True
 
 
-for t, fn in zip(ts, fns):
+for t, fn in zip(ts, fns, strict=False):
     print("###### time", t)
     reader.SetFileName(fn)
     reader.Update()

Tests/Data/Mechanics/Linear/PythonPiston/post.py

@@ -70,7 +70,7 @@ def read_pvd_file(fn):
 uys = np.zeros(len(ts))
 ps = np.zeros(len(ts))
 
-for i, (t, fn) in enumerate(zip(ts, fns)):
+for i, (t, fn) in enumerate(zip(ts, fns, strict=False)):
     print("###### time", t)
     reader.SetFileName(fn)
     probe.Update()