From 4c526aff0082fedd27dbb24ff305890396b24c1d Mon Sep 17 00:00:00 2001 From: Jan Streffing Date: Thu, 21 Sep 2023 17:04:31 +0200 Subject: [PATCH] moved configs to major version, moved default awicm3 v3.2 namelist for fesom to 2.5 namelist folder --- configs/setups/awicm3/awicm3.yaml | 57 ++++++++++--------- .../{2.0 => 2.5}/awicm3/v3.2/namelist.config | 0 .../{2.0 => 2.5}/awicm3/v3.2/namelist.cvmix | 0 .../{2.0 => 2.5}/awicm3/v3.2/namelist.dyn | 0 .../{2.0 => 2.5}/awicm3/v3.2/namelist.forcing | 0 .../{2.0 => 2.5}/awicm3/v3.2/namelist.ice | 0 .../{2.0 => 2.5}/awicm3/v3.2/namelist.icepack | 0 .../{2.0 => 2.5}/awicm3/v3.2/namelist.io | 0 .../{2.0 => 2.5}/awicm3/v3.2/namelist.oce | 0 .../{2.0 => 2.5}/awicm3/v3.2/namelist.tra | 0 10 files changed, 29 insertions(+), 28 deletions(-) rename namelists/fesom2/{2.0 => 2.5}/awicm3/v3.2/namelist.config (100%) rename namelists/fesom2/{2.0 => 2.5}/awicm3/v3.2/namelist.cvmix (100%) rename namelists/fesom2/{2.0 => 2.5}/awicm3/v3.2/namelist.dyn (100%) rename namelists/fesom2/{2.0 => 2.5}/awicm3/v3.2/namelist.forcing (100%) rename namelists/fesom2/{2.0 => 2.5}/awicm3/v3.2/namelist.ice (100%) rename namelists/fesom2/{2.0 => 2.5}/awicm3/v3.2/namelist.icepack (100%) rename namelists/fesom2/{2.0 => 2.5}/awicm3/v3.2/namelist.io (100%) rename namelists/fesom2/{2.0 => 2.5}/awicm3/v3.2/namelist.oce (100%) rename namelists/fesom2/{2.0 => 2.5}/awicm3/v3.2/namelist.tra (100%) diff --git a/configs/setups/awicm3/awicm3.yaml b/configs/setups/awicm3/awicm3.yaml index 27f1f54bd..a7fb72c53 100644 --- a/configs/setups/awicm3/awicm3.yaml +++ b/configs/setups/awicm3/awicm3.yaml @@ -398,25 +398,23 @@ fesom: oce_tra: surf_relax_s: "${surf_relax_s}" "v3.2": - namelist_dir: "${esm_namelist_dir}/fesom2/2.0/awicm3/v3.2/" - add_namelist_changes: - namelist.oce: - oce_tra: - surf_relax_s: "${surf_relax_s}" - "master": - namelist_dir: "${model_dir}/config/" + namelist_dir: "${esm_namelist_dir}/fesom2/2.5/awicm3/v3.2/" add_namelists: - namelist.tra + - namelist.dyn - namelist.cvmix add_config_sources: tra: "${namelist_dir}/namelist.tra" dyn: "${namelist_dir}/namelist.dyn" + cvmix: "${namelist_dir}/namelist.cvmix" add_config_in_work: tra: "namelist.tra" dyn: "namelist.dyn" + cvmix: "namelist.cvmix" add_config_files: tra: tra dyn: dyn + cvmix: cvmix add_namelist_changes: namelist.config: ale_def: @@ -424,26 +422,27 @@ fesom: namelist.oce: oce_dyn: SPP: true + k_gm_max: 3000 + k_gm_rampmax: 40.0 + k_gm_rampmin: 30 + scaling_ferreira: true + scaling_fesom14: true + oce_tra: + surf_relax_s: "${surf_relax_s}" + namelist.tra: tracer_phys: surf_relax_s: "${surf_relax_s}" use_momix: false + kv0_const: false namelist.ice: ice_therm: + albsn: 0.81 + albsnm: 0.77 albi: 0.6 albim: 0.43 - "frontiers-xios": - model_tag: "frontiers" - namelist_dir: "${esm_namelist_dir}/fesom2/2.0/awicm3/frontiers/" - add_namelist_changes: - namelist.oce: - oce_tra: - surf_relax_s: "${surf_relax_s}" - - # Note that this choose block (version) can overwrite settings from the block above (major_version) - choose_general.version: - "v3.2": - namelist_dir: "${esm_namelist_dir}/fesom2/2.5/" + "master": + namelist_dir: "${model_dir}/config/" add_namelists: - namelist.tra - namelist.cvmix @@ -463,23 +462,25 @@ fesom: namelist.oce: oce_dyn: SPP: true - k_gm_max: 3000 - k_gm_rampmax: 40.0 - k_gm_rampmin: 30 - scaling_ferreira: true - scaling_fesom14: true - namelist.tra: tracer_phys: surf_relax_s: "${surf_relax_s}" use_momix: false - kv0_const: false namelist.ice: ice_therm: - albsn: 0.81 - albsnm: 0.77 albi: 0.6 albim: 0.43 + "frontiers-xios": + model_tag: "frontiers" + namelist_dir: "${esm_namelist_dir}/fesom2/2.0/awicm3/frontiers/" + add_namelist_changes: + namelist.oce: + oce_tra: + surf_relax_s: "${surf_relax_s}" + + # Note that this choose block (version) can overwrite settings from the block above (major_version) + choose_general.version: + "v3.2": # Remove ICMCL_INIT forcing, which is only required for standalone simulations (form v3.2 onwards contains seasonal leaf area index, veg albedo etc.) remove_forcing_files: diff --git a/namelists/fesom2/2.0/awicm3/v3.2/namelist.config b/namelists/fesom2/2.5/awicm3/v3.2/namelist.config similarity index 100% rename from namelists/fesom2/2.0/awicm3/v3.2/namelist.config rename to namelists/fesom2/2.5/awicm3/v3.2/namelist.config diff --git a/namelists/fesom2/2.0/awicm3/v3.2/namelist.cvmix b/namelists/fesom2/2.5/awicm3/v3.2/namelist.cvmix similarity index 100% rename from namelists/fesom2/2.0/awicm3/v3.2/namelist.cvmix rename to namelists/fesom2/2.5/awicm3/v3.2/namelist.cvmix diff --git a/namelists/fesom2/2.0/awicm3/v3.2/namelist.dyn b/namelists/fesom2/2.5/awicm3/v3.2/namelist.dyn similarity index 100% rename from namelists/fesom2/2.0/awicm3/v3.2/namelist.dyn rename to namelists/fesom2/2.5/awicm3/v3.2/namelist.dyn diff --git a/namelists/fesom2/2.0/awicm3/v3.2/namelist.forcing b/namelists/fesom2/2.5/awicm3/v3.2/namelist.forcing similarity index 100% rename from namelists/fesom2/2.0/awicm3/v3.2/namelist.forcing rename to namelists/fesom2/2.5/awicm3/v3.2/namelist.forcing diff --git a/namelists/fesom2/2.0/awicm3/v3.2/namelist.ice b/namelists/fesom2/2.5/awicm3/v3.2/namelist.ice similarity index 100% rename from namelists/fesom2/2.0/awicm3/v3.2/namelist.ice rename to namelists/fesom2/2.5/awicm3/v3.2/namelist.ice diff --git a/namelists/fesom2/2.0/awicm3/v3.2/namelist.icepack b/namelists/fesom2/2.5/awicm3/v3.2/namelist.icepack similarity index 100% rename from namelists/fesom2/2.0/awicm3/v3.2/namelist.icepack rename to namelists/fesom2/2.5/awicm3/v3.2/namelist.icepack diff --git a/namelists/fesom2/2.0/awicm3/v3.2/namelist.io b/namelists/fesom2/2.5/awicm3/v3.2/namelist.io similarity index 100% rename from namelists/fesom2/2.0/awicm3/v3.2/namelist.io rename to namelists/fesom2/2.5/awicm3/v3.2/namelist.io diff --git a/namelists/fesom2/2.0/awicm3/v3.2/namelist.oce b/namelists/fesom2/2.5/awicm3/v3.2/namelist.oce similarity index 100% rename from namelists/fesom2/2.0/awicm3/v3.2/namelist.oce rename to namelists/fesom2/2.5/awicm3/v3.2/namelist.oce diff --git a/namelists/fesom2/2.0/awicm3/v3.2/namelist.tra b/namelists/fesom2/2.5/awicm3/v3.2/namelist.tra similarity index 100% rename from namelists/fesom2/2.0/awicm3/v3.2/namelist.tra rename to namelists/fesom2/2.5/awicm3/v3.2/namelist.tra