Merge branch 'createmesh' into 'master'

[web] Add jupyter notebook tutorial on mesh generation See merge request ogs/ogs!4740
ufz · Oct 17, 2023 · 1a1ed45 · 1a1ed45
2 parents 6755be8 + 077fc88
commit 1a1ed45
Show file tree

Hide file tree

Showing 11 changed files with 616 additions and 6 deletions.
diff --git a/Applications/Utils/Tests.cmake b/Applications/Utils/Tests.cmake
@@ -1408,4 +1408,6 @@ if(NOT OGS_USE_PETSC)
     NotebookTest(NOTEBOOKFILE ../../web/content/docs/tutorials/bhe_meshing/notebook-bhe_meshing.md
                  PYTHON_PACKAGES openpyxl
                  RUNTIME 10)
+    NotebookTest(NOTEBOOKFILE ../../web/content/docs/tutorials/mesh_tutorial/notebook-mesh_tutorial.md
+                 RUNTIME 10)
 endif()
diff --git a/web/content/docs/devguide/documentation/jupyter-docs/index.md b/web/content/docs/devguide/documentation/jupyter-docs/index.md
@@ -58,6 +58,7 @@ To get a preview of the web page run the `convert_notebooks`-script:
 # You need the converter-tool nbconvert installed. Recommended way is to
 # create and activate a virtual environment and install it there:
 python -m venv .venv  # or `python3 -m ...` on some systems
+source .venv/bin/activate # .\.venv\Scripts\Activate.ps1 on Windows
 pip install nbconvert
 
 python web/scripts/convert_notebooks.py

diff --git a/...h_ogs_tools-figures/web/content/docs/tutorials/mesh_ogs_tools/figures/hexes.png b/...h_ogs_tools-figures/web/content/docs/tutorials/mesh_ogs_tools/figures/hexes.png
diff --git a/...-figures/web/content/docs/tutorials/mesh_ogs_tools/figures/quad_mesh_graded.png b/...-figures/web/content/docs/tutorials/mesh_ogs_tools/figures/quad_mesh_graded.png
diff --git a/...gures/web/content/docs/tutorials/mesh_ogs_tools/figures/quad_mesh_init_size.png b/...gures/web/content/docs/tutorials/mesh_ogs_tools/figures/quad_mesh_init_size.png
diff --git a/...igures/web/content/docs/tutorials/mesh_ogs_tools/figures/quad_mesh_max_size.png b/...igures/web/content/docs/tutorials/mesh_ogs_tools/figures/quad_mesh_max_size.png
diff --git a/...tools-figures/web/content/docs/tutorials/mesh_ogs_tools/figures/quad_output.png b/...tools-figures/web/content/docs/tutorials/mesh_ogs_tools/figures/quad_output.png
diff --git a/...gures/web/content/docs/tutorials/mesh_ogs_tools/figures/quad_output_shifted.png b/...gures/web/content/docs/tutorials/mesh_ogs_tools/figures/quad_output_shifted.png
diff --git a/...s-figures/web/content/docs/tutorials/mesh_ogs_tools/figures/triangle_output.png b/...s-figures/web/content/docs/tutorials/mesh_ogs_tools/figures/triangle_output.png