Merge branch 'v2.11_release' of https://github.com/underworldcode/und…

…erworld2 into v2.11_release
underworldcode · Jul 26, 2021 · 6ae368a · 6ae368a
2 parents cbc9a26 + 3275d8e
commit 6ae368a
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 41 deletions.
diff --git a/docs/examples/04_StokesSinker.ipynb b/docs/examples/04_StokesSinker.ipynb
diff --git a/docs/examples/06_SlabSubduction.ipynb b/docs/examples/06_SlabSubduction.ipynb
diff --git a/docs/user_guide/08_StokesSolver.ipynb b/docs/user_guide/08_StokesSolver.ipynb
@@ -247,11 +247,15 @@
     }
    ],
    "source": [
-    "solver.set_inner_method(\"mumps\")\n",
-    "solver.options.scr.ksp_type=\"cg\"\n",
-    "solver.set_penalty(1.0e7)\n",
-    "solver.solve()\n",
-    "solver.print_stats()"
+    "try:\n",
+    "    solver.set_inner_method(\"mumps\")\n",
+    "    solver.options.scr.ksp_type=\"cg\"\n",
+    "    solver.set_penalty(1.0e7)\n",
+    "    solver.solve()\n",
+    "    solver.print_stats()\n",
+    "except RuntimeError:\n",
+    "    # If the above fails, \"mumps\" probably isn't installed\n",
+    "    pass"
    ]
   },
   {
@@ -317,7 +321,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.5.3"
+   "version": "3.8.10"
   }
  },
  "nbformat": 4,