Merge pull request #195 from ec-jrc/dev

Dev

.github/workflows/conda_pip.yml

@@ -1,7 +1,6 @@
 ---
 name: "Conda + pip"
 
-
 # Use login shell everywhere
 # https://github.com/mamba-org/setup-micromamba/tree/fcc371cea11af9012e5e916ab2dab44b42acdaaa#about-login-shells
 
@@ -10,7 +9,6 @@ on:
     branches:
       - "main"
       - "master"
-      - "dev"
     paths:
       - "**.py"
       - ".github/workflows/*.yml"
@@ -26,7 +24,6 @@ on:
       - "locks/*"
 
 jobs:
-
   run-linters:
     name: "Run linters"
     runs-on: "ubuntu-latest"
@@ -44,7 +41,7 @@ jobs:
         run: "pip install 'black'"
 
       - name: "Run linters"
-        run: "black --check ./"
+        run: "black --diff ./"
 
   run-tests:
     needs: "run-linters"
@@ -56,9 +53,9 @@ jobs:
       matrix:
         # os: [ "ubuntu-latest", "macos-latest" ]
         # mpi: [ "mpich", "openmpi" ]
-        os: [ "ubuntu-latest"]
-        mpi: [ "openmpi" ]
-        python: [ "3.9", "3.10", "3.11", "3.12" ]
+        os: ["ubuntu-latest"]
+        mpi: ["openmpi"]
+        python: ["3.9", "3.10", "3.11", "3.12"]
 
     env:
       SCHISM_ENV: "SCHISM_ENV"
@@ -85,7 +82,6 @@ jobs:
           echo export MAMBA_EXE=$(which micromamba) | tee -a ~/.bashrc
           echo export MAMBA_ROOT_PREFIX=~/micromamba | tee -a ~/.bashrc
       - run: which micromamba
-
       - name: "Create ~/.condarc"
         run: |
           rm -rf ~/.condarc
@@ -99,7 +95,6 @@ jobs:
             - conda-forge
           EOF
       - run: cat ~/.condarc
-
       - name: "Cache ${{ env.SCHISM_ENV }}"
         uses: actions/cache@v3
         id: cache-SCHISM_ENV

.gitignore

@@ -14,6 +14,7 @@ Tutorial/bgmesh
 Tutorial/gmsh
 Tutorial/jigsaw
 Tutorial/data
+Tutorial/global
 
 # the local jigsaw folder
 pyPoseidon/tests/jigsaw/*