diff --git a/conf/common/build.yml b/conf/common/build.yml index baa307ef9732bdbde1a063f797887183b4fba19d..e0a3753a3e34d31e366847212e3aee70051b7d6d 100644 --- a/conf/common/build.yml +++ b/conf/common/build.yml @@ -31,6 +31,10 @@ icon: load_cmd: build_cmd version: master # The latest release at the moment of creating this file was 2.6.5-nwp0 + launch_cmd: "srun" + # for LRZ + #launch_cmd: "-K --mpi=pmi2 --cpu-freq=HighM1 --kill-on-bad-exit=1 --cpu_bind=verbose,cores --distribution=block:block" + dwdicontools: build_cmd: "dwd-icon-tools% %SPACK.COMPILER%" load_cmd: build_cmd diff --git a/namelists/real-from-d2-ana/icon_atmosphere.namelist b/namelists/real-from-d2-ana/icon_atmosphere.namelist index 0d9bc9331d745e6ce5b54ddcd77927bd89d5b663..e72ebc9de2f94fbb9a0a318e6ea4146acc262ff5 100644 --- a/namelists/real-from-d2-ana/icon_atmosphere.namelist +++ b/namelists/real-from-d2-ana/icon_atmosphere.namelist @@ -132,7 +132,7 @@ vmr_cfc12 = 532.e-12 direct_albedo_water = 3 albedo_whitecap = 1 - ecrad_data_path = "/hpc/uhome/adlozar/icon/externals/ecrad/data" + ecrad_data_path = "/dss/dsskcsfs01/pn34ca/pn34ca-dss-0009/ICON/data/externals/ecrad" ecrad_llw_cloud_scat = .false. ecrad_iliquid_scat = 0 ecrad_iice_scat = 0 diff --git a/templates/common/run_icon.sh b/templates/common/run_icon.sh index a72b0c827d9c2fe15010b2bb8e5dd16e8e4ed7d9..44741daae6f6f6857d83c94d3ef899c5b39c6079 100644 --- a/templates/common/run_icon.sh +++ b/templates/common/run_icon.sh @@ -32,5 +32,8 @@ source ${WORKDIR}/eccodes_defs.env # Increase stack size limit ulimit -s unlimited +# Get proper load command. +ICON_LAUNCH_CMD="%ICON.LAUNCH_CMD%" + # Run icon -srun icon +${ICON_LAUNCH_CMD} icon diff --git a/templates/real-from-d2-ana/prepare_experiment.sh b/templates/real-from-d2-ana/prepare_experiment.sh index 76ee38e402e15accde14820f31f59079e5688ba8..2774e08eefbe3a5c07ad1149c86f1cb015e9b0d3 100644 --- a/templates/real-from-d2-ana/prepare_experiment.sh +++ b/templates/real-from-d2-ana/prepare_experiment.sh @@ -49,4 +49,4 @@ cp "%simulation.namelist_paths.ana_map%" . cp "%simulation.namelist_paths.lbc_map%" . # Change permissions to read only. -chmod 440 ./* \ No newline at end of file +#chmod 440 ./* \ No newline at end of file diff --git a/templates/real-from-d2-ana/prepare_lbc_remote.sh b/templates/real-from-d2-ana/prepare_lbc_remote.sh index 31e473dbd355f6ac0768c20904bb130a26a9fb7b..2da0d2c5f4f16f18bef570faba0c12a78a7dcf76 100644 --- a/templates/real-from-d2-ana/prepare_lbc_remote.sh +++ b/templates/real-from-d2-ana/prepare_lbc_remote.sh @@ -118,7 +118,7 @@ if [ "${LBC_DATA_IS_LOCAL}" != "True" ]; then #cp "${LBC_SOURCE}" "${LBC_FILE}" # Change permissions to read only. - chmod 440 ${MEMBER_DIR}/latbc_*.grib + #chmod 440 ${MEMBER_DIR}/latbc_*.grib fi \ No newline at end of file diff --git a/templates/real-from-d2-ana/prepare_namelist.py b/templates/real-from-d2-ana/prepare_namelist.py index bd69447f702ad8df89e21b9bf290d5d434e02bd1..40172d0a75d785e7c42cc612c4da2904db81bf5a 100644 --- a/templates/real-from-d2-ana/prepare_namelist.py +++ b/templates/real-from-d2-ana/prepare_namelist.py @@ -90,7 +90,9 @@ atmosphere_namelist_replacements = { # -> cloud_cosmo5 (mu=1/3): 0 (REF), 1, 2, 4, 8 # -> cloud_nue1mue1 (mu=1): 1 (REF), 2, 4, 8 }, - + # "radiation_nml": { + # "ecrad_data_path:": "", + # }, } master_namelist_replacements = {