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.

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 updates, WIP #2365

Draft
wants to merge 9 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 7 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
19 changes: 16 additions & 3 deletions cime_config/usermods_dirs/NEON/defaults/shell_commands
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes to user_mods don't need to be included in this PR.

Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ TEST=`./xmlquery TEST --value`

# For a transient case run the whole length and don't cycle
if [[ $compset =~ ^HIST ]]; then
./xmlchange DATM_YR_END=2022
./xmlchange DATM_YR_END=2023
./xmlchange RUN_STARTDATE=2018-01-01
# Number of months that can be run for the full transient case
if [[ $TEST != "TRUE" ]]; then
./xmlchange STOP_OPTION="nmonths"
./xmlchange STOP_N=51
./xmlchange STOP_N=68
fi
./xmlchange CLM_NML_USE_CASE="2018-PD_transient"
else
Expand All @@ -44,4 +44,17 @@ fi
# Explicitly set PIO Type to NETCDF since this is a single processor case (should already be set this way)
./xmlchange PIO_TYPENAME=netcdf

./xmlchange NEONVERSION="v2"

# specific for MIMICS spinup
./xmlchange DATM_YR_END=2021
./xmlchange RUN_STARTDATE=0018-01-01
./xmlchange RESUBMIT=5
./xmlchange STOP_N=500
./xmlchange REST_N=100
./xmlchange STOP_OPTION=nyears
./xmlchange CLM_FORCE_COLDSTART=on
./xmlchange CONTINUE_RUN=False
# Slow to run in develop queue, and this didn't wrok as intended.
#./xmlchange JOB_QUEUE=develop
#./xmlchange JOB_WALLCLOCK_TIME=1:00:00

12 changes: 7 additions & 5 deletions cime_config/usermods_dirs/NEON/defaults/user_nl_clm
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,11 @@

flanduse_timeseries = ' ' ! This isn't needed for a non transient case, but will be once we start using transient compsets
fsurdat = "$DIN_LOC_ROOT/lnd/clm2/surfdata_map/NEON/surfdata_1x1_NEON_${NEONSITE}_hist_78pfts_CMIP6_simyr2000_c230601.nc"
soil_decomp_method = 'MIMICSWieder2015'

hist_empty_htapes = .true.
hist_fincl1 = 'TOTLITC','TOTMICC','TOTSOMC','TOTLITN','TOTMICN','TOTSOMN',
'LIT_MET_C_vr','LIT_STR_C_vr','MIC_COP_C_vr','MIC_OLI_C_vr',
'SOM_AVL_C_vr', 'SOM_CHEM_C_vr', 'SOM_PHYS_C_vr',
'TOTVEGC','TOTECOSYSC','GPP','AR','HR','ELAI'

! h1 output stream
hist_fincl2 = 'AR','ELAI','FCEV','FCTR','FGEV','FIRA','FSA','FSH','GPP','H2OSOI',
'HR','SNOW_DEPTH','TBOT','TSOI','SOILC_vr','FV','NET_NMIN_vr'
hist_mfilt(2) = 48
hist_nhtfrq(2) = 1
6 changes: 3 additions & 3 deletions cime_config/usermods_dirs/NEON/defaults/user_nl_datm_streams
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,18 @@
!------------------------------------------------------------------------
presaero.SSP3-7.0:datafiles = $DIN_LOC_ROOT/atm/cam/chem/trop_mozart_aero/aero/aerodep_clm_SSP370_b.e21.BWSSP370cmip6.f09_g17.CMIP6-SSP3-7.0-WACCM.001_2018-2030_monthly_0.9x1.25_c210826.nc
presaero.SSP3-7.0:year_first=2018
presaero.SSP3-7.0:year_last=2022
presaero.SSP3-7.0:year_last=2023
presaero.SSP3-7.0:year_align=2018
presaero.SSP3-7.0:dtlimit=30

presndep.SSP3-7.0:datafiles = $DIN_LOC_ROOT/lnd/clm2/ndepdata/fndep_clm_f09_g17.CMIP6-SSP3-7.0-WACCM_2018-2030_monthly_c210826.nc
presndep.SSP3-7.0:year_first=2018
presndep.SSP3-7.0:year_last=2022
presndep.SSP3-7.0:year_last=2023
presndep.SSP3-7.0:year_align=2018
presndep.SSP3-7.0:dtlimit=30

preso3.SSP3-7.0:year_first=2018
preso3.SSP3-7.0:year_last=2022
preso3.SSP3-7.0:year_last=2023
preso3.SSP3-7.0:year_align=2018
preso3.SSP3-7.0:dtlimit=30

20 changes: 10 additions & 10 deletions src/soilbiogeochem/SoilBiogeochemDecompCascadeMIMICSMod.F90
Original file line number Diff line number Diff line change
Expand Up @@ -439,12 +439,12 @@ subroutine init_decompcascade_mimics(bounds, soilbiogeochem_state_inst, soilstat
kslope_l1_m2 = params_inst%mimics_kslope(4)
kslope_l2_m2 = params_inst%mimics_kslope(5)
kslope_s1_m2 = params_inst%mimics_kslope(6)
vint_l1_m1 = params_inst%mimics_vint(1)
vint_l2_m1 = params_inst%mimics_vint(2)
vint_s1_m1 = params_inst%mimics_vint(3)
vint_l1_m2 = params_inst%mimics_vint(4)
vint_l2_m2 = params_inst%mimics_vint(5)
vint_s1_m2 = params_inst%mimics_vint(6)
vint_l1_m1 = params_inst%mimics_vint(1)
vint_l2_m1 = params_inst%mimics_vint(2)
vint_s1_m1 = params_inst%mimics_vint(3)
vint_l1_m2 = params_inst%mimics_vint(4)
vint_l2_m2 = params_inst%mimics_vint(5)
vint_s1_m2 = params_inst%mimics_vint(6)
kint_l1_m1 = params_inst%mimics_kint(1)
kint_l2_m1 = params_inst%mimics_kint(2)
kint_s1_m1 = params_inst%mimics_kint(3)
Expand Down Expand Up @@ -1288,14 +1288,14 @@ subroutine decomp_rates_mimics(bounds, num_bgc_soilc, filter_bgc_soilc, &
decomp_k(c,j,i_chem_som) = (term_1 + term_2) * w_d_o_scalars

! Currently, mimics_densdep = 1 so as to have no effect
decomp_k(c,j,i_cop_mic) = tau_m1 * &
m1_conc**(mimics_densdep - 1.0_r8) * w_d_o_scalars
decomp_k(c,j,i_cop_mic) = tau_m1 * m1_conc**(mimics_densdep)

favl = min(1.0_r8, max(0.0_r8, 1.0_r8 - fphys_m1(c,j) - fchem_m1))
pathfrac_decomp_cascade(c,j,i_m1s1) = favl
pathfrac_decomp_cascade(c,j,i_m1s2) = fchem_m1

decomp_k(c,j,i_oli_mic) = tau_m2 * &
m2_conc**(mimics_densdep - 1.0_r8) * w_d_o_scalars
decomp_k(c,j,i_oli_mic) = tau_m2 * m2_conc**(mimics_densdep)

favl = min(1.0_r8, max(0.0_r8, 1.0_r8 - fphys_m2(c,j) - fchem_m2))
pathfrac_decomp_cascade(c,j,i_m2s1) = favl
pathfrac_decomp_cascade(c,j,i_m2s2) = fchem_m2
Expand Down
Loading