Merge branch 'mixed_ncrystal' of https://github.com/highness-eu/openmc into mixed_ncrystal

.github/workflows/ci.yml

@@ -29,6 +29,7 @@ jobs:
         mpi: [n, y]
         omp: [n, y]
         dagmc: [n]
+        ncrystal: [n]
         libmesh: [n]
         event: [n]
         vectfit: [n]
@@ -47,6 +48,10 @@ jobs:
             python-version: '3.10'
             mpi: y
             omp: y
+          - ncrystal: y
+            python-version: '3.10'
+            mpi: n
+            omp: n
           - libmesh: y
             python-version: '3.10'
             mpi: y
@@ -64,7 +69,7 @@ jobs:
             omp: n
             mpi: y
     name: "Python ${{ matrix.python-version }} (omp=${{ matrix.omp }},
-      mpi=${{ matrix.mpi }}, dagmc=${{ matrix.dagmc }},
+      mpi=${{ matrix.mpi }}, dagmc=${{ matrix.dagmc }}, ncrystal=${{ matrix.ncrystal }},
       libmesh=${{ matrix.libmesh }}, event=${{ matrix.event }}
       vectfit=${{ matrix.vectfit }})"
 
@@ -73,6 +78,7 @@ jobs:
       PHDF5: ${{ matrix.mpi }}
       OMP: ${{ matrix.omp }}
       DAGMC: ${{ matrix.dagmc }}
+      NCRYSTAL: ${{ matrix.ncrystal }}
       EVENT: ${{ matrix.event }}
       VECTFIT: ${{ matrix.vectfit }}
       LIBMESH: ${{ matrix.libmesh }}

tools/ci/gha-install.sh

@@ -17,6 +17,11 @@ if [[ $DAGMC = 'y' ]]; then
     ./tools/ci/gha-install-dagmc.sh
 fi
 
+# Install NCrystal if needed
+if [[ $NCRYSTAL = 'y' ]]; then
+    ./tools/ci/gha-install-ncrystal.sh
+fi
+
 # Install vectfit for WMP generation if needed
 if [[ $VECTFIT = 'y' ]]; then
     ./tools/ci/gha-install-vectfit.sh