Download files using same logic in both CI workflows.

CFMIP · Mar 15, 2024 · 5dafead · 5dafead
1 parent 43a0c29
commit 5dafead
Showing 1 changed file with 20 additions and 14 deletions.
diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml
@@ -46,6 +46,9 @@ jobs:
       ATOL: 0.0
       RTOL: 0.0
       KGO_VERSION: v002
+      GDKGO1: https://docs.google.com/uc?export=download&id=11dKcIL3EQr7s6jbo4f9GsoW0SufesGbq
+      GDKGO2: https://docs.google.com/uc?export=download&id=1s5Ha6Hqnv_hWbRUs8KQpJ4Lxy8uvJDar
+      GDKGO3: https://docs.google.com/uc?export=download&id=1kY1lRgzd0UhDiQef2u-VgTQql_iut3U2
     # Sequence of tasks that will be executed as part of the job
     steps:
     ###############################################################################
@@ -80,35 +83,38 @@ jobs:
         cd build
         make -j driver
     # Retrieve and expand large data files
-    - name: Retrieve data files
+    - name: Retrieve input files
       run: |
         GDFILE='https://docs.google.com/uc?export=download&id=17eK4_DVEvFOE9Uf6siXJDpWZJKT1aqkU'
         OUTPATH=driver/data/inputs/UKMO/cosp_input.um_global.nc.gz
-        wget --no-check-certificate $GDFILE -O $OUTPATH
+        curl -sSfL -o $OUTPATH $GDFILE
         gunzip ${OUTPATH}
         cd driver/data/inputs/UKMO
         md5sum -c cosp_input.um_global.nc.md5
+    - name: Retrieve KGOs for basic test
+      run: |
         cd ${GITHUB_WORKSPACE}
-        GDFILE='https://docs.google.com/uc?export=download&id=1s5Ha6Hqnv_hWbRUs8KQpJ4Lxy8uvJDar'
-        OUTPATH=driver/data/outputs/UKMO/cosp2_output.um_global.gfortran.kgo.$KGO_VERSION.nc.gz
-        wget --no-check-certificate $GDFILE -O $OUTPATH
+        OUTPATH=driver/data/outputs/UKMO/cosp2_output_um.$F90.kgo.$KGO_VERSION.nc.gz
+        curl -sSfL -o $OUTPATH $GDKGO1
         gunzip ${OUTPATH}
         cd driver/data/outputs/UKMO
-        md5sum -c cosp2_output.um_global.gfortran.kgo.$KGO_VERSION.nc.md5
+        md5sum -c cosp2_output_um.${F90}.kgo.$KGO_VERSION.nc.md5
+    - name: Retrieve KGOs for global test
+      run: |
         cd ${GITHUB_WORKSPACE}
-        GDFILE='https://docs.google.com/uc?export=download&id=11dKcIL3EQr7s6jbo4f9GsoW0SufesGbq'
-        OUTPATH=driver/data/outputs/UKMO/cosp2_output_um.gfortran.kgo.$KGO_VERSION.nc.gz
-        wget --no-check-certificate $GDFILE -O $OUTPATH
+        OUTPATH=driver/data/outputs/UKMO/cosp2_output.um_global.${F90}.kgo.$KGO_VERSION.nc.gz
+        curl -sSfL -o $OUTPATH $GDKGO2
         gunzip ${OUTPATH}
         cd driver/data/outputs/UKMO
-        md5sum -c cosp2_output_um.gfortran.kgo.$KGO_VERSION.nc.md5
+        md5sum -c cosp2_output.um_global.${F90}.kgo.$KGO_VERSION.nc.md5        cd ${GITHUB_WORKSPACE}
+    - name: Retrieve KGOs for global test with outputs on model levels
+      run: |
         cd ${GITHUB_WORKSPACE}
-        GDFILE='https://docs.google.com/uc?export=download&id=1kY1lRgzd0UhDiQef2u-VgTQql_iut3U2'
-        OUTPATH=driver/data/outputs/UKMO/cosp2_output.um_global_model_levels.gfortran.kgo.$KGO_VERSION.nc.gz
-        wget --no-check-certificate $GDFILE -O $OUTPATH
+        OUTPATH=driver/data/outputs/UKMO/cosp2_output.um_global_model_levels.${F90}.kgo.$KGO_VERSION.nc.gz
+        curl -sSfL -o $OUTPATH $GDKGO3
         gunzip ${OUTPATH}
         cd driver/data/outputs/UKMO
-        md5sum -c cosp2_output.um_global_model_levels.gfortran.kgo.$KGO_VERSION.nc.md5
+        md5sum -c cosp2_output.um_global_model_levels.${F90}.kgo.$KGO_VERSION.nc.md5        cd ${GITHUB_WORKSPACE}
     ###############################################################################
     # Run COSP2 tests. We could run both tests in one step, but
     # doing it this way the output is easier to interpret.