From 84ae68a76bdf9ac46b58b908a1b7845b660afe3c Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Tue, 30 Jul 2024 14:30:08 +0200
Subject: [PATCH] [py] Fixes for ogs6py interface.
---
.../Mechanics/Linear/SimpleMechanics.ipynb | 39 +++++++++----------
.../generateInvalidMediaForHT.py | 32 +++++++--------
2 files changed, 34 insertions(+), 37 deletions(-)
diff --git a/Tests/Data/Mechanics/Linear/SimpleMechanics.ipynb b/Tests/Data/Mechanics/Linear/SimpleMechanics.ipynb
index 827998d4ee0..01bf6c3f14b 100644
--- a/Tests/Data/Mechanics/Linear/SimpleMechanics.ipynb
+++ b/Tests/Data/Mechanics/Linear/SimpleMechanics.ipynb
@@ -62,7 +62,7 @@
"\n",
"prj_name = \"SimpleMechanics\"\n",
"model = ogs.OGS(PROJECT_FILE=(out_dir / f\"{prj_name}.prj\"))\n",
- "model.geo.add_geom(filename=\"./square_1x1.gml\")\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",
" name=\"SD\",\n",
@@ -76,8 +76,8 @@
"model.processes.add_process_variable(\n",
" process_variable=\"process_variable\", process_variable_name=\"displacement\"\n",
")\n",
- "model.processes.add_process_variable(secondary_variable=\"sigma\", output_name=\"sigma\")\n",
- "model.timeloop.add_process(\n",
+ "model.processes.add_secondary_variable(internal_name=\"sigma\", output_name=\"sigma\")\n",
+ "model.time_loop.add_process(\n",
" process=\"SD\",\n",
" nonlinear_solver_name=\"basic_newton\",\n",
" convergence_type=\"DeltaX\",\n",
@@ -85,7 +85,7 @@
" abstol=\"1e-15\",\n",
" time_discretization=\"BackwardEuler\",\n",
")\n",
- "model.timeloop.set_stepping(\n",
+ "model.time_loop.set_stepping(\n",
" process=\"SD\",\n",
" type=\"FixedTimeStepping\",\n",
" t_initial=\"0\",\n",
@@ -93,7 +93,7 @@
" repeat=\"4\",\n",
" delta_t=\"0.25\",\n",
")\n",
- "model.timeloop.add_output(\n",
+ "model.time_loop.add_output(\n",
" type=\"VTK\",\n",
" prefix=prj_name,\n",
" repeat=\"1\",\n",
@@ -108,13 +108,13 @@
"model.parameters.add_parameter(name=\"displacement0\", type=\"Constant\", values=\"0 0\")\n",
"model.parameters.add_parameter(name=\"dirichlet0\", type=\"Constant\", value=\"0\")\n",
"model.parameters.add_parameter(name=\"dirichlet1\", type=\"Constant\", value=\"0.05\")\n",
- "model.processvars.set_ic(\n",
+ "model.process_variables.set_ic(\n",
" process_variable_name=\"displacement\",\n",
" components=\"2\",\n",
" order=\"1\",\n",
" initial_condition=\"displacement0\",\n",
")\n",
- "model.processvars.add_bc(\n",
+ "model.process_variables.add_bc(\n",
" process_variable_name=\"displacement\",\n",
" geometrical_set=\"square_1x1_geometry\",\n",
" geometry=\"left\",\n",
@@ -122,7 +122,7 @@
" component=\"0\",\n",
" parameter=\"dirichlet0\",\n",
")\n",
- "model.processvars.add_bc(\n",
+ "model.process_variables.add_bc(\n",
" process_variable_name=\"displacement\",\n",
" geometrical_set=\"square_1x1_geometry\",\n",
" geometry=\"bottom\",\n",
@@ -130,7 +130,7 @@
" component=\"1\",\n",
" parameter=\"dirichlet0\",\n",
")\n",
- "model.processvars.add_bc(\n",
+ "model.process_variables.add_bc(\n",
" process_variable_name=\"displacement\",\n",
" geometrical_set=\"square_1x1_geometry\",\n",
" geometry=\"top\",\n",
@@ -138,13 +138,13 @@
" component=\"1\",\n",
" parameter=\"dirichlet1\",\n",
")\n",
- "model.nonlinsolvers.add_non_lin_solver(\n",
+ "model.nonlinear_solvers.add_non_lin_solver(\n",
" name=\"basic_newton\",\n",
" type=\"Newton\",\n",
" max_iter=\"4\",\n",
" linear_solver=\"general_linear_solver\",\n",
")\n",
- "model.linsolvers.add_lin_solver(\n",
+ "model.linear_solvers.add_lin_solver(\n",
" name=\"general_linear_solver\",\n",
" kind=\"lis\",\n",
" solver_type=\"cg\",\n",
@@ -152,7 +152,7 @@
" max_iteration_step=\"10000\",\n",
" error_tolerance=\"1e-16\",\n",
")\n",
- "model.linsolvers.add_lin_solver(\n",
+ "model.linear_solvers.add_lin_solver(\n",
" name=\"general_linear_solver\",\n",
" kind=\"eigen\",\n",
" solver_type=\"CG\",\n",
@@ -160,7 +160,7 @@
" max_iteration_step=\"10000\",\n",
" error_tolerance=\"1e-16\",\n",
")\n",
- "model.linsolvers.add_lin_solver(\n",
+ "model.linear_solvers.add_lin_solver(\n",
" name=\"general_linear_solver\",\n",
" kind=\"petsc\",\n",
" prefix=\"sd\",\n",
@@ -274,9 +274,7 @@
"source": [
"import matplotlib.pyplot as plt\n",
"import numpy as np\n",
- "\n",
"import ogstools as ot\n",
- "from ogstools import examples\n",
"from ogstools.meshlib import MeshSeries"
]
},
@@ -299,15 +297,14 @@
],
"source": [
"mesh_series = MeshSeries(f\"{out_dir}/{prj_name}.pvd\")\n",
- "points = np.asarray(\n",
- " [[0.3, 0.5, 0.0], [0.24, 0.21, 0.0]]\n",
- ")\n",
+ "points = np.asarray([[0.3, 0.5, 0.0], [0.24, 0.21, 0.0]])\n",
"disp = ot.properties.displacement\n",
"\n",
- "labels = [f\"{i}: {label}\" for i, label in enumerate(ot.plot.utils.justified_labels(points))]\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,\n",
- " time_unit=\"a\", labels=labels[:4]\n",
+ " points=points[:4], mesh_property=disp, time_unit=\"a\", labels=labels[:4]\n",
")"
]
},
diff --git a/Tests/Data/Parabolic/HT/InvalidProjectFiles/generateInvalidMediaForHT.py b/Tests/Data/Parabolic/HT/InvalidProjectFiles/generateInvalidMediaForHT.py
index 5a9f85a8b5e..8aaa172cfb8 100644
--- a/Tests/Data/Parabolic/HT/InvalidProjectFiles/generateInvalidMediaForHT.py
+++ b/Tests/Data/Parabolic/HT/InvalidProjectFiles/generateInvalidMediaForHT.py
@@ -137,7 +137,7 @@ for solid_property in solid_properties:
+ ".prj"
)
model.mesh.add_mesh(filename="square_1x1_quad_1e3.vtu")
- model.geo.add_geom(filename="square_1x1.gml")
+ model.geometry.add_geometry(filename="square_1x1.gml")
model.processes.set_process(
name="HT", type="HT", integration_order="2", specific_body_force="0 0"
)
@@ -147,15 +147,15 @@ for solid_property in solid_properties:
model.processes.add_process_variable(
process_variable="pressure", process_variable_name="pressure"
)
- model.processes.add_process_variable(
- secondary_variable="darcy_velocity", output_name="darcy_velocity"
+ model.processes.add_secondary_variable(
+ internal_name="darcy_velocity", output_name="darcy_velocity"
)
addAqueousLiquidPropertiesForHT(aqueousfluid_property)
addSolidPropertiesForHT(solid_property)
addMediumPropertiesForHT(medium_property)
- model.timeloop.add_process(
+ model.time_loop.add_process(
process="HT",
nonlinear_solver_name="basic_picard",
convergence_type="DeltaX",
@@ -163,7 +163,7 @@ for solid_property in solid_properties:
abstol="1e-15",
time_discretization="BackwardEuler",
)
- model.timeloop.set_stepping(
+ model.time_loop.set_stepping(
process="HT",
type="FixedTimeStepping",
t_initial="0",
@@ -171,7 +171,7 @@ for solid_property in solid_properties:
repeat="4",
delta_t="0.25",
)
- model.timeloop.add_output(
+ model.time_loop.add_output(
type="VTK",
prefix="HT_test_",
repeat="1",
@@ -188,13 +188,13 @@ for solid_property in solid_properties:
name="t_Dirichlet_bottom", type="Constant", value="2"
)
# model.parameters.add_parameter(name="t_Dirichlet_top", type="Constant", value="1")
- model.processvars.set_ic(
+ model.process_variables.set_ic(
process_variable_name="temperature",
components="1",
order="1",
initial_condition="T0",
)
- model.processvars.add_bc(
+ model.process_variables.add_bc(
process_variable_name="temperature",
geometrical_set="square_1x1_geometry",
geometry="bottom",
@@ -202,19 +202,19 @@ for solid_property in solid_properties:
component="0",
parameter="t_Dirichlet_bottom",
)
- # model.processvars.add_bc(process_variable_name="temperature",
+ # model.process_variables.add_bc(process_variable_name="temperature",
# geometrical_set="square_1x1_geometry",
# geometry="top",
# type="Dirichlet",
# component="1",
# parameter="t_Dirichlet_top")
- model.processvars.set_ic(
+ model.process_variables.set_ic(
process_variable_name="pressure",
components="1",
order="1",
initial_condition="P0",
)
- model.processvars.add_bc(
+ model.process_variables.add_bc(
process_variable_name="pressure",
geometrical_set="square_1x1_geometry",
geometry="left",
@@ -222,19 +222,19 @@ for solid_property in solid_properties:
component="1",
parameter="p_Dirichlet_left",
)
- # model.processvars.addadd_bcBC(process_variable_name="pressure",
+ # model.process_variables.addadd_bcBC(process_variable_name="pressure",
# geometrical_set="square_1x1_geometry",
# geometry="right",
# type="Dirichlet",
# component="1",
# parameter="p_Dirichlet_right")
- model.nonlinsolvers.add_non_lin_solver(
+ model.nonlinear_solvers.add_non_lin_solver(
name="basic_picard",
type="Picard",
max_iter="4",
linear_solver="general_linear_solver",
)
- model.linsolvers.add_lin_solver(
+ model.linear_solvers.add_lin_solver(
name="general_linear_solver",
kind="lis",
solver_type="cg",
@@ -242,7 +242,7 @@ for solid_property in solid_properties:
max_iteration_step="10000",
error_tolerance="1e-16",
)
- model.linsolvers.add_lin_solver(
+ model.linear_solvers.add_lin_solver(
name="general_linear_solver",
kind="eigen",
solver_type="CG",
@@ -250,7 +250,7 @@ for solid_property in solid_properties:
max_iteration_step="10000",
error_tolerance="1e-16",
)
- model.linsolvers.add_lin_solver(
+ model.linear_solvers.add_lin_solver(
name="general_linear_solver",
kind="petsc",
solver_type="cg",
--
GitLab