Mix logical and physical coordinates in expression - V2

psydac/api/discretization.py

@@ -396,16 +396,21 @@ def discretize(a, *args, **kwargs):
         kwargs['symbolic_mapping'] = mapping
 
     if isinstance(a, sym_BasicForm):
-        if isinstance(a, sym_Norm):
-            kernel_expr = TerminalExpr(a, domain)
-            if not mapping is None:
-                kernel_expr = tuple(LogicalExpr(i, domain) for i in kernel_expr)
-        else:
-            if not mapping is None:
-                a       = LogicalExpr (a, domain)
-                domain  = domain.logical_domain
-
-            kernel_expr = TerminalExpr(a, domain)
+        # if isinstance(a, sym_Norm):
+        #     kernel_expr = TerminalExpr(a, domain)
+        #     if not mapping is None:
+        #         kernel_expr = tuple(LogicalExpr(i, domain) for i in kernel_expr)
+        # else:
+        #     if not mapping is None:
+        #         a       = LogicalExpr (a, domain)
+        #         domain  = domain.logical_domain
+
+        #     kernel_expr = TerminalExpr(a, domain)
+        if not mapping is None:
+            a       = LogicalExpr (a, domain)
+            domain  = domain.logical_domain
+
+        kernel_expr = TerminalExpr(a, domain)
 
         if len(kernel_expr) > 1:
             return DiscreteSumForm(a, kernel_expr, *args, **kwargs)

psydac/cad/geometry.py

@@ -88,7 +88,7 @@ def __init__(self, domain=None, ncells=None, periodic=None, mappings=None,
             interior_names = sorted(domain.interior_names)
             mappings_keys  = sorted(list(mappings.keys()))
 
-            assert sorted(interior_names) == mappings_keys
+            assert interior_names == mappings_keys
             # ...
 
             if periodic is None:

psydac/mapping/discrete_gallery.py

@@ -92,13 +92,10 @@ def discrete_mapping(mapping, ncells, degree, **kwargs):
             periodic = ( False,  False,  False)
 
         elif mapping == 'spherical shell':
-            map_analytic = SphericalMapping( 'M', dim=dim )
-            lims1   = (1, 4)
-            lims2   = (0, np.pi)
-            lims3   = (0, np.pi/2)
-            period1 = False
-            period2 = False
-            period3 = False
+            map_analytic = SphericalMapping('M', dim=dim)
+            limits   = ((1, 4), (0, np.pi), (0, np.pi/2))
+            periodic = ( False,  False,  False)
+
         else:
             raise ValueError("Required 3D mapping not available")
 

setup.py

@@ -56,7 +56,7 @@
     'pyevtk',
 
     # Our packages from PyPi
-    'sympde==0.16.1',
+    'sympde @ git+https://github.com/pyccel/sympde@logical_n_physical-coordinates-2',
     'pyccel>=1.7.3',
     'gelato==0.11',