diff --git a/.gitmodules b/.gitmodules index 2e7b47f54a..2fb876753f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -85,7 +85,7 @@ [submodule "oslo_aero"] path = src/chemistry/oslo_aero url = https://github.com/NorESMhub/OSLO_AERO - fxtag = oslo_aero_3_0a009 + fxtag = oslo_aero_3_0a010 fxrequired = AlwaysRequired fxDONOTUSEurl = https://github.com/NorESMhub/OSLO_AERO.git diff --git a/bld/build-namelist b/bld/build-namelist index cb85e5c3d1..5da922ee19 100755 --- a/bld/build-namelist +++ b/bld/build-namelist @@ -979,8 +979,8 @@ if ($chem =~ /_mam_oslo/) { } if ($aer_model eq 'oslo') { - - #do nothing here + add_default($nl, 'emis_fact_in_coarse_mode', 'ver'=>'oslo_aero'); + add_default($nl, 'seasalt_emis_scale', 'ver'=>'oslo_aero'); } elsif ($aer_model eq 'mam' ) { @@ -3969,7 +3969,9 @@ if ($cfg->get('microphys') eq 'rk') { # Dust emissions tuning factor # check whether turbulent mountain stress parameterization is on -if ($nl->get_value('do_tms') =~ /$TRUE/io) { +if ($aer_model eq 'oslo') { + add_default($nl, 'dust_emis_fact', 'ver'=>'oslo_aero'); +} elsif ($nl->get_value('do_tms') =~ /$TRUE/io) { add_default($nl, 'dust_emis_fact', 'tms'=>'1'); } else { if ($chem =~ /trop_strat/ or $chem =~ /geoschem/ or $chem =~ /waccm_ma/ or $chem =~ /waccm_tsmlt/ or $chem =~ /trop_mozart/) { diff --git a/bld/namelist_files/namelist_defaults_cam.xml b/bld/namelist_files/namelist_defaults_cam.xml index 61da259e08..5e28dda2e0 100644 --- a/bld/namelist_files/namelist_defaults_cam.xml +++ b/bld/namelist_files/namelist_defaults_cam.xml @@ -2517,6 +2517,9 @@ 0.9D0 2.30D0 + + 3.3D0 +0.97D0 Zender_2003 1.35D0 +1.D0 1.62D0 0.90D0 1.00D0 @@ -2868,7 +2872,7 @@ See https://github.com/NorESMhub/noresm3_dev_simulations/discussions/78 'T', 'bc_a1', 'bc_a4', 'dst_a1', 'dst_a2', 'dst_a3', 'ncl_a1', 'ncl_a2', 'ncl_a3', 'num_a1', 'num_a2', 'num_a3', 'num_a4', 'pom_a1', 'pom_a4', 'so4_a1', 'so4_a2', 'so4_a3', 'soa_a1', 'soa_a2' - + 'T', 'bc_a1', 'bc_a4', 'dst_a1', 'dst_a2', 'dst_a3', 'ncl_a1', 'ncl_a2', 'ncl_a3', 'num_a1', 'num_a2', 'num_a3', 'num_a4', 'pom_a1', 'pom_a4', 'so4_a1', 'so4_a2', 'so4_a3', 'soa_a1', 'soa_a2' diff --git a/bld/namelist_files/namelist_definition.xml b/bld/namelist_files/namelist_definition.xml index 6547655874..76447ca566 100644 --- a/bld/namelist_files/namelist_definition.xml +++ b/bld/namelist_files/namelist_definition.xml @@ -6850,6 +6850,14 @@ Tuning parameter for dust emissions. Default: set by build-namelist. + +Tuning parameter for the fraction of total dust emissions in the coarse dust mode (Oslo_Aero). +Valid values are in the range [0, 1], where the remaining fraction (1 - emis_fact_in_coarse_mode) +is allocated to the dust accumulation mode. +Default: set by build-namelist. + + If TRUE a steady state solution is used to calculate electron and diff --git a/src/chemistry/oslo_aero b/src/chemistry/oslo_aero index 87345b11fe..d8839c22dd 160000 --- a/src/chemistry/oslo_aero +++ b/src/chemistry/oslo_aero @@ -1 +1 @@ -Subproject commit 87345b11fe9cebb12ada8bd2073259260ae474c8 +Subproject commit d8839c22ddf63328a0cc74e7ce468d522865c2a0