Explicitly import triplot from firedrake

Author: angus-g

01-spd-helmholtz.ipynb

@@ -122,7 +122,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "To start, we must make Firedrake available in the notebook.  It is available as a normal Python package, named `firedrake`.  To save on typing, we will import all of the public API into the current namespace"
+    "To start, we must make Firedrake available in the notebook.  We will import it through the `gadopt` package.  To save on typing, we will import all of the public API into the current namespace. For plotting within this notebook, we also explicitly import the `triplot` function."
    ]
   },
   {
@@ -131,7 +131,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from gadopt import *"
+    "from gadopt import *\n",
+    "from firedrake.pyplot import triplot, tripcolor"
    ]
   },
   {

02-poisson.ipynb

@@ -60,6 +60,7 @@
     "    !wget \"https://github.com/g-adopt/tutorials/releases/latest/download/firedrake-install-real.sh\" -O \"/tmp/firedrake-install.sh\" && bash \"/tmp/firedrake-install.sh\"\n",
     "    import firedrake\n",
     "from gadopt import *\n",
+    "from firedrake.pyplot import tripcolor\n",
     "mesh = UnitSquareMesh(10, 10)\n",
     "V = FunctionSpace(mesh, \"Lagrange\", 1)"
    ]

03-elasticity.ipynb

@@ -56,6 +56,7 @@
     "    !wget \"https://github.com/g-adopt/tutorials/releases/latest/download/firedrake-install-real.sh\" -O \"/tmp/firedrake-install.sh\" && bash \"/tmp/firedrake-install.sh\"\n",
     "    import firedrake\n",
     "from gadopt import *\n",
+    "from firedrake.pyplot import triplot\n",
     "length = 1\n",
     "width = 0.2\n",
     "mesh = RectangleMesh(40, 20, length, width)"

04-burgers.ipynb

@@ -58,6 +58,7 @@
     "    !wget \"https://github.com/g-adopt/tutorials/releases/latest/download/firedrake-install-real.sh\" -O \"/tmp/firedrake-install.sh\" && bash \"/tmp/firedrake-install.sh\"\n",
     "    import firedrake\n",
     "from gadopt import *\n",
+    "from firedrake.pyplot import plot\n",
     "\n",
     "n = 100\n",
     "mesh = PeriodicIntervalMesh(n, length=2)\n",

05-pde-constrained-optimisation.ipynb

@@ -49,7 +49,8 @@
    "outputs": [],
    "source": [
     "from gadopt import *\n",
-    "from gadopt.inverse import *"
+    "from gadopt.inverse import *\n",
+    "from firedrake.pyplot import quiver, streamplot, tricontourf, triplot"
    ]
   },
   {

06-GD-2D-convection.ipynb

@@ -141,7 +141,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from gadopt import *"
+    "from gadopt import *\n",
+    "from firedrake.pyplot import tripcolor"
    ]
   },
   {
@@ -290,7 +291,7 @@
     "Ra, delta_t = Constant(1e4), Constant(1e-3)\n",
     "\n",
     "approximation = BoussinesqApproximation(Ra)\n",
-    "t_adapt = TimestepAdaptor(delta_t, V, maximum_timestep=0.1, increase_tolerance=1.5)"
+    "t_adapt = TimestepAdaptor(delta_t, u, V, maximum_timestep=0.1, increase_tolerance=1.5)"
    ]
   },
   {
@@ -377,7 +378,7 @@
     "gd = GeodynamicalDiagnostics(u, p, T, bottom, top)\n",
     "\n",
     "for timestep in range(0, no_timesteps+1):\n",
-    "    dt = t_adapt.update_timestep(u)\n",
+    "    dt = t_adapt.update_timestep()\n",
     "    time += dt\n",
     "\n",
     "    stokes_solver.solve()\n",
@@ -521,7 +522,7 @@
     "gd = GeodynamicalDiagnostics(u, p, T, bottom, top)\n",
     "\n",
     "for timestep in range(0, no_timesteps+1):\n",
-    "    dt = t_adapt.update_timestep(u)\n",
+    "    dt = t_adapt.update_timestep()\n",
     "    time += dt\n",
     "\n",
     "    stokes_solver.solve()\n",