#3207 LFRic KGOs full reproducibility

Author: sergisiso

.github/workflows/lfric_test.yml

@@ -125,7 +125,7 @@ jobs:
         export OMP_NUM_THREADS=1
         export START_TIME=$SECONDS
         mpirun -n 12 ../bin/gungho_model configuration.nml
-        python ${PSYCLONE_LFRIC_DIR}/compare_output.py ${PSYCLONE_LFRIC_DIR}/KGOs/gungho_model-checksums.txt gungho_model-checksums.txt
+        diff ${PSYCLONE_LFRIC_DIR}/KGOs/gungho_model-checksums-gnu-12r-1t.txt gungho_model-checksums.txt
         export VAR_TIME=$((${SECONDS}-${START_TIME}))
         echo "time=${VAR_TIME}" >> "${GITHUB_OUTPUT}"
 
@@ -162,7 +162,7 @@ jobs:
         export CUDA_VISIBLE_DEVICES=1
         export START_TIME=$SECONDS
         mpirun -n 1 ../bin/gungho_model configuration.nml
-        python ${PSYCLONE_LFRIC_DIR}/compare_output.py ${PSYCLONE_LFRIC_DIR}/KGOs/gungho_model-checksums.txt gungho_model-checksums.txt
+        diff ${PSYCLONE_LFRIC_DIR}/KGOs/gungho_model-checksums-nvhpc-1r-12t.txt gungho_model-checksums.txt
         export VAR_TIME=$((${SECONDS}-${START_TIME}))
         echo "time=${VAR_TIME}" >> "${GITHUB_OUTPUT}"
         echo "build_time=${BUILD_ELAPSED}" >> "${GITHUB_OUTPUT}"
@@ -193,7 +193,7 @@ jobs:
         export CUDA_VISIBLE_DEVICES=1
         export START_TIME=$SECONDS
         mpirun -n 1 ../bin/gungho_model configuration.nml
-        python ${PSYCLONE_LFRIC_DIR}/compare_output.py ${PSYCLONE_LFRIC_DIR}/KGOs/gungho_model-checksums.txt gungho_model-checksums.txt
+        diff ${PSYCLONE_LFRIC_DIR}/KGOs/gungho_model-checksums-nvhpc-1r-12t.txt gungho_model-checksums.txt
         export VAR_TIME=$((${SECONDS}-${START_TIME}))
         echo "time=${VAR_TIME}" >> "${GITHUB_OUTPUT}"
 
@@ -219,10 +219,10 @@ jobs:
         # Run
         cd applications/gungho_model/example
         rm -f timer.txt gungho_model-checksums.txt  # In case there were from a previous run
-        export OMP_NUM_THREADS=2
+        export OMP_NUM_THREADS=4
         export START_TIME=$SECONDS
         mpirun -n 6 ../bin/gungho_model configuration.nml
-        python ${PSYCLONE_LFRIC_DIR}/compare_output.py ${PSYCLONE_LFRIC_DIR}/KGOs/gungho_model-checksums.txt gungho_model-checksums.txt
+        diff ${PSYCLONE_LFRIC_DIR}/KGOs/gungho_model-checksums-gnu-6r-4t.txt gungho_model-checksums.txt
         export VAR_TIME=$((${SECONDS}-${START_TIME}))
         echo "time=${VAR_TIME}" >> "${GITHUB_OUTPUT}"
 
@@ -248,10 +248,10 @@ jobs:
         # Run
         cd applications/gungho_model/example
         rm -f timer.txt gungho_model-checksums.txt  # In case there were from a previous run
-        export OMP_NUM_THREADS=2
+        export OMP_NUM_THREADS=4
         export START_TIME=$SECONDS
         mpirun -n 6 ../bin/gungho_model configuration.nml
-        python ${PSYCLONE_LFRIC_DIR}/compare_output.py ${PSYCLONE_LFRIC_DIR}/KGOs/gungho_model-checksums.txt gungho_model-checksums.txt
+        diff ${PSYCLONE_LFRIC_DIR}/KGOs/gungho_model-checksums-gnu-6r-4t.txt gungho_model-checksums.txt
         export VAR_TIME=$((${SECONDS}-${START_TIME}))
         echo "time=${VAR_TIME}" >> "${GITHUB_OUTPUT}"
 
@@ -279,7 +279,7 @@ jobs:
         OMP_NUM_THREADS=8 mpirun -n 1 ../bin/lfric_atm configuration.nml
 
         # And compare the results
-        python ${PSYCLONE_LFRIC_DIR}/compare_output.py ${PSYCLONE_LFRIC_DIR}/KGOs/lfric_atm-checksums.txt lfric_atm-checksums.txt
+        diff ${PSYCLONE_LFRIC_DIR}/KGOs/lfric_atm-checksums-gnu-1r-8t.txt lfric_atm-checksums.txt
         export VAR_TIME=$((${SECONDS}-${START_TIME}))
         echo "time=${VAR_TIME}" >> "${GITHUB_OUTPUT}"
         echo "build_time=${BUILD_ELAPSED}" >> "${GITHUB_OUTPUT}"

examples/lfric/scripts/KGOs/gungho_model-checksums-gnu-12r-1t.txt

@@ -0,0 +1,3 @@
+Inner product checksum rho = 40D0CC8DC064B3E1
+Inner product checksum theta = 41FCE985F2DD2756
+Inner product checksum u = 450134BD797FD66E

examples/lfric/scripts/KGOs/gungho_model-checksums-gnu-6r-4t.txt

@@ -0,0 +1,3 @@
+Inner product checksum rho = 40D0CC8DC064B3E2
+Inner product checksum theta = 41FCE985F2DD2758
+Inner product checksum u = 450134BD797FD66D

examples/lfric/scripts/KGOs/gungho_model-checksums-nvhpc-1r-12t.txt

@@ -0,0 +1,3 @@
+Inner product checksum rho = 40D0CC8DC0650BE9
+Inner product checksum theta = 41FCE985F2DD42FF
+Inner product checksum u = 450134BD79897C7B

examples/lfric/scripts/KGOs/gungho_model-checksums.txt

@@ -0,0 +1,9 @@
+Inner product checksum rho = 405F163A37CF0715
+Inner product checksum theta = 41B09B081D579238
+Inner product checksum u = 44035AFB5E390BAA
+Inner product checksum mr1 = 3F900FB50435E6CC
+Inner product checksum mr2 = 3E3B00EEB3C82F37
+Inner product checksum mr3 = 3DC969B45C6D3EC2
+Inner product checksum mr4 =                0
+Inner product checksum mr5 =                0
+Inner product checksum mr6 =                0

…ric/scripts/KGOs/lfric_atm-checksums.txt …s/KGOs/lfric_atm-checksums-gnu-1r-1t.txtexamples/lfric/scripts/KGOs/lfric_atm-checksums.txt renamed to examples/lfric/scripts/KGOs/lfric_atm-checksums-gnu-1r-1t.txt examples/lfric/scripts/KGOs/lfric_atm-checksums.txt renamed to examples/lfric/scripts/KGOs/lfric_atm-checksums-gnu-1r-1t.txt

@@ -36,9 +36,8 @@
 
 include ../../common.mk
 
-# Get all psyclone scripts in this folder, which are all python files excluding
-# the compare_output.py script
-SCRIPTS = $(filter-out compare_output.py, $(wildcard *.py))
+# Get all psyclone scripts in this folder, which are all python files
+SCRIPTS = $(wildcard *.py)
 
 # The kernel-extraction script generates driver source files.
 GENERATED_FILES += driver-*.F90