Merge ctsm5.2.015 into scale-maturity-reqs #2661
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 Externals.cfg to cesm2_3_beta17, remove mct, retire /test/tools
Update externals to cesm2_3_beta17, remove mct, retire /test/tools Changes unrelated to the tag's title:
Update externals to cesm2_3_beta17, remove mct, retire /test/tools Changes unrelated to the tag's title:
… into ctsm5.2.007/candidate slevis resolved conflicts: README
Merge up to ctsm5.2.006 and deconflict
Fix `PVT` system test and avoid getting `fluh_timeseries` when `use_fates_potentialveg = .true.`
Relax tolerance for truncating small snocan values in CanopyFluxes See the PR ESCOMP#2457 for details.
Relax tolerance for truncating small snocan values in CanopyFluxes See the PR ESCOMP#2457 for details.
FATES land use v2 API update (CTSM-side)
slevis resolved conflicts: bld/unit_testers/build-namelist_test.pl
use_matrixcn and use_soil_matrixcn are coming in as default .false.
Merging ctsm5.2.014
ERS_D.f19_g17.I1850Clm50BgcCrop.izumi_nag.clm-ciso_monthly_matrixcn_spinup failed during the build because a namelist variable needed renaming
Update submodule tags to pass runoff from CISM to ROF as per issue ESCOMP#2590
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.
|
@slevis-lmwg This is ready for review. You shouldn't really need to look over anything; it's just a pure merge of |
slevis-lmwg
approved these changes
Jul 26, 2024
There was a problem hiding this comment.
@samsrabin based on your comment that this is simply a merge with 015 without conflicts, I am approving without looking more closely.
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
Just merges in the latest CTSM master code.
Specific notes
Contributors other than yourself, if any: None
CTSM Issues Fixed: None
Are answers expected to change (and if so in what way)?
croptestmod will have answers change due to more frequent writing of the h2 file. Note that this only affects tests.Any User Interface Changes (namelist or namelist defaults changes)? No
Does this create a need to change or add documentation? Did you do so? No
Testing performed, if any:
/glade/derecho/scratch/samrabin/tests_0725-090556de. Was queued for way too long, and in the meantime, these tests have been superseded by the testing for Enable new crop calendars for clm60 compsets #2664.