Merge pull request #1514 from billsacks/modify_via_xml_error_msg

Improve error messages for modify_via_xml and cannot_modify_by_user_nl
Test suite: Manual test
Test baseline: N/A
Test namelist changes: N/A
Test status: bit for bit

Fixes #1430

User interface changes?: none

Code review:jedwards

scripts/lib/CIME/XML/namelist_definition.py

@@ -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.