Merge pull request #161 from n-claes/fix/tests

Updated automated tests
n-claes · Dec 3, 2024 · 3528514 · 3528514
2 parents 54ca9e8 + 02a2bcf
commit 3528514
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 10 deletions.
diff --git a/.github/workflows/pylbo.yml b/.github/workflows/pylbo.yml
@@ -56,6 +56,8 @@ jobs:
         pip install pytest pytest-cov
         sudo apt-get update
         sudo apt-get install ffmpeg
+        pip install matplotlib==3.9.2
+        pip install numpy==2.0.2
         cd post_processing
         python setup.py develop
 

diff --git a/.github/workflows/regression.yml b/.github/workflows/regression.yml
@@ -56,7 +56,7 @@ jobs:
 
     - name: Cache ARPACK
       id: arpack-cache
-      uses: actions/cache@v1
+      uses: actions/cache@v4
       with:
         path: tests/arpack-ng/
         key: ${{ runner.os }}-arpackv3
@@ -102,7 +102,7 @@ jobs:
         find $LEGOLASDIR/build -name '*.gc*' -delete
 
     - name: Archive failed logs
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       if: failure()
       with:
         name: failed_logs

diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml
@@ -60,7 +60,7 @@ jobs:
 
     - name: Cache pFUnit
       id: pfunit-cache
-      uses: actions/cache@v1
+      uses: actions/cache@v4
       with:
         path: tests/pFUnit/
         key: ${{ runner.os }}-${{ matrix.compiler }}-pfunitv1
@@ -79,7 +79,7 @@ jobs:
 
     - name: Cache ARPACK
       id: arpack-cache
-      uses: actions/cache@v1
+      uses: actions/cache@v4
       with:
         path: tests/arpack-ng/
         key: ${{ runner.os }}-${{ matrix.compiler }}-arpackv1
@@ -134,7 +134,7 @@ jobs:
         find $LEGOLASDIR/build -name '*.gc*' -delete
 
     - name: Archive failed logs
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       if: failure()
       with:
         name: failed_logs

diff --git a/docs/sphinx_source/conf.py b/docs/sphinx_source/conf.py
@@ -28,6 +28,7 @@
 
 # -- General configuration ---------------------------------------------------
 extensions = [
+    "autoapi.extension",
     "sphinx.ext.mathjax",
     "sphinx.ext.viewcode",
     "sphinx.ext.napoleon",
@@ -44,7 +45,6 @@
 }
 
 # autoAPI settings
-extensions.append("autoapi.extension")
 autoapi_type = "python"
 autoapi_dirs = ["../../post_processing/pylbo/"]
 autoapi_options = [

diff --git a/post_processing/pylbo/visualisation/continua.py b/post_processing/pylbo/visualisation/continua.py
@@ -208,14 +208,21 @@ def _get_resistive_thermal_continuum(ds: LegolasDataSet) -> np.ndarray:
     T0 = ds.equilibria["T0"]
     eps = ds.scale_factor
     deps = 0
-    if ds.geometry == 'cylindrical':
+    if ds.geometry == "cylindrical":
         deps = 1
     drB02 = deps * ds.equilibria["B02"] + eps * ds.equilibria["dB02"]
     dB03 = ds.equilibria["dB03"]
 
-    return -1j * (gamma - 1) * ((kappa_para * kpara**2 
-                                + detadT * ((drB02 / eps)**2 + dB03**2)) / rho0 
-                                + dLdT - (L0 + rho0 * dLdrho) / T0) / gamma
+    return (
+        -1j
+        * (gamma - 1)
+        * (
+            (kappa_para * kpara**2 + detadT * ((drB02 / eps) ** 2 + dB03**2)) / rho0
+            + dLdT
+            - (L0 + rho0 * dLdrho) / T0
+        )
+        / gamma
+    )
 
 
 def _get_thermal_continuum_analytical(ds: LegolasDataSet) -> np.ndarray: