Skip to content

Commit 2fcc9ce

Browse files
Compiler option in download_test_data.sh (#119)
1 parent 694a7b3 commit 2fcc9ce

File tree

3 files changed

+38
-37
lines changed

3 files changed

+38
-37
lines changed

.github/workflows/containerized-ci.yml

Lines changed: 3 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,9 @@ jobs:
1212
# Flags and KGOs for Intel Fortran Compiler Classic
1313
- compiler: ifort
1414
fcflags: -m64 -g -traceback -heap-arrays -assume realloc_lhs -extend-source 132 -check bounds,uninit,pointers,stack -stand f08
15-
gdkgo1: https://docs.google.com/uc?export=download&id=1R6uvtWno-bhdgxACCwdcaRNXs9l5_G4w
16-
gdkgo2: https://docs.google.com/uc?export=download&id=1bVU1_dx6hXcV_fHX2cLUn-D03T-Hij8z
1715
# Flags and KGOs for Intel Fortran Compiler
1816
- compiler: ifx
1917
fcflags: -debug -traceback -O0 -heap-arrays -assume realloc_lhs -extend-source 132 -stand f08
20-
gdkgo1: https://docs.google.com/uc?export=download&id=1CLPJ1ikAcGBEiZ3WAGqL-zpaPIgC__po
21-
gdkgo2: https://docs.google.com/uc?export=download&id=1JOrLFbt0BYgpD0h6A3tsoRD4iTJ4jDvZ
2218
# Set container images
2319
- compiler: ifort
2420
image: ghcr.io/earth-system-radiation/rte-rrtmgp-ci:oneapi
@@ -41,8 +37,6 @@ jobs:
4137
ATOL: 0.0
4238
RTOL: 0.0
4339
KGO_VERSION: ${{ matrix.kgo_version }}
44-
GDKGO1: ${{ matrix.gdkgo1 }}
45-
GDKGO2: ${{ matrix.gdkgo2 }}
4640
steps:
4741
#
4842
# Checks-out repository under $GITHUB_WORKSPACE
@@ -71,30 +65,11 @@ jobs:
7165
cd build
7266
make -j driver
7367
# Retrieve and expand large data files
74-
- name: Retrieve input files
75-
run: |
76-
GDFILE='https://docs.google.com/uc?export=download&id=17eK4_DVEvFOE9Uf6siXJDpWZJKT1aqkU'
77-
OUTPATH=driver/data/inputs/UKMO/cosp_input.um_global.nc.gz
78-
curl -sSfL -o $OUTPATH $GDFILE
79-
gunzip ${OUTPATH}
80-
cd driver/data/inputs/UKMO
81-
md5sum -c cosp_input.um_global.nc.md5
82-
- name: Retrieve KGOs for basic test
83-
run: |
84-
cd ${GITHUB_WORKSPACE}
85-
OUTPATH=driver/data/outputs/UKMO/cosp2_output_um.$F90.kgo.$KGO_VERSION.nc.gz
86-
curl -sSfL -o $OUTPATH $GDKGO1
87-
gunzip ${OUTPATH}
88-
cd driver/data/outputs/UKMO
89-
# md5sum -c cosp2_output_um.${F90}.kgo.$KGO_VERSION.nc.md5
90-
- name: Retrieve KGOs for global test
68+
- name: Retrieve input files and KGOs
9169
run: |
70+
cd driver
71+
. download_test_data.sh ${F90}
9272
cd ${GITHUB_WORKSPACE}
93-
OUTPATH=driver/data/outputs/UKMO/cosp2_output.um_global.${F90}.kgo.$KGO_VERSION.nc.gz
94-
curl -sSfL -o $OUTPATH $GDKGO2
95-
gunzip ${OUTPATH}
96-
cd driver/data/outputs/UKMO
97-
# md5sum -c cosp2_output.um_global.${F90}.kgo.$KGO_VERSION.nc.md5
9873
###############################################################################
9974
# Run COSP2 tests. Basic test and UM global snapshot
10075
###############################################################################

.github/workflows/continuous_integration.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ jobs:
8989
- name: Retrieve input files and KGOs
9090
run: |
9191
cd driver
92-
. download_test_data.sh
92+
. download_test_data.sh ${F90}
9393
cd ${GITHUB_WORKSPACE}
9494
###############################################################################
9595
# Run COSP2 tests. We could run both tests in one step, but

driver/download_test_data.sh

Lines changed: 34 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,41 @@
11
#/bin/bash
22

3-
KGO_VERSION=v004
4-
echo "KGO_VERSION=$KGO_VERSION"
3+
COMPILER=$1
4+
5+
case $COMPILER in
6+
7+
"gfortran")
8+
KGO_VERSION=v004
9+
kgo_links=( "https://docs.google.com/uc?export=download&id=1kC9RViPBdAsGcOivpYXxs3hHJ11Kv8IN" \
10+
"https://docs.google.com/uc?export=download&id=1X_oOzvY2lf-kyAR-D1E6JfuefkGg1idn" \
11+
"https://docs.google.com/uc?export=download&id=1c14qBf9VwYJWYVGCu-Cw35F-qqHx0mSg" )
12+
out_type=( "cosp2_output_um.gfortran.kgo" \
13+
"cosp2_output.um_global.gfortran.kgo" \
14+
"cosp2_output.um_global_model_levels.gfortran.kgo" )
15+
;;
516

6-
kgo_links=( "https://docs.google.com/uc?export=download&id=1kC9RViPBdAsGcOivpYXxs3hHJ11Kv8IN" \
7-
"https://docs.google.com/uc?export=download&id=1X_oOzvY2lf-kyAR-D1E6JfuefkGg1idn" \
8-
"https://docs.google.com/uc?export=download&id=1c14qBf9VwYJWYVGCu-Cw35F-qqHx0mSg" )
17+
"ifort")
18+
KGO_VERSION=v005
19+
kgo_links=( "https://docs.google.com/uc?export=download&id=1R6uvtWno-bhdgxACCwdcaRNXs9l5_G4w" \
20+
"https://docs.google.com/uc?export=download&id=1bVU1_dx6hXcV_fHX2cLUn-D03T-Hij8z" )
21+
out_type=( "cosp2_output_um.ifort.kgo" \
22+
"cosp2_output.um_global.ifort.kgo" )
23+
;;
924

10-
out_type=( "cosp2_output_um.gfortran.kgo" \
11-
"cosp2_output.um_global.gfortran.kgo" \
12-
"cosp2_output.um_global_model_levels.gfortran.kgo" )
25+
"ifx")
26+
KGO_VERSION=v005
27+
kgo_links=( "https://docs.google.com/uc?export=download&id=1CLPJ1ikAcGBEiZ3WAGqL-zpaPIgC__po" \
28+
"https://docs.google.com/uc?export=download&id=1JOrLFbt0BYgpD0h6A3tsoRD4iTJ4jDvZ" )
29+
out_type=( "cosp2_output_um.ifort.kgo" \
30+
"cosp2_output.um_global.ifort.kgo" )
31+
;;
32+
33+
*)
34+
echo -n "Invalid compiler"
35+
;;
36+
esac
37+
38+
echo "KGO_VERSION=$KGO_VERSION"
1339

1440
# Input: global UM
1541
DRIVER_DIR=${PWD}

0 commit comments

Comments
 (0)