Use modules in notebook

Author: danshapero

notebooks/rainier-monolithic.ipynb

@@ -7,7 +7,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import tqdm\n",
+    "from tqdm.notebook import trange\n",
     "import numpy as np\n",
     "from numpy import pi as π\n",
     "import matplotlib.pyplot as plt\n",
@@ -381,9 +381,9 @@
     "v, N, σ = firedrake.TestFunctions(Z)\n",
     "\n",
     "fns = [\n",
-    "    (model.VariationalForm.flow_law, N),\n",
-    "    (model.VariationalForm.friction_law, σ),\n",
-    "    (model.VariationalForm.momentum_balance, v),\n",
+    "    (model.variational.flow_law, N),\n",
+    "    (model.variational.friction_law, σ),\n",
+    "    (model.variational.momentum_balance, v),\n",
     "]"
    ]
   },
@@ -550,7 +550,7 @@
     "w.sub(0).assign(u_init)\n",
     "w.sub(1).assign(M_init)\n",
     "w.sub(2).assign(τ_init)\n",
-    "w.sub(3).assign(h)"
+    "w.sub(3).assign(h);"
    ]
   },
   {
@@ -572,9 +572,9 @@
     "v, N, σ, η = firedrake.TestFunctions(W)\n",
     "\n",
     "fns = [\n",
-    "    (model.VariationalForm.flow_law, N),\n",
-    "    (model.VariationalForm.friction_law, σ),\n",
-    "    (model.VariationalForm.momentum_balance, v),\n",
+    "    (model.variational.flow_law, N),\n",
+    "    (model.variational.friction_law, σ),\n",
+    "    (model.variational.momentum_balance, v),\n",
     "]\n",
     "\n",
     "fields = {\n",
@@ -588,7 +588,7 @@
     "terms = [fn(**fields, **rheology, test_function=ϕ) for fn, ϕ in fns]\n",
     "terms[0] = firedrake.replace(terms[0], {h: H})\n",
     "F_momentum = sum(terms)\n",
-    "F_mass = model.VariationalForm.mass_balance(thickness=h, velocity=u, accumulation=a, test_function=η)\n",
+    "F_mass = model.mass_balance(thickness=h, velocity=u, accumulation=a, test_function=η)\n",
     "\n",
     "F = F_momentum + F_mass"
    ]
@@ -626,7 +626,7 @@
     "\n",
     "final_time = 500.0\n",
     "num_steps = int(final_time / float(dt))\n",
-    "for step in tqdm.trange(num_steps):\n",
+    "for step in trange(num_steps):\n",
     "    solver.advance()\n",
     "    h = w.subfunctions[3]\n",
     "    w.subfunctions[3].interpolate(max_value(0, h))\n",