Add comment pes file #2315
Merged
Add comment pes file #2315
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
jedwards4b
commented
Feb 23, 2018
scripts/lib/CIME/XML/env_mach_pes.py
Outdated
| @@ -17,6 +18,12 @@ def __init__(self, case_root=None, infile="env_mach_pes.xml", components=None): | |||
| schema = os.path.join(get_cime_root(), "config", "xml_schemas", "env_mach_pes.xsd") | |||
| EnvBase.__init__(self, case_root, infile, schema=schema) | |||
|
|
|||
| def add_comment(self, comment): | |||
| if comment is not None: | |||
| tmp = GenericXML(root_name_override="comment", infile="fake", read_only=False) | |||
There was a problem hiding this comment.
This is a bit awkward, but I couldn't find a cleaner way.
There was a problem hiding this comment.
@jedwards4b , I see now that make_child cannot support what you want since it attaches the child as a SubElement. Probably the easiest thing here would be:
comment = self.make_child("comment", text=comment)
self.remove_child(comment)
self.add_child(comment, position=1)
jgfouca
requested changes
Feb 23, 2018
scripts/lib/CIME/XML/env_mach_pes.py
Outdated
| @@ -17,6 +18,12 @@ def __init__(self, case_root=None, infile="env_mach_pes.xml", components=None): | |||
| schema = os.path.join(get_cime_root(), "config", "xml_schemas", "env_mach_pes.xsd") | |||
| EnvBase.__init__(self, case_root, infile, schema=schema) | |||
|
|
|||
| def add_comment(self, comment): | |||
| if comment is not None: | |||
| tmp = GenericXML(root_name_override="comment", infile="fake", read_only=False) | |||
There was a problem hiding this comment.
@jedwards4b , I see now that make_child cannot support what you want since it attaches the child as a SubElement. Probably the easiest thing here would be:
comment = self.make_child("comment", text=comment)
self.remove_child(comment)
self.add_child(comment, position=1)
scripts/lib/CIME/XML/generic_xml.py
Outdated
| """ | ||
| Add element node to self at root | ||
| """ | ||
| expect(not self.locked and not self.read_only, "locked") | ||
| root = root if root is not None else self.root | ||
| root.xml_element.append(node.xml_element) | ||
| if position > 0: |
There was a problem hiding this comment.
0 is a valid position. I think we want position=None to be default and this if check should check against None.
|
Not sure that your suggestion is any less awkward than what I came up with? |
|
@jedwards4b , I think it's a bit better since it doesn't involve creating an entire fake file. |
|
done |
jgfouca
approved these changes
Feb 23, 2018
jgfouca
pushed a commit
that referenced
this pull request
May 18, 2018
Various software modules have been removed/updated as part of a major update. This addresses runtime issues with JSM identified by @worleyph. spectrum-mpi/10.2.0.0-20180406 is the only supported version. PGI compilers updated to 18.3 XL updated to xl/20180406-beta. Conditional batch directives used for gmumps, smt2 options. Refer #1906 Discussion about Summit task placement at https://acme-climate.atlassian.net/wiki/spaces/PERF/pages/645234702/Summit+Task+Placement Limited testing with FC5AV1C-ne4 and PGI. Note: XL compilers still have a build issue with mct but this is the only XL version with compatible MPI module. Ongoing work to identify root cause. [BFB]
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.
Add the comment from config_pes.xml to the env_mach_pes.xml file
Test suite: scripts_regression_tests.py
Test baseline:
Test namelist changes:
Test status: bit for bit
Fixes #2248
User interface changes?:
Update gh-pages html (Y/N)?:
Code review: