Improve Geometry class

.github/actions/install_h5py/action.yml

@@ -21,6 +21,7 @@ runs:
       run: |
         export CC="mpicc"
         export HDF5_MPI="ON"
+        pip install 'mpi4py>=4.0.0'
         pip install h5py --no-cache-dir --no-binary h5py
         pip list
 

.github/workflows/documentation.yml

@@ -23,9 +23,11 @@ permissions:
 jobs:
   build_docs:
     runs-on: ubuntu-latest
+
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN}}
       OMP_NUM_THREADS: 2
+
     steps:
     - name: Checkout
       uses: actions/checkout@v5
@@ -34,18 +36,9 @@ jobs:
       uses: actions/setup-python@v5
       with:
         python-version: '3.10'
-    - name: Install non-Python dependencies on Ubuntu
-      uses: awalsh128/cache-apt-pkgs-action@latest
-      with:
-        packages: gfortran openmpi-bin libopenmpi-dev libhdf5-openmpi-dev
-        version: 1.0
-        execute_install_scripts: true
 
-    - name: Reconfigure non-Python dependencies on Ubuntu
-      run: |
-        sudo apt-get update
-        sudo apt-get install --reinstall openmpi-bin libhdf5-openmpi-dev liblapack-dev libblas-dev
-        sudo apt install graphviz pandoc
+    - name: Install non-Python dependencies on Ubuntu
+      uses: ./.github/actions/ubuntu_install
 
     - name: Print information on MPI and HDF5 libraries
       run: |
@@ -67,6 +60,10 @@ jobs:
         pip install .[test]
         pip freeze
 
+    - name: Install non-Python dependencies for Documentation
+      run: |
+        sudo apt install graphviz pandoc
+
     - name: Install Python dependencies for Documentation
       run: |
         pip install -r docs/requirements.txt

.github/workflows/testing.yml

@@ -24,7 +24,8 @@ jobs:
       fail-fast: false
       matrix:
         os: [ ubuntu-24.04, macos-14 ]
-        python-version: [ '3.10', '3.11', '3.12', '3.13', '3.14' ]
+#        python-version: [ '3.9', '3.10', '3.11', '3.12', '3.13' ]
+        python-version: [ '3.11', '3.12' ]
         isMerge:
           - ${{ github.event_name == 'push' && github.ref == 'refs/heads/devel' }}
         exclude:
@@ -123,17 +124,17 @@ jobs:
         if: matrix.os == 'macos-14'
         working-directory: ./scratch
         run: |
-          coverage report --ignore-errors --show-missing --sort=cover
+          psydac test --mod psydac.mapping -x -v
 
       - name: Run MPI tests with Pytest
         working-directory: ./scratch
         run: |
-          psydac test --mpi
+          psydac test --mod psydac.fem -x -v
 
       - name: Run single-process PETSc tests with Pytest
         working-directory: ./scratch
         run: |
-          psydac test --petsc
+          psydac test --mod psydac.feec -x -v
 
       - name: Run MPI PETSc tests with Pytest
         working-directory: ./scratch

CHANGELOG.md

@@ -7,6 +7,8 @@ All notable changes to this project will be documented in this file.
 ### Added
 
 -   #577 : Add an installation configuration option to choose the backend language
+-   #567 : Improve `psydac test` command (with several new features)
+-   #565 : Expand editable install info in `README.md`
 -   [DEVELOPER] Create action `install_petsc4py` to install PETSc & `petsc4py` w/ complex support
 
 ### Fixed
@@ -16,8 +18,7 @@ All notable changes to this project will be documented in this file.
 -   #579 : Return error code on failure of the `psydac test` and `psydac compile` commands
 -   #577 : Fix installation following release of Pyccel 2.2
 -   #571 : Fix correct application of the sum factorization algorithm
--   #570 : Optimize PSYDAC logo
--   #565 : Expand editable install info in `README.md`
+-   #567 : Fix parallel creation of folder `__psydac__` in `psydac.api.fem_bilinear_form`
 -   #566 : Fix command `psydac test --mpi` on Ubuntu machines
 -   [DEVELOPER] Add missing 'description' properties (required!) to our GitHub actions
 -   [DEVELOPER] Update CI installation of `petsc4py` after release of `setuptools` 81.0
@@ -26,11 +27,13 @@ All notable changes to this project will be documented in this file.
 
 ### Changed
 
+-   #527 : Improve `Geometry` class in module `psydac.cad.geometry`
 -   #580 : Use PETSc 3.25.0 whose Python bindings `petsc4py` install correctly with `setuptools>=81.0`
 -   #579 : Require `pyccel>=2.2.3` which can compile all kernels with C
 -   #579 : Require `numpy>=2.1` to support Python >= 3.10
 -   #579 : Require `pytest>=9.0` and use `pytest.toml` instead of `pytest.ini` for Pytest configuration
 -   #579 : Move coverage configuration from `pyproject.toml` to `psydac/pytest.toml`
+-   #570 : Optimize PSYDAC logo
 -   [DEVELOPER] Rename actions: `macos/ubuntu_install` -> `macos/ubuntu_installations`
 -   [DEVELOPER] Do not check file changes to trigger testing workflow on PRs
 -   [DEVELOPER] Run documentation workflow on pushes to `devel` whenever `README.md` is modified

psydac/api/discretization.py

@@ -578,7 +578,7 @@ def discretize_domain(domain, *, filename=None, ncells=None, periodic=None, comm
         raise ValueError("Cannot provide both 'filename' and 'ncells'")
 
     elif filename:
-        return Geometry(filename=filename, comm=comm, mpi_dims_mask=mpi_dims_mask)
+        return Geometry.from_file(filename, comm=comm, mpi_dims_mask=mpi_dims_mask)
 
     elif ncells:
         return Geometry.from_topological_domain(domain, ncells, periodic=periodic, comm=comm, mpi_dims_mask=mpi_dims_mask)

psydac/api/tests/test_2d_complex.py

@@ -363,7 +363,7 @@ def test_complex_poisson_2d_multipatch():
     A = Square('A',bounds1=(0, 0.5), bounds2=(0, 1))
     B = Square('B',bounds1=(0.5, 1.), bounds2=(0, 1))
 
-    domain = Domain.join([A, B], [((0, 0, 1), (1, 0, -1))], 'domain')
+    domain = Domain.join([A, B], [((0, 0, 1), (1, 0, -1), 1)], 'domain')
 
     x, y = domain.coordinates
 

psydac/api/tests/test_2d_multipatch_mapping_maxwell.py

@@ -7,25 +7,22 @@
 from pathlib import Path
 
 import pytest
-import numpy as np
 from mpi4py import MPI
 from sympy  import pi, sin, cos, Tuple, Matrix
 
-from sympde.calculus      import grad, dot, curl, cross
+from sympde.calculus      import dot, curl, cross
 from sympde.calculus      import minus, plus
 from sympde.topology      import VectorFunctionSpace
 from sympde.topology      import elements_of
 from sympde.topology      import NormalVector
-from sympde.topology      import Square, Domain
-from sympde.topology      import IdentityMapping, PolarMapping
+from sympde.topology      import Domain
 from sympde.expr.expr     import LinearForm, BilinearForm
 from sympde.expr.expr     import integral
 from sympde.expr.expr     import Norm
-from sympde.expr.equation import find, EssentialBC
+from sympde.expr.equation import find
 
 from psydac.api.discretization       import discretize
 from psydac.api.tests.build_domain   import build_11_patch_pretzel, build_2_patch_annulus
-from psydac.fem.basic                import FemField
 from psydac.api.settings             import PSYDAC_BACKEND_GPYCCEL
 from psydac.feec.pull_push           import pull_2d_hcurl
 
@@ -204,10 +201,10 @@ def teardown_function():
 
 if __name__ == '__main__':
 
-    from collections                               import OrderedDict
-    from sympy                                     import lambdify
+    from collections                     import OrderedDict
+    from sympy                           import lambdify
     from psydac.fem.plotting_utilities   import get_plotting_grid, get_grid_vals
-    from psydac.fem.plotting_utilities   import get_patch_knots_gridlines, my_small_plot
+    from psydac.fem.plotting_utilities   import my_small_plot
 
     domain    = build_11_patch_pretzel()
     x,y       = domain.coordinates

psydac/api/tests/test_2d_multipatch_mapping_poisson.py

@@ -15,7 +15,7 @@
 from sympde.calculus      import minus, plus
 from sympde.topology      import ScalarFunctionSpace
 from sympde.topology      import elements_of
-from sympde.topology      import NormalVector, Union
+from sympde.topology      import NormalVector
 from sympde.topology      import Square, Domain
 from sympde.topology      import IdentityMapping, PolarMapping, AffineMapping
 from sympde.expr.expr     import LinearForm, BilinearForm
@@ -141,12 +141,12 @@ def test_poisson_2d_3_patches_dirichlet_2():
     B = Square('B',bounds1=(0.5, 1.), bounds2=(0, np.pi))
     C = Square('C',bounds1=(0.5, 1.), bounds2=(np.pi-0.5, np.pi + 1))
 
-    D1     = mapping_1(A)
-    D2     = mapping_2(B)
-    D3     = mapping_3(C)
+    D1 = mapping_1(A)
+    D2 = mapping_2(B)
+    D3 = mapping_3(C)
 
-    connectivity = [((0,1,1),(1,1,-1)), ((1,1,1),(2,1,-1))]
     patches = [D1, D2, D3]
+    connectivity = [((0, 1, 1), (1, 1,-1), 1), ((1, 1, 1), (2, 1,-1), 1)]
     domain = Domain.join(patches, connectivity, 'domain')
 
     x,y       = domain.coordinates
@@ -252,8 +252,11 @@ def test_poisson_2d_4_patch_dirichlet_0():
     D3     = mapping_3(C)
     D4     = mapping_4(D)
 
-    connectivity = [((0,1,1),(1,1,-1)), ((2,1,1),(3,1,-1)), ((0,0,1),(2,0,-1)),((1,0,1),(3,0,-1))]
     patches = [D1, D2, D3, D4]
+    connectivity = [((0, 1, 1), (1, 1,-1), 1),
+                    ((2, 1, 1), (3, 1,-1), 1),
+                    ((0, 0, 1), (2, 0,-1), 1),
+                    ((1, 0, 1), (3, 0,-1), 1)]
     domain = Domain.join(patches, connectivity, 'domain')
 
     x,y       = domain.coordinates

psydac/api/tests/test_2d_multipatch_poisson.py

@@ -78,8 +78,8 @@ def test_poisson_2d_2_patch_dirichlet_0():
     A = Square('A', bounds1=(0, 0.5), bounds2=(0, 1))
     B = Square('B', bounds1=(0.5, 1), bounds2=(0, 1))
 
-    connectivity = [((0,0,1), (1,0,-1), 1)]
     patches = [A, B]
+    connectivity = [((0, 0, 1), (1, 0,-1), 1)]
     domain = Domain.join(patches, connectivity, 'domain')
 
     x,y = domain.coordinates
@@ -100,8 +100,8 @@ def test_poisson_2d_2_patch_dirichlet_1():
     A = Square('A', bounds1=(0, 0.5), bounds2=(0, 1))
     B = Square('B', bounds1=(0.5, 1), bounds2=(0, 1))
 
-    connectivity = [((0,0,1), (1,0,-1), 1)]
     patches = [A, B]
+    connectivity = [((0, 0, 1), (1, 0,-1), 1)]
     domain = Domain.join(patches, connectivity, 'domain')
 
     x,y = domain.coordinates
@@ -121,8 +121,8 @@ def test_poisson_2d_2_patch_dirichlet_2():
     A = Square('A', bounds1=(0, 0.5), bounds2=(0, 1))
     B = Square('B', bounds1=(0.5, 1), bounds2=(0, 1))
 
-    connectivity = [((0,0,1), (1,0,-1), 1)]
     patches = [A, B]
+    connectivity = [((0, 0, 1), (1, 0,-1), 1)]
     domain = Domain.join(patches, connectivity, 'domain')
 
     x,y = domain.coordinates
@@ -150,8 +150,8 @@ def test_poisson_2d_2_patch_dirichlet_3():
     D1 = M1(A)
     D2 = M2(B)
 
-    connectivity = [((0,0,1), (1,0,1), 1)]
     patches = [D1, D2]
+    connectivity = [((0, 0, 1), (1, 0, 1), 1)]
     domain = Domain.join(patches, connectivity, 'domain')
 
     x,y = domain.coordinates
@@ -182,8 +182,8 @@ def test_poisson_2d_2_patch_dirichlet_4():
     D1 = M1(A)
     D2 = M2(B)
 
-    connectivity = [((0,0,-1), (1,0,-1), 1)]
-    patches = [D1,D2]
+    patches = [D1, D2]
+    connectivity = [((0, 0, -1), (1, 0, -1), 1)]
     domain = Domain.join(patches, connectivity, 'domain')
 
     x,y = domain.coordinates

psydac/api/tests/test_postprocessing.py

@@ -57,7 +57,7 @@ def build_2_mapped_squares():
     D2     = mapping_2(B)
 
     patches = [D1, D2]
-    connectivity = [((0,1,1),(1,1,-1))]
+    connectivity = [((0, 1, 1), (1, 1,-1), 1)]
     return Domain.join(patches, connectivity, 'domain')
 
 
@@ -66,7 +66,7 @@ def build_2_squares():
     B = Square('B',bounds1=(0.5, 1.), bounds2=(np.pi/2, np.pi))
 
     patches = [A, B]
-    connectivity = [((0,1,1),(1,1,-1))]
+    connectivity = [((0, 1, 1), (1, 1,-1), 1)]
     return Domain.join(patches, connectivity, 'domain')
 
 
@@ -75,10 +75,9 @@ def build_2_cubes():
     B = Cube('B',bounds1=(0.5, 1.), bounds2=(np.pi/2, np.pi), bounds3=(0, 1))
 
     patches = [A, B]
-    connectivity = [((0,1,1),(1,1,-1))]
+    connectivity = [((0, 1, 1), (1, 1,-1), (1, 1, 1))]
     return Domain.join(patches, connectivity, 'domain')
 
-
 ###############################################################################
 #                            Output Manager tests                             #
 ###############################################################################
@@ -538,8 +537,8 @@ def test_reconstruct_multipatch(dtype):
     A = Square('A',bounds1=bounds1, bounds2=bounds2_A)
     B = Square('B',bounds1=bounds1, bounds2=bounds2_B)
 
-    connectivity = [((0,1,1),(1,1,-1))]
-    patches = [A,B]
+    patches = [A, B]
+    connectivity = [((0, 1, 1), (1, 1,-1), 1)]
     domain = Domain.join(patches, connectivity, 'domain')
 
     Va = ScalarFunctionSpace('Va', A)