Fix problems encountered with running PLUMBER2 sites#4092
Draft
olyson wants to merge 18 commits into
Draft
Conversation
Contributor
Author
|
I see that there are some python errors in the automated testing, I'll address those next week once I figure out what they are about. Although my code was rated 9.99/10, ha ha. |
Contributor
Author
|
Ok, I've fixed all of the python-lint-and-black errors. |
Contributor
|
@samsrabin can you review this. Keith's done functional tests to check this works, but would like a review on the python. We can also discuss testing (which may be outside the scope of this PR)? |
Member
|
Can do, sure. What sort of timeline were y'all hoping for? |
Contributor
Author
Maybe by the end of next week? |
Contributor
Author
|
Per discussion at CTSM software meeting, I'm going to expand this PR to include other fixes to problems I've encountered with running PLUMBER2 sites. |
This file contains hidden or 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
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
This PR fixes failures in running PLUMBER2 sites. There are four categories of failures.
Specific notes
The fixes for these issues are:
Here, tower_sites.py is modified so that for wetland sites, the parameter file for the base case is queried (regardless if it is wetland or not), and then the parameter file is replaced with a modified parameter file with baseflow_scalar=0 for any requested wetland sites in the run_tower submission.
The baseflow_scalar namelist change request was deleted from the wetland sites shell commands by running tools/site_and_regional/plumber2_usermods. These modified shell commands are part of this commit.
Per conversation with @wwieder , this PR turns off HumanIndexMod for all the PLUMBER2 sites for now, to avoid the negative relative humidity error check. This is accomplished in cime_config/usermods_dirs/clm/PLUMBER2/defaults/user_nl_clm.
For the sites failing with the calendar error during spinup, these are the xml variables that need to be changed on a site by site basis for spinup:
RUN_STARTDATE
CALENDAR
DATM_YR_START
DATM_YR_END
DATM_YR_ALIGN
START_TOD (may be set correctly already though)
My run tower script (/glade/work/oleson/release-clm5.0.34/tools/PTCLM/run_clmtowers_plumber2.csh) handled this complexity, but this was not implemented in the run_tower infrastructure for PLUMBER2.
I've combined the new spinup variables into create_PLUMBER2_sites_csv.ncl -> PLUMBER2_sites.csv and modified the code to read these new variables in and generate the required shell commands.
A one line change to plumber2_usermods.py was also required to get these sites to run. This line had been commented out pending a CDEPS mod, which appears to have been implemented.
One other change was required to get these sites to run, a change in cime_config/usermods_dirs/clm/PLUMBER2/defaults/shell_commands to set dtlimit to 50 instead of 30 for spinup.
Contributors other than yourself, if any: @wwieder (python help)
CTSM issues resolved or otherwise addressed, if any:
Resolves #4023
Resolves #4081
If answers are expected to change, describe (delete this line otherwise): The sites listed above will now run to completion
Any user interface changes (namelist or namelist defaults changes)? None to the defaults namelist. For wetlands, we only create a temporary modified parameter file for the requested run(s) and point to it in the run directory. Other changes here are accomplished by the PLUMBER2 shell commands.
Testing planned or performed, if any:
./run_tower --plumber-sites {AR-SLu,CZ-wet,DE-SfN,FI-Kaa,FI-Lom,RU-Che,SE-Deg,US-Los,US-Myb,US-Tw4,PL-wet, ES-ES2,ES-LgS,ES-VDA,US-Cop,AT-Neu,AU-How,BE-Vie,CH-Dav,DE-Geb,DE-Hai,DE-Tha,DK-Sor,FR-Pue,IT-MBo,IT-SRo,NL-Loo,US-NR1,US-PFa} --run-type ad --xmlchange STOP_OPTION=nyears,STOP_N=100,RESUBMIT=2,JOB_WALLCLOCK_TIME=06:00:00,PROJECT=P93300041 --overwrite
NOTE that the addition of AR-SLu here is to make sure I didn’t create/use a modified parameter file for non-wetland sites.
Requirements before merge: