Skip to content

Switch to shr_drydep_mod module #1843

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
billsacks merged 3 commits into from
Sep 7, 2022
Merged

Switch to shr_drydep_mod module #1843

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e1aef3d
use shr_drydep_mod module
fvitt Sep 1, 2022
de99340
more drydep changes
fvitt Sep 2, 2022
45c0c1f
include dep_data_file namelist setting; correct fates/drydep check
fvitt Sep 6, 2022
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
4 changes: 2 additions & 2 deletions Externals.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ tag = cime6.0.45
required = True

[cmeps]
tag = cmeps0.13.68
tag = cmeps0.13.70
protocol = git
repo_url = https://github.com/ESCOMP/CMEPS.git
local_path = components/cmeps
Expand All @@ -63,7 +63,7 @@ externals = Externals_CDEPS.cfg
required = True

[cpl7]
tag = cpl7.0.13
tag = cpl7.0.14
protocol = git
repo_url = https://github.com/ESCOMP/CESM_CPL7andDataComps
local_path = components/cpl7
Expand Down
10 changes: 4 additions & 6 deletions bld/CLMBuildNamelist.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2726,8 +2726,8 @@ sub setup_logic_do_transient_urban {
# for them to be unset if that will be their final state):
# - flanduse_timeseries
#
# NOTE(kwo, 2021-08-11) I based this function on setup_logic_do_transient_lakes.
# As in NOTE(wjs, 2020-08-23) I'm not sure if all of the checks here are truly important
# NOTE(kwo, 2021-08-11) I based this function on setup_logic_do_transient_lakes.
# As in NOTE(wjs, 2020-08-23) I'm not sure if all of the checks here are truly important
# for transient urban (in particular, my guess is that collapse_urban could probably be done with transient
# urban - as well as transient pfts and transient crops for that matter), but some of
# the checks probably are needed, and it seems best to keep transient urban consistent
Expand Down Expand Up @@ -3669,11 +3669,9 @@ sub setup_logic_dry_deposition {
" Use the '--no-drydep' option when '-bgc fates' is activated");
}
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'drydep_list');
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'drydep_method');
} else {
if ( defined($nl->get_value('drydep_list')) ||
defined($nl->get_value('drydep_method')) ) {
$log->fatal_error("drydep_list or drydep_method defined, but drydep option NOT set");
if ( defined($nl->get_value('drydep_list')) ) {
$log->fatal_error("drydep_list defined, but drydep option NOT set");
}
}
}
Expand Down
1 change: 0 additions & 1 deletion bld/namelist_files/namelist_defaults_drydep.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ attributes from the config_cache.xml file (with keys converted to upper-case).

<drydep_list>'O3','NO2','HNO3','NO','HO2NO2','CH3OOH','CH2O','CO','H2O2','CH3COOOH','PAN','MPAN','C2H5OOH','ONIT','POOH','C3H7OOH','ROOH','CH3COCHO','CH3COCH3','Pb','ONITR','MACROOH','XOOH','ISOPOOH','CH3OH','C2H5OH','CH3CHO','GLYALD','HYAC','HYDRALD','ALKOOH','MEKOOH','TOLOOH','TERPOOH','CH3COOH','CB1','CB2','OC1','OC2','SOA','SO2','SO4','NH3','NH4NO3'
</drydep_list>
<drydep_method>xactive_lnd</drydep_method>

<!-- Defaults for megan_emis_nl -->

Expand Down
16 changes: 1 addition & 15 deletions bld/namelist_files/namelist_definition_drv_flds.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,21 +63,7 @@
<!-- drydep Namelists -->
<!-- ======================================================================================== -->

<entry id="drydep_method"
type="char*16"
category="dry-deposition"
group="drydep_inparm"
valid_values="xactive_lnd,xactive_atm,table">
Where dry deposition is calculated (from land, atmosphere, or from a table)
This specifies the method used to calculate dry
deposition velocities of gas-phase chemical species. The available methods
are:
'table' - prescribed method in CAM
'xactive_atm' - interactive method in CAM
'xactive_lnd' - interactive method in CLM
</entry>

<entry id="drydep_list"
<entry id="drydep_list"
type="char*32(300)"
category="dry-deposition"
group="drydep_inparm"
Expand Down
Loading