Merge b4bdev into master (2024-08-15) #2706
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Update submodule tags to pass runoff from cism to rof - Update MOSART, CMEPS, and CISM so CISM runoff goes to ROF rather than CTSM - Update RTM with fix needed for Paleo LGM work Contributors: @mvertens, @jedwards4b, @billsacks, @Katetc, @ekluzek, @slevis-lmwg Fixes ESCOMP#2590 Update CMEPS/MOSART/CISM/RTM tags Fixes ESCOMP/RTM#50 Likely wrong RTM river flux to MOM6 within cesm2_3_beta17 Differences in namelist 'mosart_inparm': missing variable: 'do_rtmflood' missing variable: 'finidat_rtm' missing variable: 'frivinp_rtm' missing variable: 'rtmhist_fexcl1' missing variable: 'rtmhist_fexcl2' missing variable: 'rtmhist_fexcl3' missing variable: 'rtmhist_fincl1' missing variable: 'rtmhist_fincl2' missing variable: 'rtmhist_fincl3' missing variable: 'rtmhist_mfilt' missing variable: 'rtmhist_ndens' missing variable: 'rtmhist_nhtfrq' found extra variable: 'budget_frq' found extra variable: 'fexcl1' found extra variable: 'fexcl2' found extra variable: 'fexcl3' found extra variable: 'fincl1' found extra variable: 'fincl2' found extra variable: 'fincl3' found extra variable: 'finidat' found extra variable: 'frivinp' found extra variable: 'mfilt' found extra variable: 'mosart_euler_calc' found extra variable: 'mosart_tracers' found extra variable: 'ndens' found extra variable: 'nhtfrq' found extra variable: 'use_halo_option' Changes answers - what code configurations: mosart and rtm - what platforms/compilers: all - nature of change: mosart roundoff; rtm larger than roundoff due to bug fix; the latter also affects bgc variables We are ignoring strange diffs from baseline in two tests in variable FATES_TRANSITION_MATRIX_LULU as explained in issue ESCOMP#2656.
Merge master 2024 0725
Includes new fire_method li2024gswpfrc.
In the CNFireLi2024Mod.F90, (1) fixed the bug described in ESCOMP#2566 to avoid incorrect accumulation of baf_crop and ensure that crop fires do not occur during the crop growing season; (2) confined crop fires to periods after harvest and before planting when crop module is active; (3) removed the dependency of baf_crop on fuel availability; (4) improved the modeling of the influence of socio-economic factors on crop burned area; (5) recalibrated the cropfire_a1 constant based on GFED5 crop burned area; (6) modify the declaration of CNFireArea in these F90 files to include the variable crop_inst, declare the variable crop_inst, and import and utilize crop_type from the module CropType. In addition, the modules CNDriverMod.F90, CNFireLi2014Mod.F90, CNFireLi2016Mod.F90, CNFireLi2021Mod.F90, CNFireNoFireMod.F90, FATESFireBase.F90, and FireMethodType.F90 include the subroutine CNFireArea. (6) is implemented in these modules. (Original commit by Fang Li, lifang@mail.iap.ac.cn.)
(Original commit by Fang Li, lifang@mail.iap.ac.cn.)
Up-to-date with ctsm5.2.015.
Always check finidat_interp_dest.status
Remove broken assign-to-project Github workflow
[Fang summer '24 PR 1.1] Fix bugs and develop crop fire modeling
Rework crop_calendars suite and cropMonthOutput
samsrabin
added
enhancement
ekluzek
approved these changes
Aug 16, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes
Brings in 3 PRs from b4b-dev to master:
Specific notes
Contributors other than yourself, if any: None
CTSM Issues Fixed:
Are answers expected to change (and if so in what way)? No
Any User Interface Changes (namelist or namelist defaults changes)?
Does this create a need to change or add documentation? Did you do so? No
Testing performed, if any:
All
aux_clmtests pass, other than expected failures.One test,
ERP_D_P64x2_Ld3.f10_f10_mg37.I2000Clm50BgcCru.derecho_intel.clm-flexCN_FUN--clm-matrixcnOn_ignore_warnings, initially failed with the following error, but succeeded on retry: