Merge pull request #499 from ESMCI/jedwards/perl_xml_workaround

workaround for problem resolving vars in perl



A better workaround for problem with perl resolving xml correctly

Test suite: scripts_regression_tests (coripi, cesm)
Test baseline:
Test namelist changes:
Test status: bit for bi

Fixes

User interface changes?:

Code review:

utils/perl5lib/Config/SetupTools.pm

@@ -208,6 +208,14 @@ sub getxmlvars
 	    $xmlvars->{$id} = $value;
 	}
     }
+# These represent a workaround for a problem in resolving variables in perl
+
+    if (defined ($xmlvars->{CESMSCRATCHROOT})){
+	$xmlvars->{CESMSCRATCHROOT}=expand_xml_var($xmlvars->{CESMSCRATCHROOT}, $xmlvars);
+    }
+    if (defined ($xmlvars->{DIN_LOC_ROOT})){
+	$xmlvars->{DIN_LOC_ROOT}=expand_xml_var($xmlvars->{DIN_LOC_ROOT}, $xmlvars);
+    }
 }
 
 #-------------------------------------------------------------------------------