Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve error messages for modify_via_xml and cannot_modify_by_user_nl #1514

Merged
merged 1 commit into from
May 10, 2017
Merged

Improve error messages for modify_via_xml and cannot_modify_by_user_nl #1514

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions scripts/lib/CIME/XML/namelist_definition.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,11 +321,11 @@ def _user_modifiable_in_variable_definition(self, name):
user_modifiable_only_by_xml = node.get('modify_via_xml')
if user_modifiable_only_by_xml is not None:
expect(False,
"Cannot change %s in user_nl_xxx file, %s" %(name, user_modifiable_only_by_xml))
"Cannot change %s in user_nl file: set via xml variable %s" %(name, user_modifiable_only_by_xml))
user_cannot_modify = node.get('cannot_modify_by_user_nl')
if user_cannot_modify is not None:
expect(False,
"Cannot change %s in user_nl_xxx file, %s" %(name, user_cannot_modify))
"Cannot change %s in user_nl file: %s" %(name, user_cannot_modify))

def validate(self, namelist,filename=None):
"""Validate a namelist object against this definition.
Expand Down