Merge ctsm5.2 branch up to ctsm5.1.dev174 #2427
Conversation
0f884bfec Merge pull request ESCOMP#205 from jedwards4b/sunset_svn_git_access 82a5edf79 merge in billsacks:svn_testing_no_github 17532c160 Use a local svn repo for testing 9c904341a different method to determine if in tests 539952ebd remove debug print statement cc5434fa7 fix submodule testing 1d7f28840 remove broken tests 04e94a519 provide a meaningful error message 38bcc0a8c Merge pull request ESCOMP#201 from jedwards4b/partial_match b4466a5aa remove debug print statement c3cf3ec35 fix issue with partial branch match git-subtree-dir: manage_externals git-subtree-split: 0f884bfec8e43d0c02261de858d6ec3f6d855e51
…o needed to update numpy version for it to work
… are main and develop, with the new externals the testlist wasn't working, it failed trying to setup cases
Merge pull request ESCOMP#2382 from samsrabin/merge-b4bdev-20240222 Brings in 3 PRs from b4b-dev to master: - Do not crash "make all" even if pylint isn't clean (ESCOMP#2353; Sam Rabin) - Resolve pylint issues (ESCOMP#2354; Sam Rabin) - Move FSURDATMODIFYCTSM test to Derecho (ESCOMP#2364; Sam Rabin)
…ss, remove trailing whitespace
… check function and add tests for it and get make all to pass
Get pylint and black to pass
… in the single script
… full node of processors
Add a couple features from multi over to single, so that multi can use the same code.
…le not having to test both, which allows the SystemTest to be valid for just using the single script
… default jobscript name to change
|
OK, now testing is looking reasonable with only the following tests failing: SMS.f45_f45_mg37.I2000Clm51FatesSpRsGs.derecho_nvhpc.clm-FatesColdSatPhen python testing is passing, and the previous fails are now working. I also ensured that the mksurfdata_esmf generation is working -- by hand testing a few cases and running the pot-veg case from the Makefile (in addition to the python testing). |
|
I was able to get most of the above passing. Hillslope needed rimport run on a file. Some tests just needed to be resubmitted. This test: SMS_Ld10_D_Mmpi-serial.CLM_USRDAT.I1PtClm51Fates.izumi_nag.clm-FatesFireLightningPopDens--clm-NEON-FATES-NIWO This test also fails: SMS_D_Ld10.f10_f10_mg37.I2000Clm50BgcCrop.izumi_intel.clm-tracer_consistency which looks like a legit problem. |
|
I'm going to go over some of the python code changes with @samsrabin a bit later. I might flag the one failing test as a problem so I can move onto the next steps for ctsm5.2. And then fix it in one of the two remaining tags on the ctsm5.2 branch. |
|
Looks like the alpha-ctsm5.2.mksrf.22_ctsm5.1.dev168 test fails in alpha-ctsm5.2.mksrf.23_ctsm5.1.dev171 but passed in alpha-ctsm5.2.mksrf.22_ctsm5.1.dev168. So I'll file it as a problem. |
Description of changes
Merge ctsm5.2 branch up to the latest ctsm5.1 tag.
Testing performed, if any: regular testing will be done