Resolve compset issue #1981
Resolve compset issue #1981
Conversation
scripts/lib/CIME/case.py
Outdated
| @@ -433,25 +433,40 @@ def _set_compset(self, compset_name, files): | |||
| components = files.get_components("COMPSETS_SPEC_FILE") | |||
| logger.debug(" Possible components for COMPSETS_SPEC_FILE are {}".format(components)) | |||
|
|
|||
| cpl_root_dir = files.get_value("COMP_ROOT_DIR_CPL", {"component":"drv"},resolved=False) | |||
There was a problem hiding this comment.
Unfortunately, it looks like you have to add the above line and the two lines below every time you want to query a variable in config_files.xml and that variable depends on more than one driver. This is really cumbersome. Is there any way we can wrap this into the XML/files.py class so that a developer would not have to add these lines repeatedly.
|
@mvertens I have rerun testing on this branch. All pass |
scripts/lib/CIME/XML/files.py
Outdated
| # .config_file.xml at the top level may overwrite COMP_ROOT_DIR_ nodes in config_files | ||
| if os.path.isfile(config_files_override): | ||
| self.read(config_files_override) | ||
| for vid in ("COMP_ROOT_DIR_LND", "COMP_ROOT_DIR_ATM", "COMP_ROOT_DIR_ICE", |
There was a problem hiding this comment.
It would be better not to hardwire the _XXX names such as _LND.
scripts/lib/CIME/case_st_archive.py
Outdated
| @@ -180,6 +180,8 @@ def _archive_history_files(case, archive, archive_entry, | |||
| if not os.path.exists(archive_histdir): | |||
| os.makedirs(archive_histdir) | |||
| logger.debug("created directory {}".format(archive_histdir)) | |||
| if compname == 'drv': | |||
There was a problem hiding this comment.
Please add a comment as to why you are doing this.
| if len(samenodes) > 1: | ||
| expect(len(samenodes) == 2, "Too many matchs for id {} in file {}".format(vid, self.filename)) | ||
| logger.debug("Overwriting node {}".format(vid)) | ||
| self.root.remove(samenodes[0]) |
There was a problem hiding this comment.
Is it always the case that the new node will be after the original node - this is assumed in that your are removing samenodes[0] - the first node. Also - could you please document what this routine is doing in terms of the new functionality we are building in (you are taking the entry from the .config_files in $SRCROOT and overwriting the entry here with that one).
| @@ -180,6 +180,7 @@ def _archive_history_files(case, archive, archive_entry, | |||
| if not os.path.exists(archive_histdir): | |||
| os.makedirs(archive_histdir) | |||
| logger.debug("created directory {}".format(archive_histdir)) | |||
| # the compname is drv but the files are named cpl | |||
There was a problem hiding this comment.
Could you please give an example of what files are named cpl currently so that we can have this documented.
|
@jgfouca this is ready |
Resolve compset issue A subtle bug fix - the discovery of compsets needs to have information about available components so that it can look in the correct cime_config directories for config_compsets.xml files. Test suite: scripts_regression_tests.py + cesm F cases Test baseline: Test namelist changes: Test status: bit for bit Fixes User interface changes?: Update gh-pages html (Y/N)?: Code review:
A subtle bug fix - the discovery of compsets needs to have information about available components so that it can look in the correct cime_config directories for config_compsets.xml files.
Test suite: scripts_regression_tests.py + cesm F cases
Test baseline:
Test namelist changes:
Test status: bit for bit
Fixes
User interface changes?:
Update gh-pages html (Y/N)?:
Code review: