Skip to content

Commit f4774f3

Browse files
mjaehnmjaehn
authored
Merge pull request #65 from C2SM/icon-2024.01
Update for icon version 2024.01
2 parents 2fd5f0a + b2edb98 commit f4774f3

File tree

8 files changed

+40
-21
lines changed

8 files changed

+40
-21
lines changed

‎cases/icon-art-global-test/icon_runjob.cfg‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,6 @@ cat > NAMELIST_{cfg.casename} << EOF
248248
igradp_method = 3 ! discretization of horizontal pressure gradient
249249
itime_scheme = 4 ! time integration scheme
250250
ivctype = 2 ! type of vertical coordinate
251-
l_open_ubc = .FALSE. ! .TRUE.=use open upper boundary condition
252251
l_zdiffu_t = .TRUE. ! specifies computation of Smagorinsky temperature diffusion
253252
rayleigh_coeff = 5.0 ! Rayleigh damping coefficient
254253
thhgtd_zdiffu = 125.0 ! threshold of height difference (temperature diffusion)
@@ -272,7 +271,6 @@ cat > NAMELIST_{cfg.casename} << EOF
272271
! dynamics_nml: dynamical core -----------------------------------------------
273272
&dynamics_nml
274273
divavg_cntrwgt = 0.50 ! weight of central cell for divergence averaging
275-
idiv_method = 1 ! method for divergence computation
276274
iequations = 3 ! type of equations and prognostic variables
277275
lcoriolis = .TRUE. ! Coriolis force
278276
/

‎cases/icon-art-oem-test/icon_runjob.cfg‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,6 @@ cat > NAMELIST_{cfg.casename} << EOF
139139
! dynamics_nml: dynamical core -----------------------------------------------
140140
&dynamics_nml
141141
iequations = 3 ! type of equations and prognostic variables
142-
idiv_method = 1 ! method for divergence computation
143142
divavg_cntrwgt = 0.50 ! weight of central cell for divergence averaging
144143
lcoriolis = .TRUE. ! Coriolis force
145144
/
@@ -240,7 +239,6 @@ cat > NAMELIST_{cfg.casename} << EOF
240239
divdamp_order = 24 ! order of divergence damping
241240
divdamp_type = 3 ! type of divergence damping
242241
divdamp_fac = 0.004 ! scaling factor for divergence damping
243-
l_open_ubc = .FALSE. ! .TRUE.=use open upper boundary condition
244242
igradp_method = 3 ! discretization of horizontal pressure gradient
245243
l_zdiffu_t = .TRUE. ! specifies computation of Smagorinsky temperature diffusion
246244
thslp_zdiffu = 0.02 ! slope threshold (temperature diffusion)

‎cases/icon-test-euler/icon_runjob.cfg‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,6 @@ cat > NAMELIST_{cfg.casename} << EOF
111111
! dynamics_nml: dynamical core -----------------------------------------------
112112
&dynamics_nml
113113
iequations = 3 ! type of equations and prognostic variables
114-
idiv_method = 1 ! method for divergence computation
115114
divavg_cntrwgt = 0.50 ! weight of central cell for divergence averaging
116115
lcoriolis = .TRUE. ! Coriolis force
117116
/
@@ -213,7 +212,6 @@ cat > NAMELIST_{cfg.casename} << EOF
213212
divdamp_order = 24 ! order of divergence damping
214213
divdamp_type = 3 ! type of divergence damping
215214
divdamp_fac = 0.004 ! scaling factor for divergence damping
216-
l_open_ubc = .FALSE. ! .TRUE.=use open upper boundary condition
217215
igradp_method = 3 ! discretization of horizontal pressure gradient
218216
l_zdiffu_t = .TRUE. ! specifies computation of Smagorinsky temperature diffusion
219217
thslp_zdiffu = 0.02 ! slope threshold (temperature diffusion)

‎cases/icon-test/icon_runjob.cfg‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,6 @@ cat > NAMELIST_{cfg.casename} << EOF
116116
! dynamics_nml: dynamical core -----------------------------------------------
117117
&dynamics_nml
118118
iequations = 3 ! type of equations and prognostic variables
119-
idiv_method = 1 ! method for divergence computation
120119
divavg_cntrwgt = 0.50 ! weight of central cell for divergence averaging
121120
lcoriolis = .TRUE. ! Coriolis force
122121
/
@@ -218,7 +217,6 @@ cat > NAMELIST_{cfg.casename} << EOF
218217
divdamp_order = 24 ! order of divergence damping
219218
divdamp_type = 3 ! type of divergence damping
220219
divdamp_fac = 0.004 ! scaling factor for divergence damping
221-
l_open_ubc = .FALSE. ! .TRUE.=use open upper boundary condition
222220
igradp_method = 3 ! discretization of horizontal pressure gradient
223221
l_zdiffu_t = .TRUE. ! specifies computation of Smagorinsky temperature diffusion
224222
thslp_zdiffu = 0.02 ! slope threshold (temperature diffusion)

‎jenkins/scripts/build_icon-art.sh‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,18 @@ pushd ${MODEL}
2222

2323
if [[ $(hostname) == eu-* ]]; then
2424
./jenkins/scripts/jenkins_euler.sh -b -fc gcc --configure euler.cpu.gcc.O2
25-
else
26-
SPACK_TAG=`cat config/cscs/SPACK_TAG`
25+
elif [[ $(hostname) == daint* ]]; then
26+
SPACK_TAG=`cat config/cscs/SPACK_TAG_DAINT`
27+
. ../spack-c2sm/setup-env.sh
28+
spack env activate -d config/cscs/spack/${SPACK_TAG}/daint_cpu_nvhpc
29+
spack install -u build
30+
elif [[ $(hostname) == balfrin* ]]; then
31+
SPACK_TAG=`cat config/cscs/SPACK_TAG_BALFRIN`
2732
. ../spack-c2sm/setup-env.sh
28-
spack env activate -d config/cscs/spack/${SPACK_TAG}/daint_cpu_nvhpc_art
33+
spack env activate -d config/cscs/spack/${SPACK_TAG}/daint_cpu_nvhpc
2934
spack install -u build
35+
else
36+
error "Unknown hostname: $(hostname)"
3037
fi
3138

3239
popd

‎jenkins/scripts/build_icon.sh‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,18 @@ pushd ${MODEL}
2222

2323
if [[ $(hostname) == eu-* ]]; then
2424
./jenkins/scripts/jenkins_euler.sh -b -fc gcc --configure euler.cpu.gcc.O2
25-
else
26-
SPACK_TAG=`cat config/cscs/SPACK_TAG`
25+
elif [[ $(hostname) == daint* ]]; then
26+
SPACK_TAG=`cat config/cscs/SPACK_TAG_DAINT`
2727
. ../spack-c2sm/setup-env.sh
2828
spack env activate -d config/cscs/spack/${SPACK_TAG}/daint_cpu_nvhpc
2929
spack install -u build
30+
elif [[ $(hostname) == balfrin* ]]; then
31+
SPACK_TAG=`cat config/cscs/SPACK_TAG_BALFRIN`
32+
. ../spack-c2sm/setup-env.sh
33+
spack env activate -d config/cscs/spack/${SPACK_TAG}/daint_cpu_nvhpc
34+
spack install -u build
35+
else
36+
error "Unknown hostname: $(hostname)"
3037
fi
3138

3239
popd

‎jenkins/scripts/common.sh‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,11 @@ function clone_and_build_package {
2424

2525
pushd ${MODEL}
2626

27-
. ../spack-c2sm/setup-env.sh
27+
if [[ "${MODEL}" == cosmo-ghg ]]; then
28+
. ../spack-c2sm-cosmo/setup-env.sh
29+
else
30+
. ../spack-c2sm/setup-env.sh
31+
fi
2832
spack ${BUILD} -u build ${PACKAGE}@${VERSION}%${COMPILER} ${FLAGS} || error "Failed to build ${PACKAGE}"
2933

3034
popd

‎jenkins/scripts/setup-spack.sh‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,27 @@
22

33
set -e -x
44

5-
function error {
6-
echo "*** Error: $@" >&2
7-
exit 1
8-
}
5+
source jenkins/scripts/common.sh
96

107
# Check if script is called correctly
118
[[ $(git rev-parse --show-toplevel 2>/dev/null) = $(pwd) ]] || error "$0 not launched from toplevel of repository"
129

10+
SPACK_TAG_COSMO=v0.18.1.12
11+
1312
if [[ $(hostname) == eu-* ]]; then
1413
source /cluster/apps/local/env2lmod.sh
1514
module load git/2.31.1
1615
SPACK_TAG=main
17-
else
16+
elif [[ $(hostname) == daint* ]]; then
17+
git clone --depth 1 [email protected]:C2SM/icon.git icon-tag
18+
SPACK_TAG=`cat icon-tag/config/cscs/SPACK_TAG_DAINT`
19+
rm -fr icon-tag
20+
elif [[ $(hostname) == balfrin* ]]; then
1821
git clone --depth 1 [email protected]:C2SM/icon.git icon-tag
19-
SPACK_TAG=`cat icon-tag/config/cscs/SPACK_TAG`
22+
SPACK_TAG=`cat icon-tag/config/cscs/SPACK_TAG_BALFRIN`
2023
rm -fr icon-tag
24+
else
25+
error "Unknown hostname: $(hostname)"
2126
fi
2227

2328
GIT_REMOTE=https://github.com/C2SM/spack-c2sm.git
@@ -26,6 +31,10 @@ rm -fr ext/spack-c2sm
2631

2732
pushd ext
2833

29-
git clone --depth 1 --recurse-submodules --shallow-submodules -b ${SPACK_TAG} ${GIT_REMOTE}
34+
# Clone Spack for ICON
35+
git clone --depth 1 --recurse-submodules --shallow-submodules -b ${SPACK_TAG} ${GIT_REMOTE} spack-c2sm
36+
37+
# Clone Spack for COSMO-GHG
38+
git clone --depth 1 --recurse-submodules --shallow-submodules -b ${SPACK_TAG_COSMO} ${GIT_REMOTE} spack-c2sm-cosmo
3039

3140
popd

0 commit comments

Comments
 (0)