Update ctsm5.2 branch to ctsm5.1.dev175 #2447
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
It looks like the need for MCT was removed in b4d64ac, when Mariana changed the stream code to use CDEPS, but the initialization of MCT wasn't removed at that time... but it looks like MCT is now unneeded, so going ahead and removing it now.
…the temporary directory, this is handling for ESCOMP#2405
Merge b4b-dev Update of externals to what's expected in cesm2_3_beta17. Some documentation updates including a rebuild of the documentation and updating how images are handled with git lfs. Improvements to the documentation for residue removal and tillage for prognostic crops.
Merge master 20240313
fix for cray compiler format issue
Remove LILAC references to mct
Conflicts:
.git-blame-ignore-revs
python/ctsm/site_and_regional/neon_site.py
Also moved changes on HEAD in neon_site to here..
python/ctsm/site_and_regional/tower_site.py
… fix the conflict that ended up being committed, and make sure abort is added
Refactoring of neon_site into `tower_site` and `neon_site`
Fix misplaced stopf in CNDriverMod.F90
… test will work
Based on the ctsm5.2 branch testlist update PE layouts for 360x720, mpasa*, and mpasa15*.
mpasa tests gave error about duplicate PE layouts for them. So explicitly set them.
Update some PE layouts on Derecho
…bdev-20240321 slevis note: Latest master commit is same as ctsm5.1.dev174
Merge b4bdev 20240321
Merge b4bdev 20240321 Conflicts: .git-blame-ignore-revs
…tests for ctsm5.2, that were removed in the update
ekluzek
added
the
enhancement
|
izumi testing looks as expected, with these two tests failing as found earlier... SMS_D_Ld10.f10_f10_mg37.I2000Clm50BgcCrop.izumi_intel.clm-tracer_consistency |
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
Update the ctsm5.2 branch to the latest dev tag ctsm5.1.dev175 in anticipation of the ctsm5.2 branch being the next tag on master as ctsm5.2.0
Specific notes
Contributors other than yourself, if any:
CTSM Issues Fixed (include github issue #):
Are answers expected to change (and if so in what way)? No
Any User Interface Changes (namelist or namelist defaults changes)?
Testing performed, if any: I am running standard testing, have run python testing and build-namelist testing
aux_clm testing on Derecho and izumi came back as expected with these two failing as before on ctsm5.2 branch
SMS_D_Ld10.f10_f10_mg37.I2000Clm50BgcCrop.izumi_intel.clm-tracer_consistency
SMS_Ld10_D_Mmpi-serial.CLM_USRDAT.I1PtClm51Fates.izumi_nag.clm-FatesFireLightningPopDens--clm-NEON-FATES-NIWO