From 96f0927e303cf387ddfd100e1e0ad4f4358a7f85 Mon Sep 17 00:00:00 2001 From: Peter Willendrup Date: Wed, 27 Nov 2024 16:58:06 +0100 Subject: [PATCH] macOS-15 only mpi x 2 --- .github/workflows/mcstas-basictest.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/mcstas-basictest.yml b/.github/workflows/mcstas-basictest.yml index fa4eb76d04..e88789919d 100644 --- a/.github/workflows/mcstas-basictest.yml +++ b/.github/workflows/mcstas-basictest.yml @@ -241,7 +241,7 @@ jobs: - name: Launch NCrystal test instrument (mpi) id: ncrystal-test-mpi - if: runner.os == 'Linux' || runner.os == 'macOS' # Linux or macOS only + if: runner.os == 'Linux' || matrix.os == 'macos-15' # Linux or macOS-15 only # Status: Works on Unixes ("ncrystal missing for Windows") run: | set -e @@ -257,11 +257,7 @@ jobs: clang --version mpirun --version ncrystal-config --version - if [ "x$(uname)" == "xLinux" ]; then - export NUM_MPI=2 - else - export NUM_MPI=1 - fi + export NUM_MPI=2 ../install_mcstas/bin/${MCRUN_EXECUTABLE} --mpi=${NUM_MPI} NCrystal_example.instr sample_cfg="Y2O3_sg206_Yttrium_Oxide.ncmat\;density=0.6x" - name: Launch NeXus test instrument