Skip to content
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

MIMICS-related refactor before introducing MIMICS #1340

Merged
merged 20 commits into from
Jun 3, 2021
Merged

MIMICS-related refactor before introducing MIMICS #1340

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
dfe3f71
Derive instead of hardwiring i_litr2, i_litr3, i_cwd
slevis-lmwg Apr 13, 2021
30c8b44
Reduce repetition of decomp_k lines in *CascadeBGC and *CascadeCN
slevis-lmwg Apr 14, 2021
0f60580
Moved initial_Cstock vars from namelist to new params file
slevis-lmwg Apr 18, 2021
22f3a3a
Rm sub setup_logic_century_soilbgcdecompcascade from CLMBuildNamelist.pm
slevis-lmwg Apr 18, 2021
b62b89d
Replacing explicit litter-pool lines of code w do-loops
slevis-lmwg Apr 28, 2021
2224191
Replacing explicit litter-pool lines of code w do-loops (contd)
slevis-lmwg Apr 29, 2021
55cf695
Replacing explicit litter-pool lines of code w do-loops (3rd commit)
slevis-lmwg Apr 29, 2021
8417cd8
Replacing explicit litter-pool lines of code w do-loops (4th commit)
slevis-lmwg Apr 30, 2021
69f4c5c
Rename i_soil* indices to descriptive names
slevis-lmwg Apr 30, 2021
1fed563
Merge tag 'ctsm5.1.dev040' into premimics_refactor
slevis-lmwg May 26, 2021
3122146
Revisions (part 1) in response to review
slevis-lmwg May 28, 2021
a63530d
Revisions (part 2) in response to review
slevis-lmwg May 28, 2021
1e49b3a
Merge tag 'ctsm5.1.dev042' into premimics_refactor
slevis-lmwg May 28, 2021
c5d0ee4
Updating to latest params files and including draft ChangeLog
slevis-lmwg May 28, 2021
8b9b418
Small update to ChangeLog
slevis-lmwg Jun 1, 2021
b998307
Another update to the ChangeLog
slevis-lmwg Jun 1, 2021
75a8e39
Add expected fails for the CN tests
ekluzek Jun 3, 2021
70bf79c
Update change files
ekluzek Jun 3, 2021
1fde421
Small note about memory increase in change file
ekluzek Jun 3, 2021
a1186e3
Note about new issue
ekluzek Jun 3, 2021
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
22 changes: 0 additions & 22 deletions bld/CLMBuildNamelist.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1631,11 +1631,6 @@ sub process_namelist_inline_logic {
#############################################
setup_logic_friction_vel($opts, $nl_flags, $definition, $defaults, $nl);

################################################
# namelist group: century_soilbgcdecompcascade #
################################################
setup_logic_century_soilbgcdecompcascade($opts, $nl_flags, $definition, $defaults, $nl);
ekluzek marked this conversation as resolved.
Show resolved Hide resolved

#############################
# namelist group: cngeneral #
#############################
Expand Down Expand Up @@ -3588,23 +3583,6 @@ sub setup_logic_soilwater_movement {
}
#-------------------------------------------------------------------------------

sub setup_logic_century_soilbgcdecompcascade {
#
my ($opts, $nl_flags, $definition, $defaults, $nl) = @_;

if ( (&value_is_true($nl->get_value('use_cn')) || &value_is_true($nl->get_value('use_fates'))) &&
&value_is_true($nl->get_value('use_century_decomp')) ) {
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'initial_Cstocks',
'use_cn' => $nl->get_value('use_cn'), 'use_fates' => $nl->get_value('use_fates'),
'use_century_decomp' => $nl->get_value('use_century_decomp') );
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'initial_Cstocks_depth',
'use_cn' => $nl->get_value('use_cn'), 'use_fates' => $nl->get_value('use_fates'),
'use_century_decomp' => $nl->get_value('use_century_decomp') );
}
}

#-------------------------------------------------------------------------------

sub setup_logic_cnvegcarbonstate {
# MUST be AFTER: setup_logic_dynamic_plant_nitrogen_alloc as depends on mm_nuptake_opt which is set there
my ($opts, $nl_flags, $definition, $defaults, $nl) = @_;
Expand Down
20 changes: 3 additions & 17 deletions bld/namelist_files/namelist_defaults_ctsm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,9 +473,9 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
<!-- The default filenames are given relative to the root directory
for the CLM2 data in the CESM distribution -->
<!-- Plant function types (relative to {csmdata}) -->
<paramfile phys="clm5_1" >lnd/clm2/paramdata/ctsm51_params.c210208.nc</paramfile>
<paramfile phys="clm5_0" >lnd/clm2/paramdata/clm50_params.c210208.nc</paramfile>
<paramfile phys="clm4_5" >lnd/clm2/paramdata/clm45_params.c210208.nc</paramfile>
<paramfile phys="clm5_1" >lnd/clm2/paramdata/ctsm51_params.c210429.nc</paramfile>
<paramfile phys="clm5_0" >lnd/clm2/paramdata/clm50_params.c210418.nc</paramfile>
<paramfile phys="clm4_5" >lnd/clm2/paramdata/clm45_params.c210429.nc</paramfile>
ekluzek marked this conversation as resolved.
Show resolved Hide resolved

<!-- ================================================================== -->
<!-- FATES default parameter file -->
Expand Down Expand Up @@ -1416,20 +1416,6 @@ lnd/clm2/surfdata_map/release-clm5.0.30/surfdata_ne0np4.CONUS.ne30x8_hist_78pfts
<leaf_mr_vcm phys="clm5_0" >0.015d00</leaf_mr_vcm>
<leaf_mr_vcm phys="clm4_5" >0.015d00</leaf_mr_vcm>

<!-- Initial Carbon stocks for BGC -->
<initial_Cstocks phys="clm4_5" use_cn=".true." use_fates=".false." use_century_decomp=".true." >20.0d00, 20.0d00, 20.0d00</initial_Cstocks>
ekluzek marked this conversation as resolved.
Show resolved Hide resolved
<initial_Cstocks phys="clm5_0" use_cn=".true." use_fates=".false." use_century_decomp=".true." >200.0d00, 200.0d00, 200.0d00</initial_Cstocks>
<initial_Cstocks phys="clm5_1" use_cn=".true." use_fates=".false." use_century_decomp=".true." >200.0d00, 200.0d00, 200.0d00</initial_Cstocks>
<initial_Cstocks phys="clm4_5" use_cn=".false." use_fates=".true." use_century_decomp=".true." >20.0d00, 20.0d00, 20.0d00</initial_Cstocks>
<initial_Cstocks phys="clm5_0" use_cn=".false." use_fates=".true." use_century_decomp=".true." >200.0d00, 200.0d00, 200.0d00</initial_Cstocks>
<initial_Cstocks phys="clm5_1" use_cn=".false." use_fates=".true." use_century_decomp=".true." >200.0d00, 200.0d00, 200.0d00</initial_Cstocks>

<initial_Cstocks_depth phys="clm5_1" use_cn=".true." use_fates=".false." use_century_decomp=".true." >1.50d00</initial_Cstocks_depth>
<initial_Cstocks_depth phys="clm5_0" use_cn=".true." use_fates=".false." use_century_decomp=".true." >1.50d00</initial_Cstocks_depth>
<initial_Cstocks_depth phys="clm4_5" use_cn=".true." use_fates=".false." use_century_decomp=".true." >0.3</initial_Cstocks_depth>
ekluzek marked this conversation as resolved.
Show resolved Hide resolved
<initial_Cstocks_depth phys="clm5_1" use_cn=".false." use_fates=".true." use_century_decomp=".true." >1.50d00</initial_Cstocks_depth>
<initial_Cstocks_depth phys="clm5_0" use_cn=".false." use_fates=".true." use_century_decomp=".true." >1.50d00</initial_Cstocks_depth>
<initial_Cstocks_depth phys="clm4_5" use_cn=".false." use_fates=".true." use_century_decomp=".true." >0.3</initial_Cstocks_depth>

<initial_vegC phys="clm5_1" use_cn=".true." mm_nuptake_opt=".true." >100.d00</initial_vegC>
<initial_vegC phys="clm5_0" use_cn=".true." mm_nuptake_opt=".true." >100.d00</initial_vegC>
Expand Down
10 changes: 0 additions & 10 deletions bld/namelist_files/namelist_definition_ctsm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,16 +306,6 @@ Critical threshold of negative Nitrogen to die (abort when Nitrogen states are b
Critical threshold of negative Carbon to die (abort when Carbon states are below this value)
</entry>

<entry id="initial_Cstocks" type="real(3)" category="clm_physics"
group="century_soilbgcdecompcascade" >
Initial stocks of Carbon to use in soil organic matter pools for CENTURY decomposition
</entry>

<entry id="initial_Cstocks_depth" type="real(3)" category="clm_physics"
group="century_soilbgcdecompcascade" >
Soil depth to place initial stocks of Carbon in soil organic matter pools for CENTURY decomposition
</entry>

<entry id="freelivfix_slope_wET" type="real" category="clm_physics"
group="mineral_nitrogen_dynamics" >
Slope of free living Nitrogen fixation with annual ET
Expand Down
2 changes: 1 addition & 1 deletion src/biogeochem/CNC14DecayMod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ module CNC14DecayMod
! !USES:
use shr_kind_mod , only : r8 => shr_kind_r8
use clm_time_manager , only : get_step_size_real, get_days_per_year
use clm_varpar , only : ndecomp_cascade_transitions, nlevdecomp, ndecomp_pools
use clm_varpar , only : nlevdecomp, ndecomp_pools
ekluzek marked this conversation as resolved.
Show resolved Hide resolved
use clm_varcon , only : secspday
use clm_varctl , only : spinup_state
use decompMod , only : bounds_type
Expand Down
Loading