clm5_1 physics starting point #1150
Conversation
Use patch to bring the changes from the lifang/fire2019changes. Make sure the namelist unit test works, and cases build.
Small changes to mksurfdata_map, singlept tool and run_sys_tests
(1) Move mksurfdata_map rounding of special landunits to before wetland
fill: I think this may be important to avoid errors and/or wrong
behavior in some edge cases where we have < 0.5% cover of glacier
and/or lake, and other cases. See
ESCOMP#1118 for detailed
thoughts. May change answers in rare cases, but no answer changes
observed for present-day surface datasets at standard resolutions
(f09, f19, f10, f45).
(2) run_sys_tests: record command-line arguments in SRCROOT_GIT_STATUS
file
(3) (From Will Wieder) Updates to current surfdata & landuse files in
tools/contrib/singlept
…restart files over, so change it back to clm2 and it works
… files copied over
… version after the compname
… trigger based on COMP_LND, but it still should actually use clm
…won't handle the ctsm5 compname case
ekluzek
added
enhancement
Conflicts:
src/biogeophys/SoilMoistStressMod.F90
Also change:
bld/namelist_files/namelist_defaults_ctsm.xml
src/biogeochem/CNFireLi2021Mod.F90
|
One change that came up in our review was to put the add history call into a InitHistory and allocate into InitAllocate private methods. This follows the convention and safely allows you to search for those in modules. |
…s, tested that compiles
There was a problem hiding this comment.
@billsacks this is the InitHistory/InitAllocate change. I expect that to be the last thing I do to the main code.
…00 and HIST, and one HIST one also with Crop on
…m right now until cime allows drv_fld_in to be in ctsmconf directory
…ese are less important tests with Cru forcing
|
Testing is now passing as expected for aux_clm, so I'll be able to bring this in later today. |
ekluzek
added
PR status: ready
|
Some tests are different than the baseline, but only because of different field lists (BTRAN no longer always output). ERI_D_Ld9.C96_t061.I2000Clm50SpRsGs.cheyenne_intel.clm-default |
|
By the way I mostly changed existing clm5_0 tests and made them clm5_1, so that the aux_clm test list isn't being expanded that much. I still added at least one just to make sure a new clm5_1 compset was being tested. |
Description of changes
Fang's latest Fire version - includes allowing clm5.1 phys version
Also bring in #591 mksurfdata changes including raw urban change.
And also update mksurfdata to point to new datasets that have shifting cultivation in them
Specific notes
Contributors other than yourself, if any: Fang Li
CTSM Issues Fixed (include github issue #):
Fix #1145
Fix #1144
Fix #889
Are answers expected to change (and if so in what way)? Yes, but only for the new clm5_1 physics option
Any User Interface Changes (namelist or namelist defaults changes)? Yes
New params file for ctsm5_1
New fire_method option for latest LiFire development
Testing performed, if any: Ran regular testing on cheyenne
NOTE: This version was derived by using patch on the lifang0209/fire2019changes branch which was off the release branch