Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 5 additions & 3 deletions bld/build-namelist
Original file line number Diff line number Diff line change
Expand Up @@ -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' ) {

Expand Down Expand Up @@ -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/) {
Expand Down
6 changes: 5 additions & 1 deletion bld/namelist_files/namelist_defaults_cam.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2517,6 +2517,9 @@
<dust_emis_fact hgrid="0.47x0.63" offline_dyn="1" phys="cam6" ver="chem">0.9D0</dust_emis_fact>
<dust_emis_fact hgrid="0.47x0.63" offline_dyn="1" phys="cam7" ver="chem">2.30D0</dust_emis_fact>

<!-- Oslo_Aero default-->
Comment thread
gold2718 marked this conversation as resolved.
<dust_emis_fact dyn="se" ver="oslo_aero"> 3.3D0 </dust_emis_fact>
<emis_fact_in_coarse_mode>0.97D0</emis_fact_in_coarse_mode>
<!-- dust emissions method -->
<dust_emis_method> Zender_2003</dust_emis_method>
<!-- gold2718: Temporarily not using Leung_2023 as default for CAM7
Expand All @@ -2528,6 +2531,7 @@ See https://github.com/NorESMhub/noresm3_dev_simulations/discussions/78
<!-- seasalt emission tuning factor -->
<!-- Note that ver="strat" when modal_accum_coarse_exch=.true. -->
<seasalt_emis_scale >1.35D0</seasalt_emis_scale>
<seasalt_emis_scale ver="oslo_aero" >1.D0</seasalt_emis_scale>
<seasalt_emis_scale ver="mam7" >1.62D0</seasalt_emis_scale>
<seasalt_emis_scale ver="strat" >0.90D0</seasalt_emis_scale>
<seasalt_emis_scale ver="strat" clubb_sgs="1" >1.00D0</seasalt_emis_scale>
Expand Down Expand Up @@ -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'
</scm_relax_fincl>
<scm_relax_fincl phys="cam7"scam="1" >
<scm_relax_fincl phys="cam7" scam="1" >
'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'
</scm_relax_fincl>
Expand Down
8 changes: 8 additions & 0 deletions bld/namelist_files/namelist_definition.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6850,6 +6850,14 @@ Tuning parameter for dust emissions.
Default: set by build-namelist.
</entry>

<entry id="emis_fact_in_coarse_mode" type="real" category="cam_chem"
group="dust_nl" valid_values="" >
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.
</entry>

<entry id="steady_state_ion_elec_temp" type="logical" category="waccmx"
group="ion_electron_temp_nl" valid_values="" >
If TRUE a steady state solution is used to calculate electron and
Expand Down
2 changes: 1 addition & 1 deletion src/chemistry/oslo_aero
Loading