diff --git a/conf/real-from-d2-ana/simulation.yml b/conf/real-from-d2-ana/simulation.yml index 72cb07715017dcacce461f98184bde34c931727a..6a4e61f1ce54495e49123b5312505fe3821a2bc2 100644 --- a/conf/real-from-d2-ana/simulation.yml +++ b/conf/real-from-d2-ana/simulation.yml @@ -12,7 +12,7 @@ simulation: atmosphere: "%HPCROOTDIR%/proj/namelists/real-from-d2-ana/icon_atmosphere.namelist" # List of output file names that will be copied (Wildcards * allowed) - output_file_names: "init_DOM01_ML_*.nc latbc_DOM01_ML_*.nc" + output_file_names: "idfrf*.nc" files_to_clean: "*.nc" initial_conditions: diff --git a/namelists/real-from-d2-ana/icon_atmosphere.namelist b/namelists/real-from-d2-ana/icon_atmosphere.namelist index d30514538b4a3103695e14754bbd29105ed2abcc..ef9abb7332c80d82c98ddf2f052661490038ae89 100644 --- a/namelists/real-from-d2-ana/icon_atmosphere.namelist +++ b/namelists/real-from-d2-ana/icon_atmosphere.namelist @@ -263,9 +263,6 @@ timedep_pert = 2 / -&gribout_nml - perturbationNumber = 9 -/ ! ----------------------------------------------- ! ! --- ICON-D2: output fields - regular grid at pressure levels --- ! diff --git a/templates/real-from-d2-ana/prepare_date_remote.sh b/templates/real-from-d2-ana/prepare_date_remote.sh index 124602027212b774e865b64e611e9ecbd527a233..b1910df4c2dc044e00abb2c8b30fa2c9f6c82a36 100644 --- a/templates/real-from-d2-ana/prepare_date_remote.sh +++ b/templates/real-from-d2-ana/prepare_date_remote.sh @@ -62,5 +62,5 @@ if [ "${IC_DATA_IS_LOCAL}" != "True" ]; then awk '{print $1}' fg_file.txt | xargs -I[] ln -sf [] . # Change permissions to read only. - chmod 440 ./* + #chmod 440 ./* fi \ 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 6e038f65c7e531f39bb7cf0ee4801730d4eb1f0b..f172ed30c28849bcd799bdc783cc7e32f445ea7d 100644 --- a/templates/real-from-d2-ana/prepare_lbc_remote.sh +++ b/templates/real-from-d2-ana/prepare_lbc_remote.sh @@ -114,7 +114,7 @@ if [ "${LBC_DATA_IS_LOCAL}" != "True" ]; then #cp "${LBC_SOURCE}" "${LBC_FILE}" # Change permissions to read only. - chmod 440 ./* + 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 ffb8d7d56d57d5b03ac32202099a59d270fd6b3c..f59f115878cdd2a3866ad71bab1a9c8610c42dd6 100644 --- a/templates/real-from-d2-ana/prepare_namelist.py +++ b/templates/real-from-d2-ana/prepare_namelist.py @@ -41,6 +41,9 @@ first_guess_filename = ( analysis_filename = RUNDIR / f"an_R19B07.{Chunk_START_DATE.strftime('%Y%m%d%H%M')}00_an.{MEMBER[1:]}" analysis_inc_filename = RUNDIR / f"an_R19B07.{Chunk_START_DATE.strftime('%Y%m%d%H%M')}00_inc.{MEMBER[1:]}" + +boundary_filename = RUNDIR / f"latbc_<dddhh>.{MEMBER}.grib" + # Read custom namelist parameters from configuration atmosphere_namelist_string = """ %atmosphere_namelist% @@ -68,12 +71,12 @@ atmosphere_namelist_replacements = { "extpar_filename": "%simulation.external_parameters_filename%", }, "initicon_nml": { - "dwdfg_filename": first_guess_filename, - "dwdana_filename": analysis_inc_filename, + "dwdfg_filename": str(first_guess_filename), + "dwdana_filename": str(analysis_inc_filename), }, "limarea_nml": { - "latbc_filename": "./icbc/M031/latbc_<dddhh>.grib", - "latbc_boundary_grid": "icon_grid_0047_R19B07_L_lbc.nc", + "latbc_filename": str(boundary_filename), + "latbc_boundary_grid": "%simulation.lateral_boundary_grid_filename%", }, "nwp_phy_nml": { "psp_rnd_seed": int(MEMBER[1:]),