#2671 Change flags from NEMOv5 integration tests to match KGOs

stfc · Oct 22, 2024 · d504fae · d504fae
1 parent 95f283c
commit d504fae
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/.github/workflows/nemo_v5_tests.yml b/.github/workflows/nemo_v5_tests.yml
@@ -114,7 +114,7 @@ jobs:
         # Set up FCM: PATHs are loaded from SPACK, we only need to set the FCFLAGS
         cd $NEMO_DIR
         cp $PSYCLONE_NEMO_DIR/KGOs/arch-linux_spack.fcm arch/arch-linux_spack.fcm
-        export FCFLAGS="-i4 -Mr8 -O2 -Minline -Mcray=pointer -Mpre -g"
+        export FCFLAGS="-i4 -Mr8 -O2 -g"
         
         # Clean up and compile
         # Without key_mpi_off it fails to compile (even without psyclone)
@@ -157,7 +157,8 @@ jobs:
         cp $PSYCLONE_NEMO_DIR/KGOs/namelist_cfg_bench_small namelist_cfg
         mpirun -np 6 ./nemo
         tail run.stat
-        python $PSYCLONE_NEMO_DIR/compare_ouput.py $PSYCLONE_NEMO_DIR/KGOs/run.stat.bench.small.100steps run.stat
+        # We don't compare all digits because they are results from a different compiler
+        python $PSYCLONE_NEMO_DIR/compare_ouput.py $PSYCLONE_NEMO_DIR/KGOs/run.stat.gfrotran.bench.small.100steps run.stat
         
     - name: NEMO 5.0 gfortran OpenMP for CPUs
       run: |
@@ -173,7 +174,7 @@ jobs:
         # Set up FCM: PATHs are loaded from SPACK, we only need to set the FCFLAGS
         cd $NEMO_DIR
         cp $PSYCLONE_NEMO_DIR/KGOs/arch-linux_spack.fcm arch/arch-linux_spack.fcm
-        export FCFLAGS="-fdefault-real-8 -O3 -fcray-pointer -ffree-line-length-none -g -fopenmp"
+        export FCFLAGS="-fdefault-real-8 -O2 -fcray-pointer -ffree-line-length-none -g -fopenmp"
         
         # Clean up and compile
         ./makenemo -r BENCH -m linux_spack -n ${TEST_DIR} clean -y
@@ -212,7 +213,7 @@ jobs:
         # We compile at -O1 to permit comparison of the results.
         cd $NEMO_DIR
         cp $PSYCLONE_NEMO_DIR/KGOs/arch-linux_spack.fcm arch/arch-linux_spack.fcm
-        export FCFLAGS="-i4 -Mr8 -O3 -Minline -Mcray=pointer -Mpre -g -mp=gpu -gpu=managed"
+        export FCFLAGS="-i4 -Mr8 -O2 -g -mp=gpu -gpu=managed"
         
         # Clean up and compile
         # Without key_mpi_off it fails to compile (even without psyclone)