diff --git a/scripts/ci/jobs/jupyter.yml b/scripts/ci/jobs/jupyter.yml
index 02acf47d851e8c498f8d2256367807fbdbd99128..eca40ecb0d68eb239e346a0f768122ea31407f3e 100644
--- a/scripts/ci/jobs/jupyter.yml
+++ b/scripts/ci/jobs/jupyter.yml
@@ -1,6 +1,7 @@
test notebooks via wheel:
stage: build
tags: [envinf3, shell]
+ needs: []
before_script:
- cd Tests/Data
- python -m venv --upgrade-deps .venv
@@ -10,6 +11,13 @@ test notebooks via wheel:
- pip install -r requirements-dev.txt
- pip install -r requirements-ogs.txt
script:
+ # Glacier tutorial
+ - |
+ cd ../../web/content/docs/tutorials/advancing-glacier
+ python mesh_basin.py
+ msh2vtu mesh_basin.msh --ogs --rdcd
+ ogs OGSinput_basin.prj
+ cd -
# Append mtest install directory to PYTHONPATH
- export PYTHONPATH=/opt/tfel-rliv-4.0/lib/python3.11/site-packages:$PYTHONPATH
- export LD_LIBRARY_PATH=/opt/tfel-rliv-4.0/lib:$LD_LIBRARY_PATH
@@ -36,3 +44,4 @@ test notebooks via wheel:
paths:
- Tests/Data/_out/**/*.html
- Tests/Data/_out/**/*out.txt
+ - web/**/glacier.pdf
diff --git a/web/content/docs/tutorials/advancing-glacier/.gitignore b/web/content/docs/tutorials/advancing-glacier/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..361fb12d082e4cfa8ca7f0e2741867eb89c1a543
--- /dev/null
+++ b/web/content/docs/tutorials/advancing-glacier/.gitignore
@@ -0,0 +1,2 @@
+*.vtu
+glacier.pdf
diff --git a/web/content/docs/tutorials/advancing-glacier/OGSinput_basin.prj b/web/content/docs/tutorials/advancing-glacier/OGSinput_basin.prj
index 93f41a2f44c8bf2c637f0782c00d738ac129219c..ec88b47ce4acea517b6fd32048f4d99d99a156a7 100644
--- a/web/content/docs/tutorials/advancing-glacier/OGSinput_basin.prj
+++ b/web/content/docs/tutorials/advancing-glacier/OGSinput_basin.prj
@@ -40,7 +40,6 @@
<youngs_modulus>YoungModulus</youngs_modulus>
<poissons_ratio>PoissonRatio</poissons_ratio>
</constitutive_relation>
- <solid_density>rho_sr</solid_density>
<specific_body_force>0 -9.81</specific_body_force>
<process_variables>
<process_variable>displacement</process_variable>
@@ -81,7 +80,7 @@
</processes>
<output>
<type>VTK</type>
- <prefix>OGSoutput_basin{:process_id}</prefix>
+ <prefix>OGSoutput_basin</prefix>
<timesteps>
<pair>
<repeat>100</repeat>
@@ -96,6 +95,22 @@
<suffix>_ts_{:timestep}_t_{:time}</suffix>
</output>
</time_loop>
+ <media>
+ <medium id="0,1,2,3">
+ <phases>
+ <phase>
+ <type>Solid</type>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>1</value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ </medium>
+ </media>
<parameters>
<!-- Material parameters -->
<parameter>
@@ -104,19 +119,19 @@
<group_id_property>MaterialIDs</group_id_property>
<index_values>
<index>0</index>
- <value>60e6</value> <!--Pa-->
+ <value>60e6</value> <!--Pa-->
</index_values>
<index_values>
<index>1</index>
- <value>60e7</value> <!--Pa-->
+ <value>60e7</value> <!--Pa-->
</index_values>
<index_values>
<index>2</index>
- <value>60e6</value> <!--Pa-->
+ <value>60e6</value> <!--Pa-->
</index_values>
<index_values>
<index>3</index>
- <value>60e9</value> <!--Pa-->
+ <value>60e9</value> <!--Pa-->
</index_values>
</parameter>
<parameter>
@@ -140,11 +155,6 @@
<value>0.45</value>
</index_values>
</parameter>
- <parameter>
- <name>rho_sr</name>
- <type>Constant</type>
- <value>1</value>
- </parameter>
<!-- Initial and boundary values -->
<parameter>
<name>displacement0</name>
@@ -180,8 +190,8 @@
<mesh>mesh_basin_physical_group_Top</mesh>
<type>Python</type>
<component>1</component>
- <bc_object>bc_y</bc_object> <!--the python object is created using timeBCs_glacier.py (see L. 10)-->
- <flush_stdout>true</flush_stdout> <!-- for debugging: false -->
+ <bc_object>bc_y</bc_object> <!--the python object is created using timeBCs_glacier.py (see L. 10)-->
+ <flush_stdout>true</flush_stdout> <!-- for debugging: false -->
</boundary_condition>
<boundary_condition>
<mesh>mesh_basin_physical_group_Bottom</mesh>
diff --git a/web/content/docs/tutorials/advancing-glacier/glacierclass.py b/web/content/docs/tutorials/advancing-glacier/glacierclass.py
index 7c8ed26747f5589c58cc94185bd53dc8d692bf38..d71dd06d15f0743e0e0598016ff721a0ba6e7821 100644
--- a/web/content/docs/tutorials/advancing-glacier/glacierclass.py
+++ b/web/content/docs/tutorials/advancing-glacier/glacierclass.py
@@ -3,6 +3,7 @@
import numpy as np
import matplotlib.pyplot as plt
+import os
from math import pi, sin, cos, sinh, cosh, sqrt
@@ -31,7 +32,7 @@ class glacier:
xi = (x - self.x_0) / l
xi = np.array(xi)
xi[xi > 1] = 1.0
- return self.height(t) * np.sqrt(1 - xi ** 1)
+ return self.height(t) * np.sqrt(1 - xi**1)
def height(self, t):
return self.H_max * (t - self.t_0) / self.t_1
@@ -61,7 +62,8 @@ class glacier:
fig.legend()
fig.savefig("glacier.pdf")
- plt.show()
+ if "CI" not in os.environ:
+ plt.show()
fig, ax = plt.subplots()
ax.plot(tRange, self.height(tRange))
diff --git a/web/content/docs/tutorials/advancing-glacier/history.sh b/web/content/docs/tutorials/advancing-glacier/history.sh
old mode 100644
new mode 100755
index 0187e1cb42b1a182af381778545dbe6e30f0b845..ab3ab6ed22efca629ee7602f90cd108e5e8336f7
--- a/web/content/docs/tutorials/advancing-glacier/history.sh
+++ b/web/content/docs/tutorials/advancing-glacier/history.sh
@@ -1,12 +1,19 @@
+#!/usr/bin/env bash
+
+python3 -m venv .venv
+source .venv/bin/activate
+pip install --pre --index-url https://gitlab.opengeosys.org/api/v4/projects/120/packages/pypi/simple ogs gmsh ogstools
+
#create the mesh via python control for gmsh
-python3 mesh_basin.py
+python mesh_basin.py
#transform the mesh and extract boundary meshes
-python3 msh2vtu.py mesh_basin.msh --ogs --rdcd
+msh2vtu mesh_basin.msh --ogs --rdcd
#run OpenGeoSys (with the debug level information)
-myPATH2OGS=~/Forschung/gitprojects/OGS/build-release/bin
-${myPATH2OGS}/ogs -l debug OGSinput_basin.prj
+ogs -l debug OGSinput_basin.prj
+
+#do the postprocessing with ParaView, disabled for CI
+# paraview OGSoutput_basin0.pvd
-#do the postprocessing with ParaView
-paraview OGSoutput_basin0.pvd
+deactivate
diff --git a/web/content/docs/tutorials/advancing-glacier/mesh_basin.py b/web/content/docs/tutorials/advancing-glacier/mesh_basin.py
index c478acbdfab2258ae4d75fdaa19cb969f95c6853..7ffc7eee34ec861884b468729bade8f08217c677 100644
--- a/web/content/docs/tutorials/advancing-glacier/mesh_basin.py
+++ b/web/content/docs/tutorials/advancing-glacier/mesh_basin.py
@@ -10,6 +10,7 @@
# full documentation of all the functions in the API):
import numpy
import gmsh
+import os
# Before using any functions in the Python API, Gmsh must be initialized:
gmsh.initialize()
@@ -195,7 +196,8 @@ gmsh.write("mesh_basin.msh")
# will save the mesh in the vtk, unv and stl format.
# To visualize the model we can run the graphical user interface with:
-gmsh.fltk.run()
+if "CI" not in os.environ:
+ gmsh.fltk.run()
# Note that starting with Gmsh 3.0, models can be built using other geometry
diff --git a/web/content/docs/tutorials/advancing-glacier/timeBCs_glacier.py b/web/content/docs/tutorials/advancing-glacier/timeBCs_glacier.py
index a7516cf8fea660373278e19fce1b05d1d0c48856..a1e364140fbf338b7ab789618147e630791a0bf1 100644
--- a/web/content/docs/tutorials/advancing-glacier/timeBCs_glacier.py
+++ b/web/content/docs/tutorials/advancing-glacier/timeBCs_glacier.py
@@ -1,4 +1,8 @@
-import OpenGeoSys
+try:
+ import ogs.callbacks as OpenGeoSys
+except ModuleNotFoundError:
+ import OpenGeoSys
+
import glacierclass as glc
L_dom = 120000 # m