New hierarchy for Mapping classes

.gitignore

@@ -111,3 +111,6 @@ doc/utils/*.png
 
 # Swap files
 *.swp
+
+__gpyccel__/*
+__psydac__/*

sympde/expr/evaluation.py

@@ -31,8 +31,10 @@
 from sympde.topology.basic   import Boundary, Interface
 from sympde.topology.basic   import InteriorDomain
 from sympde.topology.domain  import NormalVector, TangentVector, NCube, NCubeInterior
-from sympde.topology.mapping import JacobianSymbol, InterfaceMapping, MultiPatchMapping, JacobianInverseSymbol
-from sympde.topology.mapping import LogicalExpr, PullBack
+from sympde.topology.base_mapping import JacobianSymbol, JacobianInverseSymbol
+from sympde.topology.base_mapping import LogicalExpr, PullBack
+from sympde.topology.base_mapping import InterfaceMapping, MultiPatchMapping 
+
 
 # TODO fix circular dependency between sympde.expr.evaluation and sympde.topology.mapping
 

sympde/expr/tests/test_expr.py

@@ -16,7 +16,7 @@
 
 from sympde.topology import dx1, dx2, dx3
 from sympde.topology import dx, dy, dz
-from sympde.topology import Mapping
+from sympde.topology import BaseMapping
 from sympde.topology import ScalarFunctionSpace, VectorFunctionSpace
 from sympde.topology import element_of, elements_of
 from sympde.topology import InteriorDomain, Union
@@ -867,7 +867,7 @@ def test_terminal_expr_bilinear_2d_4():
 def test_terminal_expr_bilinear_3d_1():
 
     domain = Domain('Omega', dim=3)
-    M      = Mapping('M', dim=3)
+    M      = BaseMapping('M', dim=3)
 
     mapped_domain = M(domain)
 

sympde/expr/tests/test_tensor_2d.py

@@ -12,7 +12,7 @@
 from sympde.topology import elements_of
 from sympde.topology import Boundary
 from sympde.topology import Domain
-from sympde.topology import Mapping
+from sympde.topology import BaseMapping
 
 from sympde.expr.expr import BilinearForm, integral
 from sympde.expr.evaluation import TensorExpr
@@ -59,11 +59,11 @@ def test_tensorize_2d_2():
     # ...
 
 #==============================================================================
-def test_tensorize_2d_1_mapping():
+def test_tensorize_2d_1_BaseMapping():
 
     DIM = 2
 
-    M = Mapping('Map', dim=DIM)
+    M = BaseMapping('Map', dim=DIM)
 
     domain = M(Domain('Omega', dim=DIM))
 
@@ -85,10 +85,10 @@ def test_tensorize_2d_1_mapping():
     # ...
 
 #==============================================================================
-def test_tensorize_2d_2_mapping():
+def test_tensorize_2d_2_BaseMapping():
 
     DIM = 2
-    M = Mapping('M', dim=DIM)
+    M = BaseMapping('M', dim=DIM)
     domain = M(Domain('Omega', dim=DIM))
 
     V = VectorFunctionSpace('V', domain)

sympde/topology/__init__.py

@@ -1,9 +1,9 @@
-from .basic              import *
-from .derivatives        import *
-from .datatype           import *
-from .domain             import *
-from .mapping            import *
-from .measure            import *
-from .space              import *
-from .analytical_mapping import *
-from .callable_mapping   import *
+from .basic                     import *
+from .derivatives               import *
+from .datatype                  import *
+from .domain                    import *
+from .base_mapping              import *
+from .base_analytic_mapping     import *
+from .analytic_mappings         import *
+from .measure                   import *
+from .space                     import *

sympde/topology/analytical_mapping.py → sympde/topology/analytic_mappings.py

@@ -1,8 +1,8 @@
-from .mapping import Mapping
+from .base_analytic_mapping import BaseAnalyticMapping
 
-class IdentityMapping(Mapping):
+class IdentityMapping(BaseAnalyticMapping):
     """
-    Represents an identity 1D/2D/3D Mapping object.
+    Represents an identity 1D/2D/3D BaseAnalyticMapping object.
 
     Examples
 
@@ -12,9 +12,9 @@ class IdentityMapping(Mapping):
                     'z': 'x3'}
 
 #==============================================================================
-class AffineMapping(Mapping):
+class AffineMapping(BaseAnalyticMapping):
     """
-    Represents a 1D/2D/3D Affine Mapping object.
+    Represents a 1D/2D/3D Affine BaseAnalyticMapping object.
 
     Examples
 
@@ -24,9 +24,9 @@ class AffineMapping(Mapping):
                     'z': 'c3 + a31*x1 + a32*x2 + a33*x3'}
 
 #==============================================================================
-class PolarMapping(Mapping):
+class PolarMapping(BaseAnalyticMapping):
     """
-    Represents a Polar 2D Mapping object (Annulus).
+    Represents a Polar 2D BaseAnalyticMapping object (Annulus).
 
     Examples
 
@@ -38,9 +38,9 @@ class PolarMapping(Mapping):
     _pdim        = 2
 
 #==============================================================================
-class TargetMapping(Mapping):
+class TargetMapping(BaseAnalyticMapping):
     """
-    Represents a Target 2D Mapping object.
+    Represents a Target 2D BaseAnalyticMapping object.
 
     Examples
 
@@ -52,9 +52,9 @@ class TargetMapping(Mapping):
     _pdim        = 2
 
 #==============================================================================
-class CzarnyMapping(Mapping):
+class CzarnyMapping(BaseAnalyticMapping):
     """
-    Represents a Czarny 2D Mapping object.
+    Represents a Czarny 2D BaseAnalyticMapping object.
 
     Examples
 
@@ -67,19 +67,27 @@ class CzarnyMapping(Mapping):
     _pdim        = 2
 
 #==============================================================================
-class CollelaMapping2D(Mapping):
-    """
-    Represents a Collela 2D Mapping object.
+class CollelaMapping2D(BaseAnalyticMapping):
 
-    """
     _expressions = {'x': '2.*(x1 + eps*sin(2.*pi*k1*x1)*sin(2.*pi*k2*x2)) - 1.',
                     'y': '2.*(x2 + eps*sin(2.*pi*k1*x1)*sin(2.*pi*k2*x2)) - 1.'}
 
-    _ldim        = 2
-    _pdim        = 2
+    _ldim = 2
+    _pdim = 2
+
+
+#==============================================================================
+class CollelaMapping3D(BaseAnalyticMapping):
+
+    _expressions = {'x': 'k1*(x1 + eps*sin(2.*pi*x1)*sin(2.*pi*x2))',
+                    'y': 'k2*(x2 + eps*sin(2.*pi*x1)*sin(2.*pi*x2))',
+                    'z': 'k3*x3'}
+
+    _ldim        = 3
+    _pdim        = 3
 
 #==============================================================================
-class TorusMapping(Mapping):
+class TorusMapping(BaseAnalyticMapping):
     """
     Parametrization of a torus (or a portion of it) of major radius R0, using
     toroidal coordinates (x1, x2, x3) = (r, theta, phi), where:
@@ -98,7 +106,7 @@ class TorusMapping(Mapping):
 
 #==============================================================================
 # TODO [YG, 07.10.2022]: add test in sympde/topology/tests/test_logical_expr.py
-class TorusSurfaceMapping(Mapping):
+class TorusSurfaceMapping(BaseAnalyticMapping):
     """
     3D surface obtained by "slicing" the torus above at r = a.
     The parametrization uses the coordinates (x1, x2) = (theta, phi), where:
@@ -116,7 +124,7 @@ class TorusSurfaceMapping(Mapping):
 
 #==============================================================================
 # TODO [YG, 07.10.2022]: add test in sympde/topology/tests/test_logical_expr.py
-class TwistedTargetSurfaceMapping(Mapping):
+class TwistedTargetSurfaceMapping(BaseAnalyticMapping):
     """
     3D surface obtained by "twisting" the TargetMapping out of the (x, y) plane
 
@@ -129,7 +137,7 @@ class TwistedTargetSurfaceMapping(Mapping):
     _pdim        = 3
 
 #==============================================================================
-class TwistedTargetMapping(Mapping):
+class TwistedTargetMapping(BaseAnalyticMapping):
     """
     3D volume obtained by "extruding" the TwistedTargetSurfaceMapping along z.
 
@@ -142,7 +150,7 @@ class TwistedTargetMapping(Mapping):
     _pdim        = 3
 
 #==============================================================================
-class SphericalMapping(Mapping):
+class SphericalMapping(BaseAnalyticMapping):
     """
     Parametrization of a sphere (or a portion of it) using spherical
     coordinates (x1, x2, x3) = (r, theta, phi), where:
@@ -158,3 +166,38 @@ class SphericalMapping(Mapping):
 
     _ldim        = 3
     _pdim        = 3
+
+#==============================================================================
+class Collela3D(BaseAnalyticMapping):
+
+    _expressions = {'x':'2.*(x1 + 0.1*sin(2.*pi*x1)*sin(2.*pi*x2)) - 1.',
+                    'y':'2.*(x2 + 0.1*sin(2.*pi*x1)*sin(2.*pi*x2)) - 1.',
+                    'z':'2.*x3  - 1.'}
+
+#==============================================================================   
+class TransposedPolarMapping(BaseAnalyticMapping):
+    """
+    Represents a Transposed (x1 <> x2) Polar 2D Mapping object (Annulus).
+
+    Examples
+
+    """
+    _expressions = {'x': 'c1 + (rmin*(1-x2)+rmax*x2)*cos(x1)',
+                    'y': 'c2 + (rmin*(1-x2)+rmax*x2)*sin(x1)'}
+
+    _ldim        = 2
+    _pdim        = 2
+
+#==============================================================================    
+class TransposedPolarMapping(BaseAnalyticMapping):
+    """
+    Represents a Transposed (x1 <> x2) Polar 2D Mapping object (Annulus).
+
+    Examples
+
+    """
+    _expressions = {'x': 'c1 + (rmin*(1-x2)+rmax*x2)*cos(x1)',
+                    'y': 'c2 + (rmin*(1-x2)+rmax*x2)*sin(x1)'}
+
+    _ldim        = 2
+    _pdim        = 2