Emmarothwell1/restricted _function_space: Implement a RestrictedFunctionSpace class.

.github/workflows/build.yml

@@ -84,6 +84,7 @@ jobs:
             --install defcon \
             --install gadopt \
             --install asQ \
+            --package-branch pyop2 emmarothwell1/restricted_function_space_review \
             || (cat firedrake-install.log && /bin/false)
       - name: Install test dependencies
         run: |

demos/eigenvalues_QG_basinmodes/qgbasinmodes.py.rst

@@ -4,7 +4,8 @@ Oceanic Basin Modes: Quasi-Geostrophic approach
 .. rst-class:: emphasis
 
    This tutorial was contributed by Christine Kaufhold and `Francis
-   Poulin <mailto:[email protected]>`__.
+   Poulin <mailto:[email protected]>`__. The tutorial was later updated by
+   Emma Rothwell to add in the restrict flag in the LinearEigenproblem.
 
 As a continuation of the Quasi-Geostrophic (QG) model described in the other
 tutorial, we will now see how we can use Firedrake to compute the spatial
@@ -138,12 +139,14 @@ We define the Test Function :math:`\phi` and the Trial Function
 
 To build the weak formulation of our equation we need to build two PETSc
 matrices in the form of a generalized eigenvalue problem,
-:math:`A\psi = \lambda M\psi` ::
+:math:`A\psi = \lambda M\psi`. This eigenproblem takes `restrict=True` to help
+users to avoid convergence failures by removing eigenvalues on the 
+boundary, while preserving the original function space for the eigenmodes. ::
 
   eigenproblem = LinearEigenproblem(
           A=beta*phi*psi.dx(0)*dx,
           M=-inner(grad(psi), grad(phi))*dx - F*psi*phi*dx,
-          bcs=bc)
+          bcs=bc, restrict=True)
 
 Next we program our eigenvalue solver through the PETSc options system. The
 first is specifying that we have an generalized eigenvalue problem that is

docs/source/conf.py

@@ -264,6 +264,7 @@
 \sphinxDUC{22C5}{$\cdot$}
 \sphinxDUC{25A3}{$\boxdot$}
 \sphinxDUC{03BB}{$\lambda$}
+\sphinxDUC{0393}{$\Gamma$}
 % Sphinx equivalent of
 % \DeclareUnicodeCharacter{}{}
 

docs/source/firedrake_24.rst

@@ -21,9 +21,76 @@ in the numerical solution of partial differential equations. The event
 will provide Firedrake users with the opportunity to interact directly
 with developers and with other users.
 
+The conference will begin around lunchtime on 16 September and end on the
+evening of 18 September.
 
-More details about registration, submissions, accommodation and the 
-conference dinner will be posted in due course.
+Conference venue
+----------------
+
+The conference will take place in the Andrew Wiles Building. Its main entrance
+is located on Woodstock Road (`see here for the precise location
+<https://what3words.com/policy.rises.bets>`__). Take some care in navigation, as
+Google Maps sometimes directs people to the old mathematics building on St.
+Giles.
+
+Accommodation
+-------------
+
+We have arranged a number of single en-suite rooms at `Oriel college, Oxford
+<https://www.oriel.ox.ac.uk>`__, for the nights of Monday 16 September and Tuesday
+17 September. The fee includes breakfast on the following days. Oriel College,
+founded in 1326, is one of the constituent colleges of the university of Oxford.
+The accommodation is approximately fifteen minutes walk from the Andrew Wiles
+Building.
+
+
+Conference dinner
+-----------------
+
+Registration includes a drinks reception and three-course dinner at `Corpus
+Christi college, Oxford <https://www.ccc.ox.ac.uk>`__, founded in 1517. The dinner will take place on the
+evening of 17 September. Corpus Christi college is right next to Oriel, about
+fifteen minutes walk from the Andrew Wiles building.
+
+It is possible during registration to purchase additional tickets for the
+dinner, to bring non-registered companions.
+
+.. image:: images/corpusdininghall.jpg
+   :width: 100%
+   :alt: Corpus Christi dining hall
+   :align: center
+
+
+Registration
+------------
+
+Registration is **now open**! `To register, please follow this link
+<https://www.oxforduniversitystores.co.uk/conferences-and-events/mathematical-institute/events/firedrake-2024>`__.
+
+The registration fees are as follows:
+
+.. list-table::
+   :widths: 25 25 50
+   :header-rows: 0
+
+   * -
+     - Without accommodation
+     - With accommodation
+   * - Student
+     - £25
+     - £200
+   * - Non-student
+     - £115
+     - £350
+
+
+Support
+-------
+
+The conference has been kindly supported by `EPSRC grant EP/W026163/1
+<https://gow.epsrc.ukri.org/NGBOViewGrant.aspx?GrantRef=EP/W026163/1>`__ and
+`EPSRC grant EP/W026066/1
+<https://gow.epsrc.ukri.org/NGBOViewGrant.aspx?GrantRef=EP/W026066/1>`__.
 
 ..
     Programme

firedrake/adjoint_utils/variational_solver.py

@@ -14,15 +14,15 @@ def wrapper(self, *args, **kwargs):
             from firedrake import derivative, adjoint, TrialFunction
             init(self, *args, **kwargs)
             self._ad_F = self.F
-            self._ad_u = self.u
+            self._ad_u = self.u_restrict
             self._ad_bcs = self.bcs
             self._ad_J = self.J
             try:
                 # Some forms (e.g. SLATE tensors) are not currently
                 # differentiable.
                 dFdu = derivative(self.F,
-                                  self.u,
-                                  TrialFunction(self.u.function_space()))
+                                  self.u_restrict,
+                                  TrialFunction(self.u_restrict.function_space()))
                 self._ad_adj_F = adjoint(dFdu)
             except (TypeError, NotImplementedError):
                 self._ad_adj_F = None
@@ -130,7 +130,7 @@ def _ad_problem_clone(self, problem, dependencies):
                 _ad_count_map[J_replace_map[coeff]] = coeff.count()
 
         nlvp = NonlinearVariationalProblem(replace(problem.F, F_replace_map),
-                                           F_replace_map[problem.u],
+                                           F_replace_map[problem.u_restrict],
                                            bcs=problem.bcs,
                                            J=replace(problem.J, J_replace_map))
         nlvp._ad_count_map_update(_ad_count_map)

firedrake/assemble.py

@@ -1631,15 +1631,15 @@ def _as_global_kernel_arg(self, tsfc_arg):
         # TODO Make singledispatchmethod with Python 3.8
         return _as_global_kernel_arg(tsfc_arg, self)
 
-    def _get_map_arg(self, finat_element):
+    def _get_map_arg(self, finat_element, boundary_set):
         """Get the appropriate map argument for the given FInAT element.
 
         :arg finat_element: A FInAT element.
         :returns: A :class:`op2.MapKernelArg` instance corresponding to
             the given FInAT element. This function uses a cache to ensure
             that PyOP2 knows when it can reuse maps.
         """
-        key = self._get_map_id(finat_element)
+        key = self._get_map_id(finat_element), boundary_set
 
         try:
             return self._map_arg_cache[key]
@@ -1679,28 +1679,28 @@ def _get_dim(self, finat_element):
         else:
             return (1,)
 
-    def _make_dat_global_kernel_arg(self, finat_element, index=None):
+    def _make_dat_global_kernel_arg(self, finat_element, boundary_set, index=None):
         if isinstance(finat_element, finat.EnrichedElement) and finat_element.is_mixed:
             assert index is None
-            subargs = tuple(self._make_dat_global_kernel_arg(subelem.element)
+            subargs = tuple(self._make_dat_global_kernel_arg(subelem.element, boundary_set)
                             for subelem in finat_element.elements)
             return op2.MixedDatKernelArg(subargs)
         else:
             dim = self._get_dim(finat_element)
-            map_arg = self._get_map_arg(finat_element)
+            map_arg = self._get_map_arg(finat_element, boundary_set)
             return op2.DatKernelArg(dim, map_arg, index)
 
-    def _make_mat_global_kernel_arg(self, relem, celem):
+    def _make_mat_global_kernel_arg(self, relem, celem, rbset, cbset):
         if any(isinstance(e, finat.EnrichedElement) and e.is_mixed for e in {relem, celem}):
-            subargs = tuple(self._make_mat_global_kernel_arg(rel.element, cel.element)
+            subargs = tuple(self._make_mat_global_kernel_arg(rel.element, cel.element, rbset, cbset)
                             for rel, cel in product(relem.elements, celem.elements))
             shape = len(relem.elements), len(celem.elements)
             return op2.MixedMatKernelArg(subargs, shape)
         else:
             # PyOP2 matrix objects have scalar dims so we flatten them here
             rdim = numpy.prod(self._get_dim(relem), dtype=int)
             cdim = numpy.prod(self._get_dim(celem), dtype=int)
-            map_args = self._get_map_arg(relem), self._get_map_arg(celem)
+            map_args = self._get_map_arg(relem, rbset), self._get_map_arg(celem, cbset)
             return op2.MatKernelArg((((rdim, cdim),),), map_args, unroll=self._unroll)
 
     @staticmethod
@@ -1737,25 +1737,29 @@ def _as_global_kernel_arg_output(_, self):
         if V.ufl_element().family() == "Real":
             return op2.GlobalKernelArg((1,))
         else:
-            return self._make_dat_global_kernel_arg(create_element(V.ufl_element()))
+            return self._make_dat_global_kernel_arg(create_element(V.ufl_element()), V.boundary_set)
     elif rank == 2:
         if all(V.ufl_element().family() == "Real" for V in Vs):
             return op2.GlobalKernelArg((1,))
         elif any(V.ufl_element().family() == "Real" for V in Vs):
-            el, = (create_element(V.ufl_element()) for V in Vs
-                   if V.ufl_element().family() != "Real")
-            return self._make_dat_global_kernel_arg(el)
+            for V in Vs:
+                if V.ufl_element().family() != "Real":
+                    el = create_element(V.ufl_element())
+                    boundary_set = V.boundary_set
+                    break
+            return self._make_dat_global_kernel_arg(el, boundary_set)
         else:
             rel, cel = (create_element(V.ufl_element()) for V in Vs)
-            return self._make_mat_global_kernel_arg(rel, cel)
+            rbset, cbset = (V.boundary_set for V in Vs)
+            return self._make_mat_global_kernel_arg(rel, cel, rbset, cbset)
     else:
         raise AssertionError
 
 
 @_as_global_kernel_arg.register(kernel_args.CoordinatesKernelArg)
 def _as_global_kernel_arg_coordinates(_, self):
     finat_element = create_element(self._mesh.ufl_coordinate_element())
-    return self._make_dat_global_kernel_arg(finat_element)
+    return self._make_dat_global_kernel_arg(finat_element, self._mesh.coordinates.function_space().boundary_set)
 
 
 @_as_global_kernel_arg.register(kernel_args.CoefficientKernelArg)
@@ -1773,7 +1777,7 @@ def _as_global_kernel_arg_coefficient(_, self):
         return op2.GlobalKernelArg((ufl_element.value_size,))
     else:
         finat_element = create_element(ufl_element)
-        return self._make_dat_global_kernel_arg(finat_element, index)
+        return self._make_dat_global_kernel_arg(finat_element, V.boundary_set, index)
 
 
 @_as_global_kernel_arg.register(kernel_args.ConstantKernelArg)
@@ -1788,7 +1792,7 @@ def _as_global_kernel_arg_cell_sizes(_, self):
     # this mirrors tsfc.kernel_interface.firedrake_loopy.KernelBuilder.set_cell_sizes
     ufl_element = finat.ufl.FiniteElement("P", self._mesh.ufl_cell(), 1)
     finat_element = create_element(ufl_element)
-    return self._make_dat_global_kernel_arg(finat_element)
+    return self._make_dat_global_kernel_arg(finat_element, self._mesh.coordinates.function_space().boundary_set)
 
 
 @_as_global_kernel_arg.register(kernel_args.ExteriorFacetKernelArg)
@@ -1815,7 +1819,7 @@ def _as_global_kernel_arg_cell_orientations(_, self):
     # this mirrors firedrake.mesh.MeshGeometry.init_cell_orientations
     ufl_element = finat.ufl.FiniteElement("DG", cell=self._mesh.ufl_cell(), degree=0)
     finat_element = create_element(ufl_element)
-    return self._make_dat_global_kernel_arg(finat_element)
+    return self._make_dat_global_kernel_arg(finat_element, self._mesh.coordinates.function_space().boundary_set)
 
 
 @_as_global_kernel_arg.register(LayerCountKernelArg)

firedrake/bcs.py

@@ -279,6 +279,8 @@ def __init__(self, V, g, sub_domain, method=None):
                 warnings.simplefilter('always', DeprecationWarning)
                 warnings.warn("Selecting a bcs method is deprecated. Only topological association is supported",
                               DeprecationWarning)
+        if len(V.boundary_set) and sub_domain not in V.boundary_set:
+            raise ValueError(f"Sub-domain {sub_domain} not in the boundary set of the restricted space.")
         super().__init__(V, sub_domain)
         if len(V) > 1:
             raise ValueError("Cannot apply boundary conditions on mixed spaces directly.\n"

firedrake/checkpointing.py

@@ -1437,7 +1437,7 @@ def _get_dm_for_checkpointing(self, tV):
         sd_key = self._get_shared_data_key_for_checkpointing(tV.mesh(), tV.ufl_element())
         if isinstance(tV.ufl_element(), (finat.ufl.VectorElement, finat.ufl.TensorElement)):
             nodes_per_entity, real_tensorproduct, block_size = sd_key
-            global_numbering = tV.mesh().create_section(nodes_per_entity, real_tensorproduct, block_size=block_size)
+            global_numbering, _ = tV.mesh().create_section(nodes_per_entity, real_tensorproduct, block_size=block_size)
             topology_dm = tV.mesh().topology_dm
             dm = PETSc.DMShell().create(tV.mesh()._comm)
             dm.setPointSF(topology_dm.getPointSF())