Skip to content

Commit 2fd5f0a

Browse files
authored
Merge pull request #63 from C2SM/euler
Add Euler support and update to Python 3.11
2 parents 50f1111 + 63c336c commit 2fd5f0a

36 files changed

+1243
-202
lines changed

cases/cosmo-ghg-spinup-test/config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ online_vprm:
4848
int2lm:
4949
extpar_dir: ./input/cosmo-ghg/extpar
5050
extpar_filename: test_domain.nc
51-
binary_file: ./ext/int2lm/test/testsuite/int2lm
51+
binary_file: ./ext/int2lm/TESTSUITE/int2lm
5252
namelist_filename: int2lm_INPUT.cfg
5353
runjob_filename: int2lm_runjob.cfg
5454
compute_queue: normal
@@ -84,7 +84,7 @@ reduce_output:
8484
output_levels: 20
8585

8686
post_cosmo:
87-
output_root: ./output/cosmo-ghg-spinup
87+
output_root: ./output/cosmo-ghg-spinup-test
8888

8989
verify_chain:
9090
reference_dir: null # Set this value based on your use case

cases/cosmo-ghg-test/config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ online_vprm:
4747
int2lm:
4848
extpar_dir: ./input/cosmo-ghg/extpar
4949
extpar_filename: test_domain.nc
50-
binary_file: ./ext/int2lm/test/testsuite/int2lm
50+
binary_file: ./ext/int2lm/TESTSUITE/int2lm
5151
namelist_filename: int2lm_INPUT.cfg
5252
runjob_filename: int2lm_runjob.cfg
5353
compute_queue: normal
@@ -83,7 +83,7 @@ reduce_output:
8383
output_levels: 20
8484

8585
post_cosmo:
86-
output_root: ./output/cosmo-ghg-spinup
86+
output_root: ./output/cosmo-ghg-test
8787

8888
verify_chain:
8989
reference_dir: null # Set this value based on your use case

cases/icon-art-global-test/config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ startdate: 2018-01-01T00:00:00Z
1010
enddate: 2018-01-01T12:00:00Z
1111

1212
eccodes_dir: ./input/eccodes_definitions
13-
iconremap_bin: iconremap
14-
iconsub_bin: iconsub
13+
iconremap_bin: ./ext/icontools/icontools/iconremap
14+
iconsub_bin: ./ext/icontools/icontools/iconsub
1515
latbc_filename: ifs_<y><m><d><h>_lbc.nc
1616
inidata_prefix: ifs_init_
1717
inidata_nameformat: '%Y%m%d%H'

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -389,11 +389,13 @@ EOF
389389
# run the model!
390390
# ----------------------------------------------------------------------
391391
handle_error(){{
392+
set +e
392393
# Check for invalid pointer error at the end of icon-art
393394
if grep -q "free(): invalid pointer" {cfg.logfile} && grep -q "clean-up finished" {cfg.logfile}; then
394395
exit 0
395396
else
396397
exit 1
397398
fi
399+
set -e
398400
}}
399401
srun ./{cfg.icon_execname} || handle_error

cases/icon-art-oem-test/config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ startdate: 2018-01-01T00:00:00Z
1010
enddate: 2018-01-01T12:00:00Z
1111

1212
eccodes_dir: ./input/eccodes_definitions
13-
iconremap_bin: iconremap
14-
iconsub_bin: iconsub
13+
iconremap_bin: ./ext/icontools/icontools/iconremap
14+
iconsub_bin: ./ext/icontools/icontools/iconsub
1515
latbc_filename: ifs_<y><m><d><h>_lbc.nc
1616
inidata_prefix: ifs_init_
1717
inidata_nameformat: '%Y%m%d%H'

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -369,11 +369,13 @@ EOF
369369
# run the model!
370370
# ----------------------------------------------------------------------
371371
handle_error(){{
372+
set +e
372373
# Check for invalid pointer error at the end of icon-art
373374
if grep -q "free(): invalid pointer" {cfg.logfile} && grep -q "clean-up finished" {cfg.logfile}; then
374375
exit 0
375376
else
376377
exit 1
377378
fi
379+
set -e
378380
}}
379381
srun ./{cfg.icon_execname} || handle_error

cases/icon-art-oem-test/icontools_remap_00_lbc_runjob.cfg

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ set -x
1717

1818
export ECCODES_DEFINITION_PATH={cfg.eccodes_dir}/definitions.edzw-2.12.5-2:{cfg.eccodes_dir}/definitions
1919

20-
. {cfg.chain_src_dir}/ext/spack-c2sm/setup-env.sh
21-
spack load icontools
22-
2320
#-----------------------------------------------------------------------------
2421
# PART I: Create auxiliary grid file which contains only the cells of the
2522
# boundary zone.

cases/icon-art-oem-test/icontools_remap_ic_chem_runjob.cfg

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ set -e -x
1717

1818
export ECCODES_DEFINITION_PATH={cfg.eccodes_dir}/definitions.edzw-2.12.5-2:{cfg.eccodes_dir}/definitions
1919

20-
. {cfg.chain_src_dir}/ext/spack-c2sm/setup-env.sh
21-
spack load icontools
22-
2320
#-----------------------------------------------------------------------------
2421
# Remap inital data onto local (limited-area) grid
2522
#-----------------------------------------------------------------------------

cases/icon-art-oem-test/icontools_remap_ic_runjob.cfg

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ set -x
1717

1818
export ECCODES_DEFINITION_PATH={cfg.eccodes_dir}/definitions.edzw-2.12.5-2:{cfg.eccodes_dir}/definitions
1919

20-
. {cfg.chain_src_dir}/ext/spack-c2sm/setup-env.sh
21-
spack load icontools
22-
2320
#-----------------------------------------------------------------------------
2421
# Remap inital data onto local (limited-area) grid
2522
#-----------------------------------------------------------------------------

cases/icon-art-oem-test/icontools_remap_lbc_chem_runjob.cfg

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ set -e -x
1717

1818
export ECCODES_DEFINITION_PATH={cfg.eccodes_dir}/definitions.edzw-2.12.5-2:{cfg.eccodes_dir}/definitions
1919

20-
. {cfg.chain_src_dir}/ext/spack-c2sm/setup-env.sh
21-
spack load icontools
22-
2320
#-----------------------------------------------------------------------------
2421
# Extract boundary data
2522
#-----------------------------------------------------------------------------

0 commit comments

Comments
 (0)