diff --git a/conf/real-from-ideal/namelists.yml b/conf/real-from-ideal/namelists.yml new file mode 100644 index 0000000000000000000000000000000000000000..63a4326e05952ea5f5dcbe90e7d8fdfba45d1fe9 --- /dev/null +++ b/conf/real-from-ideal/namelists.yml @@ -0,0 +1,13 @@ +atmosphere_namelist_ideal: | + &output_nml + / + &output_nml + steps_per_file = 1 + 20201001 + output_start = '2020-10-01T06:00:00Z' + output_end = '2020-10-01T06:00:00Z' + output_filename = "init-test-ext" + include_last = .true. + output_interval = 'PT3600S' + ml_varlist = 'depth_lk', 'emis_rad', 'fr_lake', 'fr_land', 'topography_c', 'soiltyp', 'sso_stdh', 'sso_theta', 'sso_gamma', 'sso_sigma' + / diff --git a/namelists/real-from-dwd-ana/icon_atmosphere.namelist b/namelists/real-from-dwd-ana/icon_atmosphere.namelist index de7019373ffea7650ce54f72877a9c6a6e4eca90..b4789b7b2cd87b16ef9e0d9c3d8672ab3fdba6bf 100644 --- a/namelists/real-from-dwd-ana/icon_atmosphere.namelist +++ b/namelists/real-from-dwd-ana/icon_atmosphere.namelist @@ -57,8 +57,8 @@ ! LATBC files, these files will be used as input for the next example. &output_nml file_interval = 'PT3600S' - output_start = '%OUTPUT_START%' - output_end = '%OUTPUT_END%' + output_start = '#OUTPUT_START#' + output_end = '#OUTPUT_END#' output_filename = "latbc" output_interval = 'PT3600S' include_last = .true. @@ -68,8 +68,6 @@ ! First Guess file &output_nml file_interval = 'PT3600S' - output_start = '%OUTPUT_START%' - output_end = '%OUTPUT_END%' output_filename = "init" output_interval = 'PT3600S' include_last = .true. diff --git a/namelists/real-from-ideal/icon_atmosphere_ideal.namelist b/namelists/real-from-ideal/icon_atmosphere_ideal.namelist index 8099750d93a04998364ac85953c0a7cd9328117f..2ad04b49a9655cb021f2c422de311a7fff4a5e30 100644 --- a/namelists/real-from-ideal/icon_atmosphere_ideal.namelist +++ b/namelists/real-from-ideal/icon_atmosphere_ideal.namelist @@ -40,8 +40,8 @@ ! the following two output files are used to initialize the next run &output_nml file_interval = 'PT3600S' - output_start = '%OUTPUT_START%' - output_end = '%OUTPUT_END%' + output_start = '#OUTPUT_START#' + output_end = '#OUTPUT_END#' output_filename = "init-test" output_interval = 'PT3600S' include_last = .true. @@ -49,12 +49,3 @@ taxis_tunit = 1 ml_varlist = 'group:dwd_fg_atm_vars', 'group:dwd_fg_sfc_vars' / -&output_nml - steps_per_file = 1 - output_start = '%OUTPUT_START%' - output_end = '%OUTPUT_START%' - output_filename = "init-test-ext" - include_last = .true. - output_interval = 'PT3600S' - ml_varlist = 'depth_lk', 'emis_rad', 'fr_lake', 'fr_land', 'topography_c', 'soiltyp', 'sso_stdh', 'sso_theta', 'sso_gamma', 'sso_sigma' -/ diff --git a/namelists/real-from-ideal/icon_atmosphere_real.namelist b/namelists/real-from-ideal/icon_atmosphere_real.namelist index 56e8e93363b0714b77797be93ab913a960580d02..ab43b89a82269e4ef01a12db10c7d1b3cd0cb046 100644 --- a/namelists/real-from-ideal/icon_atmosphere_real.namelist +++ b/namelists/real-from-ideal/icon_atmosphere_real.namelist @@ -53,8 +53,8 @@ ! First Guess file &output_nml file_interval = 'PT3600S' - output_start = '%OUTPUT_START%' - output_end = '%OUTPUT_START%' + output_start = '#OUTPUT_START#' + output_end = '#OUTPUT_START#' output_filename = "init" output_interval = 'PT3600S' include_last = .true. diff --git a/templates/real-from-dwd-ana/prepare_namelist.py b/templates/real-from-dwd-ana/prepare_namelist.py index 1ee82f8f326942189ca5dbb5329f999f130a67be..4816f66516f439672a740921a6670f5beb0539f6 100644 --- a/templates/real-from-dwd-ana/prepare_namelist.py +++ b/templates/real-from-dwd-ana/prepare_namelist.py @@ -105,9 +105,9 @@ def patch_output_entries(namelist: f90nml.Namelist) -> f90nml.Namelist: output_entries = [entry for entry in namelist["output_nml"]] for entry in output_entries: for key in entry: - if entry[key] == "%OUTPUT_START%": + if entry[key] == "#OUTPUT_START#": entry[key] = Chunk_START_DATE.strftime(date_format) - elif entry[key] == "%OUTPUT_END%": + elif entry[key] == "#OUTPUT_END#": entry[key] = Chunk_END_DATE.strftime(date_format) return namelist diff --git a/templates/real-from-ideal/prepare_ideal_namelist.py b/templates/real-from-ideal/prepare_ideal_namelist.py index 1474fc45b47714a60d43156138c16999a341268f..af95b8ad9bddaf85f709ce170f7ecc55fdded1cc 100644 --- a/templates/real-from-ideal/prepare_ideal_namelist.py +++ b/templates/real-from-ideal/prepare_ideal_namelist.py @@ -96,9 +96,9 @@ def patch_output_entries(namelist: f90nml.Namelist) -> f90nml.Namelist: output_entries = [entry for entry in namelist["output_nml"]] for entry in output_entries: for key in entry: - if entry[key] == "%OUTPUT_START%": + if entry[key] == "#OUTPUT_START#": entry[key] = Chunk_START_DATE.strftime(date_format) - elif entry[key] == "%OUTPUT_END%": + elif entry[key] == "#OUTPUT_END#": entry[key] = Chunk_END_DATE.strftime(date_format) return namelist diff --git a/templates/real-from-ideal/prepare_namelist.py b/templates/real-from-ideal/prepare_namelist.py index dd2493010395147c765437ac04dad8a72633e556..d377e56ab27d863be6d0bbe3efd9185b62bade2d 100644 --- a/templates/real-from-ideal/prepare_namelist.py +++ b/templates/real-from-ideal/prepare_namelist.py @@ -104,9 +104,9 @@ def patch_output_entries(namelist: f90nml.Namelist) -> f90nml.Namelist: output_entries = [entry for entry in namelist["output_nml"]] for entry in output_entries: for key in entry: - if entry[key] == "%OUTPUT_START%": + if entry[key] == "#OUTPUT_START#": entry[key] = Chunk_START_DATE.strftime(date_format) - elif entry[key] == "%OUTPUT_END%": + elif entry[key] == "#OUTPUT_END#": entry[key] = Chunk_END_DATE.strftime(date_format) return namelist