improving Domain.join

sympde/topology/domain.py

@@ -395,6 +395,75 @@ def from_file( cls, filename ):
 
     @classmethod
     def join(cls, patches, connectivity, name):
+        """
+        creates a multipatch domain by joining two or more patches in 2D or 3D
+
+        Parameters
+        ----------
+        patches : list
+            list of patches
+
+        connectivity : list
+            list of interfaces, identified by a tuple of 2 boundaries and an orientation: (bound_minus, bound_plus, ornt)
+            where 
+            - each boundary is identified by a tuple of 3 integers: (patch, axis, ext)
+              with patches given as objects (or by their indices in the patches list)
+            and 
+            - In 2D, ornt is an integer that can take the value of 1 or -1
+            - In 3D, ornt is a tuple of 3 integers that can take the value of 1 or -1
+            TODO: specify how these orientations are defined -- also not clear in the example below
+
+        name : str
+            name of the domain
+
+        Returns
+        -------
+        domain : Domain
+            multipatch domain
+
+        Notes
+        -----
+        The information about the connectivity is based on the format presented in the paper:
+        T. Dokken, E. Quak, V. Skytt. Requirements from Isogeometric Analysis for changes in product design ontologies, 2010.
+
+        Example
+        -------
+
+        TODO: check that this example is correct (in particular, that the orientations make sense)
+
+        # list of patches (mapped domains)
+        Omega_0 = F0(A)
+        Omega_1 = F1(A)
+        Omega_2 = F2(A)
+        Omega_3 = F3(A)
+
+        patches = [Omega_0, Omega_1, Omega_2, Omega_3]
+
+        # integers representing the axes 
+        axis_0 = 0
+        axis_1 = 1
+        axis_2 = 2
+
+        # integers representing the extremities: left (-1) or right (+1)
+        ext_0 = -1
+        ext_1 = +1
+
+        # The connectivity list in 2D
+        connectivity = [((Omega_0, axis_0, ext_0), (Omega_1, axis_0, ext_1),  1),
+                        ((Omega_1, axis_1, ext_0), (Omega_3, axis_1, ext_1), -1),
+                        ((Omega_0, axis_1, ext_0), (Omega_2, axis_1, ext_1),  1),
+                        ((Omega_2, axis_0, ext_0), (Omega_3, axis_0, ext_1), -1)]
+
+        # The connectivity list in 3D
+        connectivity = [((Omega_0, axis_0, ext_1), (Omega_1, axis_0, ext_0), ( 1,  1,  1)),
+                        ((Omega_0, axis_1, ext_1), (Omega_2, axis_1, ext_0), ( 1, -1,  1)),
+                        ((Omega_1, axis_1, ext_1), (Omega_3, axis_1, ext_0), (-1,  1, -1)),
+                        ((Omega_2, axis_0, ext_1), (Omega_3, axis_0, ext_0), (-1,  1,  1))]
+
+        # the multi-patch domain
+        Omega = Domain.join(patches=patches, connectivity=connectivity, name='Omega')
+
+        """
 
         assert isinstance(patches, (tuple, list))
         assert isinstance(connectivity, (tuple, list))
@@ -403,13 +472,21 @@ def join(cls, patches, connectivity, name):
         assert all(p.dim==patches[0].dim for p in patches)
         dim = int(patches[0].dim)
 
+        patch_given_by_indices = (len(connectivity) > 0 and isinstance(connectivity[0][0][0], int))
+
         from sympde.topology.mapping import MultiPatchMapping
         # ... connectivity
         interfaces = {}
         boundaries = []
         for cn in connectivity:
-            bnd_minus = patches[cn[0][0]].get_boundary(axis=cn[0][1], ext=cn[0][2])
-            bnd_plus  = patches[cn[1][0]].get_boundary(axis=cn[1][1], ext=cn[1][2])
+            if patch_given_by_indices:
+                patch_minus = patches[cn[0][0]]
+                patch_plus  = patches[cn[1][0]]
+            else:
+                patch_minus = cn[0][0]
+                patch_plus  = cn[1][0]
+            bnd_minus = patch_minus.get_boundary(axis=cn[0][1], ext=cn[0][2])
+            bnd_plus  =  patch_plus.get_boundary(axis=cn[1][1], ext=cn[1][2])
             if   dim == 1: ornt = None
             elif dim == 2: ornt = 1 if len(cn) == 2 else cn[2]
             elif dim == 3: