From 65b03ca2c56472ded663d279369cbef54f4d4966 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Mon, 9 Sep 2024 10:45:05 +0200
Subject: [PATCH] Updates: ogs 6.5.3, ogstools 0.4.0

---
 SimpleMechanics/SimpleMechanics.ipynb | 8 ++++----
 requirements-no-deps.txt              | 5 +++--
 requirements.txt                      | 4 ++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/SimpleMechanics/SimpleMechanics.ipynb b/SimpleMechanics/SimpleMechanics.ipynb
index ec086954..6f934ad4 100644
--- a/SimpleMechanics/SimpleMechanics.ipynb
+++ b/SimpleMechanics/SimpleMechanics.ipynb
@@ -58,10 +58,10 @@
     }
    ],
    "source": [
-    "from ogs6py import ogs\n",
+    "import ogstools as ogs\n",
     "\n",
     "prj_name = \"SimpleMechanics\"\n",
-    "model = ogs.OGS(PROJECT_FILE=(out_dir / f\"{prj_name}.prj\"))\n",
+    "model = ogs.Project(PROJECT_FILE=(out_dir / f\"{prj_name}.prj\"))\n",
     "model.geometry.add_geometry(filename=\"./square_1x1.gml\")\n",
     "model.mesh.add_mesh(filename=\"./square_1x1_quad_1e2.vtu\")\n",
     "model.processes.set_process(\n",
@@ -300,13 +300,13 @@
    "source": [
     "mesh_series = MeshSeries(f\"{out_dir}/{prj_name}.pvd\")\n",
     "points = np.asarray([[0.3, 0.5, 0.0], [0.24, 0.21, 0.0]])\n",
-    "disp = ot.properties.displacement\n",
+    "disp = ot.variables.displacement\n",
     "\n",
     "labels = [\n",
     "    f\"{i}: {label}\" for i, label in enumerate(ot.plot.utils.justified_labels(points))\n",
     "]\n",
     "fig = mesh_series.plot_probe(\n",
-    "    points=points[:4], mesh_property=disp, time_unit=\"a\", labels=labels[:4]\n",
+    "    points=points[:4], variable=disp, time_unit=\"a\", labels=labels[:4]\n",
     ")"
    ]
   },
diff --git a/requirements-no-deps.txt b/requirements-no-deps.txt
index b50a025e..f8c86855 100644
--- a/requirements-no-deps.txt
+++ b/requirements-no-deps.txt
@@ -1,3 +1,4 @@
-git+https://gitlab.opengeosys.org/ogs/tools/ogstools@b4f3780274c464260ff43a248fac7379e49c8975#egg=ogstools
-git+https://github.com/bilke/ogs6py@66410a2acc6db77f33c78949e0601670895b0af6#egg=ogs6py
+ogstools==0.4.0
+# git+https://gitlab.opengeosys.org/ogs/tools/ogstools@b4f3780274c464260ff43a248fac7379e49c8975#egg=ogstools
+# git+https://github.com/bilke/ogs6py@66410a2acc6db77f33c78949e0601670895b0af6#egg=ogs6py
 VTUinterface>=0.704
diff --git a/requirements.txt b/requirements.txt
index b34169a2..3381ccd3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,8 +10,8 @@ pandas<2.2
 scipy<1.13
 lxml
 # ogs
---extra-index-url https://gitlab.opengeosys.org/api/v4/projects/120/packages/pypi/simple
-ogs
+# --extra-index-url https://gitlab.opengeosys.org/api/v4/projects/120/packages/pypi/simple
+ogs==6.5.3
 git+https://github.com/joergbuchwald/heatsource_thm@bbd5bab17fc2ec228c773e087dc847e1ad5f9a4c#egg=heatsource-py
 # ogstools:
 h5py>=3.8.0