Merge pull request #1818 from ESMCI/jgfouca/xmlchange_improve_error

Improve error messages from xmlchange
ACME users were complaining of unhelpful error messages coming
from xmlchange. This PR will make the handling of type_str consistent
with the listofsettings block above. This should ensure a better error
message.

Test suite: code_checker, by-hand
Test baseline:
Test namelist changes:
Test status: bit for bit

Fixes [CIME Github issue #]

User interface changes?:

Update gh-pages html (Y/N)?:

Code review: jedwards

scripts/Tools/xmlchange

@@ -110,24 +110,26 @@ def xmlchange(caseroot, listofsettings, xmlfile, xmlid, xmlval, subgroup,
                     value = case.get_value(xmlid, resolved=False,
                                            subgroup=subgroup)
                     xmlval = "%s %s" % (value, xmlval)
+
                 if type_str is not None and not force:
                     xmlval = convert_to_type(xmlval, type_str, xmlid)
 
-                if not dryrun :
+                if not dryrun:
                     newval = case.set_value(xmlid, xmlval, subgroup, ignore_type=force)
                     expect(newval is not None,"No variable \"%s\" found"%xmlid)
-                else :
+                else:
                     logger.warning("'%s' = '%s'" , xmlid , xmlval )
         else:
             if append:
                 value = case.get_value(xmlid, resolved=False, subgroup=subgroup)
                 xmlval = "%s %s" % (value, xmlval)
+
             type_str = case.get_type_info(xmlid)
-            if not force:
+            if type_str is not None and not force:
                 xmlval = convert_to_type(xmlval, type_str, xmlid)
-            newval = case.set_value(xmlid, xmlval, subgroup, ignore_type=force)
 
-            expect(newval is not None,"No variable \"%s\" found"%xmlid)
+            newval = case.set_value(xmlid, xmlval, subgroup, ignore_type=force)
+            expect(newval is not None,"No variable '%s' found" % xmlid)
 
     if not noecho:
         argstr = ""