Handle same file error #2921
Open
Handle same file error #2921
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
…nd update ctsm60 file so that it is based on the previous one with the nfix fields just added to the end
Merge b4b-dev Bring in latest b4b-dev branch to main CTSM development. - Update git-fleximod - Fix equation number in tech note - Implement urbanl and urbanc coszen filters - Make ALBGRD and ALBGRI active by default - Some adjustments to control pylint for the RXCROPMATURITY python tests - Run_sys_tests: Print test list in --verbose/--debug.
Merge ctsm5.3.013 into b4b-dev
Update temperature cost function for symbiotic Nfix in FUN
iRpointer files for restart now have the simulation timestamp in the filename Add the simulation timestamp to the rpointer files. Also update submodules with this change in CMEPS and CDEPS as well as updated cime to handle it. See the notes below for an explaination about this. Add a "clm" level directory under usermods_dirs so that the component where user-mods reside is declared and to make them function the same as test-mods.
Merge b4bdev 20241220
…20241230 Merge b4b-dev 20241220 This tag is in the temporary branch tmp-241219, while master remains "locked" in preparation for a cesm tag. The process was unorthodox, in that I (slevis) received a code review and made revisions and retested after having started the first merge steps.
Merge master 20241230 to b4b-dev
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
In some cases of the ssp test the file to copy already exists (when run twice for example)
this leads to an error in shutil.copy. Use a try except clause to avoid this error.
Specific notes
This fix may require ESMCI/cime#4727
Contributors other than yourself, if any:
CTSM Issues Fixed: #2913 #2920
Are answers expected to change (and if so in what way)? NO
Any User Interface Changes (namelist or namelist defaults changes)? NONE
Does this create a need to change or add documentation? Did you do so?
Testing performed, if any: SSP_Ld4.f09_g17.I1850Clm50BgcCrop.derecho_intel.clm-ciso_rtmColdSSP
(List what testing you did to show your changes worked as expected)
(This can be manual testing or running of the different test suites)
(Documentation on system testing is here: https://github.com/ESCOMP/ctsm/wiki/System-Testing-Guide)
(aux_clm on derecho for intel/gnu and izumi for intel/gnu/nag/nvhpc is the standard for tags on master)
NOTE: Be sure to check your coding style against the standard
(https://github.com/ESCOMP/ctsm/wiki/CTSM-coding-guidelines) and review
the list of common problems to watch out for
(https://github.com/ESCOMP/CTSM/wiki/List-of-common-problems).