New hierarchy for Mapping classes

.github/workflows/documentation.yml

@@ -36,21 +36,23 @@ jobs:
         make -C docs clean
         make -C docs html
         python docs/update_links.py
-    - name: Setup Pages
-      uses: actions/configure-pages@v3
-    - name: Upload artifact
-      uses: actions/upload-pages-artifact@v1
-      with:
-        path: 'docs/build/html'
 
-  deploy_docs:
-    if: github.event_name != 'pull_request'
-    needs: build_docs
-    runs-on: ubuntu-latest
-    environment:
-      name: github-pages
-      url: ${{ steps.deployment.outputs.page_url }}
-    steps:
-    - name: Deploy to GitHub Pages
-      id: deployment
-      uses: actions/deploy-pages@v2
+    # Disable docs deployment for now as we're in psydac fork repo
+    # - name: Setup Pages
+    #   uses: actions/configure-pages@v3
+    # - name: Upload artifact
+    #   uses: actions/upload-pages-artifact@v1
+    #   with:
+    #     path: 'docs/build/html'
+
+  # deploy_docs:
+  #   if: github.event_name != 'pull_request'
+  #   needs: build_docs
+  #   runs-on: ubuntu-latest
+  #   environment:
+  #     name: github-pages
+  #     url: ${{ steps.deployment.outputs.page_url }}
+  #   steps:
+  #   - name: Deploy to GitHub Pages
+  #     id: deployment
+  #     uses: actions/deploy-pages@v2

.gitignore

@@ -30,3 +30,5 @@ __test__/
 
 # pycharm directory
 .idea
+
+psydac/mapping/mapping_heritage_test.ipynb

examples/poisson_2d_mapping.py

@@ -6,7 +6,7 @@
 import matplotlib.pyplot as plt
 from   mpl_toolkits.axes_grid1 import make_axes_locatable
 
-from sympde.topology.callable_mapping   import CallableMapping
+
 from sympde.topology.analytical_mapping import IdentityMapping, PolarMapping
 from sympde.topology.analytical_mapping import TargetMapping, CzarnyMapping
 

mesh/generate_pipe.py

@@ -1,5 +1,7 @@
 import numpy as np
 
+raise NotImplementedError("igakit is no longer imported to support python 3.12")
+
 from igakit.cad import circle, ruled, bilinear, join
 from psydac.cad.geometry             import Geometry, export_nurbs_to_hdf5, refine_nurbs
 

mesh/multipatch/create_magnet.py

@@ -1,5 +1,7 @@
 import numpy as np
 
+raise NotImplementedError("igakit is no longer imported to support python 3.12")
+
 from psydac.cad.multipatch import export_multipatch_nurbs_to_hdf5
 from igakit.cad import bilinear
 from igakit.cad import circle

psydac/api/ast/evaluation.py

@@ -1,7 +1,7 @@
 from sympy import symbols, Range
 from sympy import Tuple
 
-from sympde.topology             import Mapping
+from sympde.topology  import BaseMapping
 from sympde.topology             import ScalarFunction
 from sympde.topology             import SymbolicExpr
 from sympde.topology.space       import element_of
@@ -189,8 +189,8 @@ def __new__(cls, space, mapping, name=None,
                 nderiv=1, is_rational_mapping=None,
                 backend=None):
 
-        if not isinstance(mapping, Mapping):
-            raise TypeError('> Expecting a Mapping object')
+        if not isinstance(mapping, BaseMapping):
+            raise TypeError('> Expecting a BaseMapping object')
 
         obj = SplBasic.__new__(cls, mapping, name=name,
                                prefix='eval_mapping', mapping=mapping,

psydac/api/ast/fem.py

@@ -9,10 +9,11 @@
 
 from sympde.expr                 import LinearForm, BilinearForm, Functional
 from sympde.topology.basic       import Boundary, Interface
-from sympde.topology             import H1SpaceType, HcurlSpaceType, HdivSpaceType, L2SpaceType, UndefinedSpaceType, IdentityMapping
+from sympde.topology             import H1SpaceType, HcurlSpaceType, HdivSpaceType, L2SpaceType, UndefinedSpaceType
 from sympde.topology.space       import ScalarFunction, VectorFunction, IndexedVectorFunction
 from sympde.topology.derivatives import _logical_partial_derivatives, get_max_logical_partial_derivatives
-from sympde.topology.mapping     import InterfaceMapping
+from sympde.topology.analytic_mappings import IdentityMapping
+from sympde.topology.base_mapping     import InterfaceMapping
 from sympde.calculus.core        import is_zero, PlusInterfaceOperator
 
 from psydac.pyccel.ast.core import _atomic, Assign, Import, Return, Comment, Continue, Slice

psydac/api/ast/glt.py

@@ -31,7 +31,7 @@
 from sympde.topology             import LogicalExpr
 from sympde.topology             import SymbolicExpr
 from sympde.calculus.matrices    import SymbolicDeterminant
-from sympde.topology             import IdentityMapping
+from sympde.topology.analytic_mappings             import IdentityMapping
 
 from sympde.expr.evaluation import TerminalExpr
 

psydac/api/ast/nodes.py

@@ -18,7 +18,7 @@
 from sympde.topology import VectorFunctionSpace
 from sympde.topology import IndexedVectorFunction
 from sympde.topology import H1SpaceType, L2SpaceType, UndefinedSpaceType
-from sympde.topology import Mapping
+from sympde.topology import BaseMapping
 from sympde.topology import dx1, dx2, dx3
 from sympde.topology import get_atom_logical_derivatives
 from sympde.topology import Interface
@@ -395,8 +395,8 @@ class EvalField(BaseNode):
     tests   : tuple_like (Variable)
         The field to be evaluated
 
-    mapping : <Mapping>
-        Sympde Mapping object
+    mapping : <BaseMapping>
+        Sympde BaseMapping object
 
     nderiv  : int
         Maximum number of derivatives
@@ -542,8 +542,8 @@ class EvalMapping(BaseNode):
     q_basis : <GlobalTensorQuadratureTestBasis>
         The 1d basis function of the tensor-product space
 
-    mapping : <Mapping>
-        Sympde Mapping object
+    mapping : <BaseMapping>
+        Sympde BaseMapping object
 
     components  : <GeometryExpressions>
         The 1d coefficients of the mapping
@@ -1046,9 +1046,9 @@ class CoefficientBasis(ScalarNode):
     """
     """
     def __new__(cls, target):
-        ls = target.atoms(ScalarFunction, VectorFunction, Mapping)
+        ls = target.atoms(ScalarFunction, VectorFunction, BaseMapping)
         if not len(ls) == 1:
-            raise TypeError('Expecting a scalar/vector test function or a Mapping')
+            raise TypeError('Expecting a scalar/vector test function or a BaseMapping')
         return Basic.__new__(cls, target)
 
     @property
@@ -2029,7 +2029,7 @@ class GeometryAtom(AtomicNode):
     """
     """
     def __new__(cls, expr):
-        ls = list(expr.atoms(Mapping))
+        ls = list(expr.atoms(BaseMapping))
         if not(len(ls) == 1):
             raise ValueError('Expecting an expression with one mapping')
 

psydac/api/ast/tests/test_nodes.py

@@ -15,7 +15,7 @@
 from sympde.topology import ScalarFunctionSpace
 from sympde.topology import elements_of
 from sympde.topology import Square
-from sympde.topology import Mapping, IdentityMapping
+from sympde.topology import BaseMapping, IdentityMapping
 from sympde.expr     import integral
 from sympde.expr     import LinearForm
 from sympde.expr     import BilinearForm
@@ -69,7 +69,7 @@
 
 # ... abstract model
 domain = Square()
-M      = Mapping('M', domain.dim)
+M      = BaseMapping('M', domain.dim)
 
 V      = ScalarFunctionSpace('V', domain)
 u,v    = elements_of(V, names='u,v')

psydac/api/ast/utilities.py

@@ -11,7 +11,7 @@
 from sympde.topology.space       import VectorFunction
 from sympde.topology.space       import IndexedVectorFunction
 from sympde.topology.space       import element_of
-from sympde.topology             import Mapping
+from sympde.topology             import BaseMapping
 from sympde.topology             import Boundary
 from sympde.topology.derivatives import _partial_derivatives
 from sympde.topology.derivatives import _logical_partial_derivatives
@@ -68,10 +68,10 @@ def is_mapping(expr):
     if isinstance(expr, _logical_partial_derivatives):
         return is_mapping(expr.args[0])
 
-    elif isinstance(expr, Indexed) and isinstance(expr.base, Mapping):
+    elif isinstance(expr, Indexed) and isinstance(expr.base, BaseMapping):
         return True
 
-    elif isinstance(expr, Mapping):
+    elif isinstance(expr, BaseMapping):
         return True
 
     return False
@@ -141,8 +141,8 @@ def compute_atoms_expr(atomic_exprs, indices_quad, indices_test,
     is_linear : <boolean>
         variable to determine if we are in the linear case
 
-    mapping : <Mapping>
-        Mapping object
+    mapping : <BaseMapping>
+        BaseMapping object
 
     Returns
     -------
@@ -259,8 +259,8 @@ def compute_atoms_expr_field(atomic_exprs, indices_quad,
     test_function : <Symbol>
         test_function Symbol
 
-    mapping : <Mapping>
-        Mapping object
+    mapping : <BaseMapping>
+        BaseMapping object
 
     Returns
     -------

psydac/api/feec.py

@@ -1,4 +1,4 @@
-from sympde.topology.mapping import Mapping
+from sympde.topology import BaseMapping
 
 from psydac.api.basic              import BasicDiscrete
 from psydac.feec.derivatives       import Derivative_1D, Gradient_2D, Gradient_3D
@@ -20,16 +20,15 @@ class DiscreteDerham(BasicDiscrete):
 
     Parameters
     ----------
-    mapping : Mapping or None
+    mapping : BaseMapping or None
         Symbolic mapping from the logical space to the physical space, if any.
 
     *spaces : list of FemSpace
         The discrete spaces of the de Rham sequence.
 
     Notes
     -----
-    - The basic type Mapping is defined in module sympde.topology.mapping.
-      A discrete mapping (spline or NURBS) may be attached to it.
+    - The basic type BaseMapping is defined in module sympde.topology.base_mapping
 
     - This constructor should not be called directly, but rather from the
       `discretize_derham` function in `psydac.api.discretization`.
@@ -39,7 +38,7 @@ class DiscreteDerham(BasicDiscrete):
     """
     def __init__(self, mapping, *spaces):
 
-        assert (mapping is None) or isinstance(mapping, Mapping)
+        assert (mapping is None) or isinstance(mapping, BaseMapping)
         assert all(isinstance(space, FemSpace) for space in spaces)
 
         self.has_vec = isinstance(spaces[-1], VectorFemSpace)
@@ -55,7 +54,6 @@ def __init__(self, mapping, *spaces):
 
         self._dim     = dim
         self._mapping = mapping
-        self._callable_mapping = mapping.get_callable_mapping() if mapping else None
 
         if dim == 1:
             D0 = Derivative_1D(spaces[0], spaces[1])
@@ -141,11 +139,11 @@ def mapping(self):
         """The mapping from the logical space to the physical space."""
         return self._mapping
 
-    @property
-    def callable_mapping(self):
-        """The mapping as a callable."""
-        return self._callable_mapping
-
+    @mapping.setter
+    def mapping(self, value):
+        assert isinstance(value, BaseMapping), "Mapping must be an instance of BaseMapping"
+        self._mapping = value
+        
     @property
     def derivatives_as_matrices(self):
         """Differential operators of the De Rham sequence as LinearOperator objects."""
@@ -203,8 +201,8 @@ def projectors(self, *, kind='global', nquads=None):
             P0 = Projector_H1(self.V0)
             P1 = Projector_L2(self.V1, nquads)
             if self.mapping:
-                P0_m = lambda f: P0(pull_1d_h1(f, self.callable_mapping))
-                P1_m = lambda f: P1(pull_1d_l2(f, self.callable_mapping))
+                P0_m = lambda f: P0(pull_1d_h1(f, self.mapping))
+                P1_m = lambda f: P1(pull_1d_l2(f, self.mapping))
                 return P0_m, P1_m
             return P0, P1
 
@@ -224,14 +222,14 @@ def projectors(self, *, kind='global', nquads=None):
                 Pvec = Projector_H1vec(self.H1vec, nquads)
 
             if self.mapping:
-                P0_m = lambda f: P0(pull_2d_h1(f, self.callable_mapping))
-                P2_m = lambda f: P2(pull_2d_l2(f, self.callable_mapping))
+                P0_m = lambda f: P0(pull_2d_h1(f, self.mapping))
+                P2_m = lambda f: P2(pull_2d_l2(f, self.mapping))
                 if kind == 'hcurl':
-                    P1_m = lambda f: P1(pull_2d_hcurl(f, self.callable_mapping))
+                    P1_m = lambda f: P1(pull_2d_hcurl(f, self.mapping))
                 elif kind == 'hdiv':
-                    P1_m = lambda f: P1(pull_2d_hdiv(f, self.callable_mapping))
+                    P1_m = lambda f: P1(pull_2d_hdiv(f, self.mapping))
                 if self.has_vec : 
-                    Pvec_m = lambda f: Pvec(pull_2d_h1vec(f, self.callable_mapping))
+                    Pvec_m = lambda f: Pvec(pull_2d_h1vec(f, self.mapping))
                     return P0_m, P1_m, P2_m, Pvec_m
                 else : 
                     return P0_m, P1_m, P2_m
@@ -249,12 +247,12 @@ def projectors(self, *, kind='global', nquads=None):
             if self.has_vec : 
                 Pvec = Projector_H1vec(self.H1vec)
             if self.mapping:
-                P0_m = lambda f: P0(pull_3d_h1   (f, self.callable_mapping))
-                P1_m = lambda f: P1(pull_3d_hcurl(f, self.callable_mapping))
-                P2_m = lambda f: P2(pull_3d_hdiv (f, self.callable_mapping))
-                P3_m = lambda f: P3(pull_3d_l2   (f, self.callable_mapping))
+                P0_m = lambda f: P0(pull_3d_h1   (f, self.mapping))
+                P1_m = lambda f: P1(pull_3d_hcurl(f, self.mapping))
+                P2_m = lambda f: P2(pull_3d_hdiv (f, self.mapping))
+                P3_m = lambda f: P3(pull_3d_l2   (f, self.mapping))
                 if self.has_vec : 
-                    Pvec_m = lambda f: Pvec(pull_3d_h1vec(f, self.callable_mapping))
+                    Pvec_m = lambda f: Pvec(pull_3d_h1vec(f, self.mapping))
                     return P0_m, P1_m, P2_m, P3_m, Pvec_m
                 else : 
                     return P0_m, P1_m, P2_m, P3_m

psydac/api/fem.py

@@ -205,7 +205,7 @@ class DiscreteBilinearForm(BasicDiscrete):
         The backend used to accelerate the computing kernels of the linear operator.
         The backend dictionaries are defined in the file psydac/api/settings.py
 
-    symbolic_mapping : Sympde.topology.Mapping, optional
+    symbolic_mapping : Sympde.topology.BaseMapping, optional
         The symbolic mapping which defines the physical domain of the bilinear form.
 
     See Also
@@ -952,7 +952,7 @@ class DiscreteSesquilinearForm(DiscreteBilinearForm):
         The backend used to accelerate the computing kernels of the linear operator.
         The backend dictionaries are defined in the file psydac/api/settings.py
 
-    symbolic_mapping: Sympde.topology.Mapping
+    symbolic_mapping: Sympde.topology.BaseMapping
         The symbolic mapping which defines the physical domain of the sesqui-linear form.
 
     """
@@ -998,7 +998,7 @@ class DiscreteLinearForm(BasicDiscrete):
         The backend used to accelerate the computing kernels.
         The backend dictionaries are defined in the file psydac/api/settings.py
 
-    symbolic_mapping : Sympde.topology.Mapping, optional
+    symbolic_mapping : Sympde.topology.BaseMapping, optional
         The symbolic mapping which defines the physical domain of the linear form.
 
     See Also
@@ -1408,7 +1408,7 @@ class DiscreteFunctional(BasicDiscrete):
         The backend used to accelerate the computing kernels.
         The backend dictionaries are defined in the file psydac/api/settings.py
 
-    symbolic_mapping : Sympde.topology.Mapping
+    symbolic_mapping : Sympde.topology.BaseMapping
         The symbolic mapping which defines the physical domain of the functional.
 
     See Also