Bring changes on release-clm5.0 branch to master #883
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
… and resolving rejected differences by hand, make sure the build-namelist unit tester runs
…rcp, fix bgc_spinup tests for sp and suplnitro
…m array that is a 1D array, so you have to account for the number of levels in the index for it. Still need to get a 3D GSMAP to get this to work
…ture streams are turned on
…e file, and 3D grids don't allow mapping, so set mapping to none
…n without bounds errors, but dies with soil balance problem
dz --> dz_lake bug-fix in LakeTemperatureMod.F90 line 960 Bug-fix to prevent the model from aborting when running with fewer soil layers than lake layers; not to imply that this was not a bug when the model wasn't aborting. It was.
…n, add a couple more namelist tests for it, also check if streams are off, but streams namelist items are used
…nto prescribed_soil_moisture
…oticed on hobart_nag
…documentation on the new soilm streams
…lm grid to the grid running on
|
I got two finidat files in place ERS_Ly3.f10_f10_musgs.I1850Clm50BgcCropCmip6.cheyenne_intel.clm-basic |
Update cime to latest in cesm2.2 beta tag (cesm2_2_beta04) Fix two small issues that had gone on the release-clm5.0 branch. Update manage_externals (to manic-v1.1.8) NOTE: Part of the reason for updating cime, was because of some problems Mike Mills was having on cheyenne with inputdata files being deleted out from under him before setting up his cases. We think system issues were interacting with issues with cime putting in place zero length missing files for the version of cime he was using. Those issues went away with a cime update, so we hope updating to a newer cime version here will help prevent those issues for CTSM users. cime updates: some cleanup from the last maint-5.6 update Add ne5np4.pg4 grid. case.setup: Add --keep option Add omip as option to DATM_CO2_TSERIES
ekluzek
added
PR status: ready
|
Regular testing has passed as expected. |
…s now can, fix a difference that didn't get in from the release branch that wasn't allowing the code to compile in mkglcmecMod
…s and was missing off of master
…nial as well as PtVg and high resolution PFT raw datasets
…changed on master
…proposed in ESCOMP#673 for master didn't work
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 changes on release-clm5.0 branch to master. Most of release-clm5.0.13 to release-clm5.0.30.
Specific notes
Contributors other than yourself, if any: none
CTSM Issues Fixed (include github issue #):
Fixes #873 -- Release clm5.0.12 changes
Fixes #871 -- don't check for valid resolution for CESM cases by default
Fixes #836 -- add izumi as a place that can run tools tests
Fixes #831 -- add namelist tint_algo settings for input streams
Fixes #817 -- Have clm4_5 use the same ndep file as clm5_0 for 1850
Fixes #809 -- mkmapdata using an old version of intel
Fixes #804 -- mksurfdata option
Fixes #791 -- fix threading for prescribed LAI and soil-moisture
Fixes #786 -- allow use_init_interp for a branch
Fixes #746 -- Some CLM45 configurations use CLM50 initial conditions files
Fixes #741 -- C13_HR, C13_NBP, FPI values result in numeric conversion not representable error (changes answers)
Fixes #734 -- Isotope historical files off of NetCDF-4
Fixes #716 -- 2 degree CMIP6WACCMDECK needs Carbon isotopes off
Fixes #707 -- Missing mapping files for hirespft
Fixes #673 -- Ice shelf wetland fix in mksurfdata_map can lead to glacier+lake > 100% on surface datasets (changes surface dataset creation)
Fixes #653 -- To save disk on fsurdat files use zwt0 on finindated file
Fixes #629 -- Remove unused fields from surface datasets
Fixes #624 -- QSNOEVAP history output incorrect
Fixes #621 -- Fully remove rcp in place of only ssp_rcp
Fixes #608 -- Odd (blocky) spatial patterns in generic crop leafc for BGC simulation when initialized from BGC-Crop
Fixes #589 -- Existence of content in the lai_streams namelist makes it confusing to users
Fixes #557 -- no-anthro compset and options
Fixes #553 -- More robust mksurfdata_map logic for determining where to put wetlands
Fixes #547 -- Add conus_30_x8 grid as valid option for CTSM and mksurfdata_map
Fixes #545 -- Antarctica ice shelves are being treated as wetlands rather than glaciers
Fixes #544 -- Transient cases are matching wrong IC file
Fixes #533 -- Add -no-anthro option to mksurfdata
Fixes #276 -- Tests for pre_alpha/pre_beta
Fixes #262 -- hirespft option to mksurfdata.pl
Fixes #175 -- Set stream_year_first_urbantv/last for CLM4.5
Fixes #150 -- mksurfdata code cleanup
Are answers expected to change (and if so in what way)? Yes
Some of the namelist defaults change.
Any User Interface Changes (namelist or namelist defaults changes)? Yes
Testing performed, if any: will run regular testing