Improve multipatch FEM API

docs/source/modules/feec.multipatch.rst

@@ -7,11 +7,6 @@ feec.multipatch
     :toctree: STUBDIR
     :template: autosummary/module.rst
 
-    multipatch.api
-    multipatch.fem_linear_operators
     multipatch.multipatch_domain_utilities
-    multipatch.non_matching_operators
-    multipatch.operators
-    multipatch.plotting_utilities
     multipatch.utilities
     multipatch.utils_conga_2d

docs/source/modules/feec.rst

@@ -7,8 +7,10 @@ feec
     :toctree: STUBDIR
     :template: autosummary/module.rst
 
+    feec.conforming_projectors
     feec.derivatives
-    feec.global_projectors
+    feec.global_geometric_projectors
+    feec.hodge
     feec.pull_push
     feec.pushforward
 

docs/source/modules/linalg.rst

@@ -14,6 +14,7 @@ linalg
     linalg.kernels
     linalg.kron
     linalg.solvers
+    linalg.sparse
     linalg.stencil
     linalg.topetsc
     linalg.utilities

psydac/api/discretization.py

@@ -30,7 +30,7 @@
 from psydac.api.fem          import DiscreteBilinearForm
 from psydac.api.fem          import DiscreteLinearForm
 from psydac.api.fem          import DiscreteFunctional
-from psydac.api.feec         import DiscreteDerham
+from psydac.api.feec         import DiscreteDeRham, DiscreteDeRhamMultipatch
 from psydac.api.glt          import DiscreteGltExpr
 from psydac.api.expr         import DiscreteExpr
 from psydac.api.equation     import DiscreteEquation
@@ -47,6 +47,7 @@
 __all__ = (
     'discretize',
     'discretize_derham',
+    'discretize_derham_multipatch',
     'reduce_space_degrees',
     'discretize_space',
     'discretize_domain'
@@ -147,10 +148,10 @@ def get_max_degree(*spaces):
 #==============================================================================           
 def discretize_derham(derham, domain_h, *, get_H1vec_space=False, **kwargs):
     """
-    Create a discrete De Rham sequence from a symbolic one.
+    Create a discrete de Rham sequence from a symbolic one.
 
     This function creates the discrete spaces from the symbolic ones, and then
-    creates a DiscreteDerham object from them.
+    creates a DiscreteDeRham object from them.
 
     Parameters
     ----------
@@ -168,18 +169,16 @@ def discretize_derham(derham, domain_h, *, get_H1vec_space=False, **kwargs):
 
     Returns
     -------
-    DiscreteDerham
-      The discrete De Rham sequence containing the discrete spaces, 
+    DiscreteDeRham
+      The discrete de Rham sequence containing the discrete spaces, 
       differential operators and projectors.
 
     See Also
     --------
     discretize_space
-
     """
 
     ldim    = derham.shape
-    mapping = domain_h.domain.mapping # NOTE: assuming single-patch domain!
     bases   = ['B'] + ldim * ['M']
     spaces  = [discretize_space(V, domain_h, basis=basis, **kwargs)
                for V, basis in zip(derham.spaces, bases)]
@@ -192,7 +191,48 @@ def discretize_derham(derham, domain_h, *, get_H1vec_space=False, **kwargs):
         #We still need to specify the symbolic space because of "_recursive_element_of" not implemented in sympde
         spaces.append(Xh)
 
-    return DiscreteDerham(mapping, *spaces)
+    return DiscreteDeRham(domain_h, *spaces)
+
+#==============================================================================
+def discretize_derham_multipatch(derham, domain_h, **kwargs):
+    """
+    Create a discrete multipatch de Rham sequence from a symbolic one.
+
+    This function creates the broken discrete spaces from the symbolic ones, and then
+    creates a DiscreteDeRhamMultipatch object from them.
+
+    Parameters
+    ----------
+    derham : sympde.topology.space.Derham
+        The symbolic Derham sequence.
+
+    domain_h : Geometry
+        Discrete domain where the spaces will be discretized.
+
+    **kwargs : dict
+        Optional parameters for the space discretization.
+
+    Returns
+    -------
+    DiscreteDeRhamMultipatch
+      The discrete multipatch de Rham sequence containing the discrete spaces, 
+      differential operators and projectors.
+
+    See Also
+    --------
+    discretize_derham
+    discretize_space
+    """
+
+    ldim   = derham.shape
+    bases  = ['B'] + ldim * ['M']
+    spaces = [discretize_space(V, domain_h, basis=basis, **kwargs) \
+            for V, basis in zip(derham.spaces, bases)]
+
+    return DiscreteDeRhamMultipatch(
+        domain_h = domain_h,
+        spaces   = spaces
+    )
 
 #==============================================================================
 def reduce_space_degrees(V, Vh, *, basis='B', sequence='DR'):
@@ -631,9 +671,12 @@ def discretize(a, *args, **kwargs):
     elif isinstance(a, BasicFunctionSpace):
         return discretize_space(a, *args, **kwargs)
 
-    elif isinstance(a, Derham):
+    elif isinstance(a, Derham) and not a.V0.is_broken:
         return discretize_derham(a, *args, **kwargs)
 
+    elif isinstance(a, Derham) and a.V0.is_broken:
+        return discretize_derham_multipatch(a, *args, **kwargs)
+
     elif isinstance(a, Domain):
         return discretize_domain(a, *args, **kwargs)