Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cases/icon-test-euler/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ restart_step: PT6H
startdate: 2018-01-01T00:00:00Z
enddate: 2018-01-01T12:00:00Z

eccodes_dir: ./input/eccodes_definitions
eccodes_dir: ./ext/spack-c2sm/spack/opt/spack/linux-ubuntu22.04-broadwell/gcc-12.2.0//share/eccodes/definitions
iconremap_bin: ./ext/icontools/icontools/iconremap
iconsub_bin: ./ext/icontools/icontools/iconsub
latbc_filename: ifs_201801<d><h>_lbc.nc
Expand Down
1 change: 0 additions & 1 deletion env/environment.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
name: proc-chain
channels:
- conda-forge
- defaults
dependencies:
- python=3.11
- cdo
Expand Down
2 changes: 2 additions & 0 deletions jenkins/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,10 @@ pipeline {
sh 'wget -O ${WORKSPACE}/miniconda.sh https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh'
sh 'rm -fr ${WORKSPACE}/miniconda'
sh 'bash miniconda.sh -b -p $WORKSPACE/miniconda'
sh 'conda config --remove channels defaults'
sh 'conda config --set always_yes yes --set changeps1 no'
sh 'conda config --add channels conda-forge'
sh 'conda config --set channel_priority strict'
sh 'conda update -n base -c defaults conda'
sh 'conda env create -f env/environment.yml'
sh '''source ${WORKSPACE}/miniconda/etc/profile.d/conda.sh
Expand Down
41 changes: 0 additions & 41 deletions jenkins/scripts/build_icon-art.sh

This file was deleted.

15 changes: 4 additions & 11 deletions jenkins/scripts/jenkins.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,12 @@ set -e -x
# Check if we are on Euler
if [[ $(hostname) == eu-* ]]; then
host=euler
elif [[ $(hostname) == daint* ]]; then
host=daint
elif [[ $(hostname) == santis* ]]; then
host=santis
else
echo "Unknown hostname: $(hostname)"
fi


# Activate conda environment
eval "$(conda shell.bash hook)"
conda activate proc-chain
Expand Down Expand Up @@ -85,14 +86,6 @@ else
./jenkins/scripts/build_icon.sh
fi

# Build ICON-ART
if [[ -f ext/icon-art/bin/icon ]]; then
echo icon-art executable already exists - skipping build.
else
echo building icon-art...
./jenkins/scripts/build_icon-art.sh
fi

# Test COSMO-GHG
if [[ "$host" == euler ]]; then
echo skipping cosmo-ghg test on Euler...
Expand Down
14 changes: 6 additions & 8 deletions jenkins/scripts/setup-spack.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,13 @@ SPACK_TAG_COSMO=v0.18.1.12

if [[ $(hostname) == eu-* ]]; then
source /cluster/apps/local/env2lmod.sh
module load git/2.31.1
SPACK_TAG=main
elif [[ $(hostname) == daint* ]]; then
git clone --depth 1 [email protected]:C2SM/icon.git icon-tag
SPACK_TAG=`cat icon-tag/config/cscs/SPACK_TAG_DAINT`
module load git
git clone --depth 1 [email protected]:icon/icon-model.git icon-tag
SPACK_TAG=`cat icon-tag/config/ethz/SPACK_TAG_EULER`
rm -fr icon-tag
elif [[ $(hostname) == balfrin* ]]; then
git clone --depth 1 git@github.com:C2SM/icon.git icon-tag
SPACK_TAG=`cat icon-tag/config/cscs/SPACK_TAG_BALFRIN`
elif [[ $(hostname) == santis* ]]; then
git clone --depth 1 git@gitlab.dkrz.de:icon/icon-model.git icon-tag
SPACK_TAG=`cat icon-tag/config/cscs/SPACK_TAG_SANTIS`
rm -fr icon-tag
else
error "Unknown hostname: $(hostname)"
Expand Down