Upstream updates

Author: github-actions[bot]

08-composable-solvers.ipynb

@@ -126,7 +126,7 @@
     "bc_value = as_vector([0.25 * x**2 * (2-x)**2 *y**2, 0])\n",
     "\n",
     "bcs = [DirichletBC(W.sub(0), bc_value, 4),\n",
-    "       DirichletBC(W.sub(0), zero(mesh.geometric_dimension), (1, 2, 3))]"
+    "       DirichletBC(W.sub(0), 0, (1, 2, 3))]"
    ]
   },
   {
@@ -224,7 +224,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "w.assign(0)\n",
+    "w.zero()\n",
     "solver = create_solver(solver_parameters)\n",
     "solver.solve()\n",
     "convergence(solver)"
@@ -284,7 +284,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "w.assign(0)\n",
+    "w.zero()\n",
     "solver = create_solver(solver_parameters)\n",
     "solver.solve()\n",
     "convergence(solver)"
@@ -364,7 +364,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "w.assign(0)\n",
+    "w.zero()\n",
     "solver = create_solver(exact_inverse_parameters)\n",
     "solver.solve()\n",
     "convergence(solver)"
@@ -401,10 +401,11 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "w_t = TrialFunction(W)\n",
-    "_, p_t = split(w_t)\n",
+    "trial = TrialFunction(W)\n",
+    "_, p_t = split(trial)\n",
     "\n",
-    "pmat = lhs(derivative(F, w, w_t)) - 1/nu * p_t * q*dx"
+    "amat = lhs(derivative(F, w, trial))\n",
+    "pmat = amat - 1/nu * p_t * q*dx"
    ]
   },
   {
@@ -445,7 +446,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "w.assign(0)\n",
+    "w.zero()\n",
     "solver = create_solver(pmat_parameters, pmat=pmat)\n",
     "solver.solve()\n",
     "convergence(solver)"
@@ -474,9 +475,11 @@
     "class MassMatrix(AuxiliaryOperatorPC):\n",
     "    _prefix = \"mass_\"\n",
     "    def form(self, pc, test, trial):\n",
+    "        # Extract the original form and bcs\n",
+    "        a, bcs = super().form(pc, test, trial)\n",
     "        # Grab the definition of nu from the user application context (a dict)\n",
     "        nu = self.get_appctx(pc)[\"nu\"]\n",
-    "        return (-1/nu * test*trial*dx, None)"
+    "        return (-1/nu * test*trial*dx, bcs)"
    ]
   },
   {
@@ -517,7 +520,7 @@
    "outputs": [],
    "source": [
     "appctx = {\"nu\": nu} # arbitrary user data that is available inside the user PC object\n",
-    "w.assign(0)\n",
+    "w.zero()\n",
     "solver = create_solver(mass_parameters, appctx=appctx)\n",
     "solver.solve()\n",
     "convergence(solver)"
@@ -564,7 +567,7 @@
     "        \"ksp_type\": \"chebyshev\",\n",
     "        \"ksp_max_it\": 2,\n",
     "        \"pc_type\": \"python\",\n",
-    "        \"pc_python_type\": \"__main__.MassMatrix\",\n",
+    "        \"pc_python_type\": f\"{__name__}.MassMatrix\",\n",
     "        \"mass_pc_type\": \"sor\",\n",
     "    }\n",
     "}"
@@ -584,7 +587,7 @@
    "outputs": [],
    "source": [
     "appctx = {\"nu\": nu} # arbitrary user data that is available inside the user PC object\n",
-    "w.assign(0)\n",
+    "w.zero()\n",
     "solver = create_solver(fieldsplit_mg_parameters, appctx=appctx)\n",
     "solver.solve()\n",
     "convergence(solver)"
@@ -632,13 +635,10 @@
     "        }\n",
     "    },\n",
     "    \"mg_coarse\": {\n",
+    "        \"mat_type\": \"aij\",\n",
     "        \"ksp_type\": \"preonly\",\n",
-    "        \"pc_type\": \"python\",\n",
-    "        \"pc_python_type\": \"firedrake.AssembledPC\",\n",
-    "        \"assembled\": {\n",
-    "            \"pc_type\": \"lu\",\n",
-    "            \"pc_factor_mat_solver_type\": \"mumps\",\n",
-    "        }\n",
+    "        \"pc_type\": \"lu\",\n",
+    "        \"pc_factor_mat_solver_type\": \"mumps\",\n",
     "    }\n",
     "}"
    ]
@@ -656,7 +656,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "#w.assign(0)\n",
+    "#w.zero()\n",
     "#solver = create_solver(vanka_parameters)\n",
     "#solver.solve()\n",
     "#convergence(solver)"
@@ -686,7 +686,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.12.10"
+   "version": "3.12.3"
   }
  },
  "nbformat": 4,

11-extract-adjoint-solutions.ipynb

@@ -3,7 +3,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "610fdbfc",
+   "id": "bd78b4f6",
    "metadata": {},
    "outputs": [],
    "source": [

12-HPC_demo.ipynb

@@ -3,7 +3,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "bab929b1",
+   "id": "67d3c465",
    "metadata": {},
    "outputs": [],
    "source": [