Merge pull request #63 from C2SM/euler

Add Euler support and update to Python 3.11
C2SM · Feb 27, 2024 · 2fd5f0a · 2fd5f0a
2 parents 50f1111 + 63c336c
commit 2fd5f0a
Show file tree

Hide file tree

Showing 36 changed files with 1,243 additions and 202 deletions.
diff --git a/cases/cosmo-ghg-spinup-test/config.yaml b/cases/cosmo-ghg-spinup-test/config.yaml
@@ -48,7 +48,7 @@ online_vprm:
 int2lm:
     extpar_dir: ./input/cosmo-ghg/extpar
     extpar_filename: test_domain.nc
-    binary_file: ./ext/int2lm/test/testsuite/int2lm
+    binary_file: ./ext/int2lm/TESTSUITE/int2lm
     namelist_filename: int2lm_INPUT.cfg
     runjob_filename: int2lm_runjob.cfg
     compute_queue: normal
@@ -84,7 +84,7 @@ reduce_output:
     output_levels: 20
 
 post_cosmo:
-    output_root: ./output/cosmo-ghg-spinup
+    output_root: ./output/cosmo-ghg-spinup-test
 
 verify_chain:
     reference_dir: null  # Set this value based on your use case

diff --git a/cases/cosmo-ghg-test/config.yaml b/cases/cosmo-ghg-test/config.yaml
@@ -47,7 +47,7 @@ online_vprm:
 int2lm:
     extpar_dir: ./input/cosmo-ghg/extpar
     extpar_filename: test_domain.nc
-    binary_file: ./ext/int2lm/test/testsuite/int2lm
+    binary_file: ./ext/int2lm/TESTSUITE/int2lm
     namelist_filename: int2lm_INPUT.cfg
     runjob_filename: int2lm_runjob.cfg
     compute_queue: normal
@@ -83,7 +83,7 @@ reduce_output:
     output_levels: 20
 
 post_cosmo:
-    output_root: ./output/cosmo-ghg-spinup
+    output_root: ./output/cosmo-ghg-test
 
 verify_chain:
     reference_dir: null  # Set this value based on your use case

diff --git a/cases/icon-art-global-test/config.yaml b/cases/icon-art-global-test/config.yaml
@@ -10,8 +10,8 @@ startdate: 2018-01-01T00:00:00Z
 enddate: 2018-01-01T12:00:00Z
 
 eccodes_dir: ./input/eccodes_definitions
-iconremap_bin: iconremap
-iconsub_bin: iconsub
+iconremap_bin: ./ext/icontools/icontools/iconremap
+iconsub_bin: ./ext/icontools/icontools/iconsub
 latbc_filename: ifs_<y><m><d><h>_lbc.nc
 inidata_prefix: ifs_init_
 inidata_nameformat: '%Y%m%d%H'

diff --git a/cases/icon-art-global-test/icon_runjob.cfg b/cases/icon-art-global-test/icon_runjob.cfg
@@ -389,11 +389,13 @@ EOF
 # run the model!
 # ----------------------------------------------------------------------
 handle_error(){{
+    set +e
     # Check for invalid pointer error at the end of icon-art
     if grep -q "free(): invalid pointer" {cfg.logfile} && grep -q "clean-up finished" {cfg.logfile}; then
         exit 0
     else
         exit 1
     fi
+    set -e
 }}
 srun ./{cfg.icon_execname} || handle_error
diff --git a/cases/icon-art-oem-test/config.yaml b/cases/icon-art-oem-test/config.yaml
@@ -10,8 +10,8 @@ startdate: 2018-01-01T00:00:00Z
 enddate: 2018-01-01T12:00:00Z
 
 eccodes_dir: ./input/eccodes_definitions
-iconremap_bin: iconremap
-iconsub_bin: iconsub
+iconremap_bin: ./ext/icontools/icontools/iconremap
+iconsub_bin: ./ext/icontools/icontools/iconsub
 latbc_filename: ifs_<y><m><d><h>_lbc.nc
 inidata_prefix: ifs_init_
 inidata_nameformat: '%Y%m%d%H'

diff --git a/cases/icon-art-oem-test/icon_runjob.cfg b/cases/icon-art-oem-test/icon_runjob.cfg
@@ -369,11 +369,13 @@ EOF
 # run the model!
 # ----------------------------------------------------------------------
 handle_error(){{
+    set +e
     # Check for invalid pointer error at the end of icon-art
     if grep -q "free(): invalid pointer" {cfg.logfile} && grep -q "clean-up finished" {cfg.logfile}; then
         exit 0
     else
         exit 1
     fi
+    set -e
 }}
 srun ./{cfg.icon_execname} || handle_error
diff --git a/cases/icon-art-oem-test/icontools_remap_00_lbc_runjob.cfg b/cases/icon-art-oem-test/icontools_remap_00_lbc_runjob.cfg
@@ -17,9 +17,6 @@ set -x
 
 export ECCODES_DEFINITION_PATH={cfg.eccodes_dir}/definitions.edzw-2.12.5-2:{cfg.eccodes_dir}/definitions
 
-. {cfg.chain_src_dir}/ext/spack-c2sm/setup-env.sh
-spack load icontools
-
 #-----------------------------------------------------------------------------
 # PART I: Create auxiliary grid file which contains only the cells of the 
 #         boundary zone.

diff --git a/cases/icon-art-oem-test/icontools_remap_ic_chem_runjob.cfg b/cases/icon-art-oem-test/icontools_remap_ic_chem_runjob.cfg
@@ -17,9 +17,6 @@ set -e -x
 
 export ECCODES_DEFINITION_PATH={cfg.eccodes_dir}/definitions.edzw-2.12.5-2:{cfg.eccodes_dir}/definitions
 
-. {cfg.chain_src_dir}/ext/spack-c2sm/setup-env.sh
-spack load icontools
-
 #-----------------------------------------------------------------------------
 # Remap inital data onto local (limited-area) grid
 #-----------------------------------------------------------------------------

diff --git a/cases/icon-art-oem-test/icontools_remap_ic_runjob.cfg b/cases/icon-art-oem-test/icontools_remap_ic_runjob.cfg
@@ -17,9 +17,6 @@ set -x
 
 export ECCODES_DEFINITION_PATH={cfg.eccodes_dir}/definitions.edzw-2.12.5-2:{cfg.eccodes_dir}/definitions
 
-. {cfg.chain_src_dir}/ext/spack-c2sm/setup-env.sh
-spack load icontools
-
 #-----------------------------------------------------------------------------
 # Remap inital data onto local (limited-area) grid
 #-----------------------------------------------------------------------------

diff --git a/cases/icon-art-oem-test/icontools_remap_lbc_chem_runjob.cfg b/cases/icon-art-oem-test/icontools_remap_lbc_chem_runjob.cfg
@@ -17,9 +17,6 @@ set -e -x
 
 export ECCODES_DEFINITION_PATH={cfg.eccodes_dir}/definitions.edzw-2.12.5-2:{cfg.eccodes_dir}/definitions
 
-. {cfg.chain_src_dir}/ext/spack-c2sm/setup-env.sh
-spack load icontools
-
 #-----------------------------------------------------------------------------
 # Extract boundary data
 #-----------------------------------------------------------------------------

diff --git a/cases/icon-art-oem-test/icontools_remap_lbc_rest_runjob.cfg b/cases/icon-art-oem-test/icontools_remap_lbc_rest_runjob.cfg
@@ -17,9 +17,6 @@ set -x
 
 export ECCODES_DEFINITION_PATH={cfg.eccodes_dir}/definitions.edzw-2.12.5-2:{cfg.eccodes_dir}/definitions
 
-. {cfg.chain_src_dir}/ext/spack-c2sm/setup-env.sh
-spack load icontools
-
 #-----------------------------------------------------------------------------
 # Extract boundary data
 #-----------------------------------------------------------------------------

diff --git a/cases/icon-test-euler/config.yaml b/cases/icon-test-euler/config.yaml
@@ -0,0 +1,55 @@
+# Configuration file for the 'icon-async-test' case with ICON
+
+workflow: icon
+constraint: EPYC_7H12
+run_on: cpu
+compute_queue: normal.4h
+ntasks_per_node: 12
+restart_step: PT6H
+startdate: 2018-01-01T00:00:00Z
+enddate: 2018-01-01T12:00:00Z
+
+eccodes_dir: ./input/eccodes_definitions
+iconremap_bin: ./ext/icontools/icontools/iconremap
+iconsub_bin: ./ext/icontools/icontools/iconsub
+latbc_filename: ifs_201801<d><h>_lbc.nc
+inidata_filename: ifs_init_2018010100.nc
+output_filename: NWP_LAM
+filename_format: <output_filename>_DOM<physdom>_<ddhhmmss>
+lateral_boundary_grid_order: lateral_boundary
+
+walltime:
+    prepare_icon: '00:10:00'
+    icontools: '00:30:00'
+    icon: '00:30:00'
+
+meteo:
+    dir: ./input/meteo
+    prefix: ifs_
+    nameformat: '%Y%m%d%H'
+    suffix: .grb
+    inc: 3
+
+icontools_runjobs:
+    - icontools_remap_ic_runjob.cfg
+    - icontools_remap_00_lbc_runjob.cfg
+    - icontools_remap_lbc_rest_runjob.cfg
+
+input_files:
+    radiation_grid_filename: ./input/icon/grid/VERIFY_DOM_DOM01.parent.nc
+    dynamics_grid_filename: ./input/icon/grid/VERIFY_DOM_DOM01.nc
+    map_file_latbc: ./input/icon/grid/map_file.latbc
+    lateral_boundary_grid: ./input/icon/grid/lateral_boundary.grid.nc
+    extpar_filename: ./input/icon/grid/external_parameter_icon_VERIFY_DOM_DOM01_tiles.nc
+    cldopt_filename: ./input/icon/rad/rrtm_cldopt.nc
+    lrtm_filename: ./input/icon/rad/rrtmg_lw.nc
+    map_file_ana: ./input/icon/mapping/map_file.ana
+
+icon:
+    binary_file: ./ext/icon/bin/icon
+    runjob_filename: icon_runjob.cfg
+    np_tot: 96
+    np_io: 1
+    np_restart: 1
+    np_prefetch: 1
+