Index: /issm/trunk/src/m/utils/Nightly/testschecksolution.m
===================================================================
--- /issm/trunk/src/m/utils/Nightly/testschecksolution.m	(revision 1908)
+++ /issm/trunk/src/m/utils/Nightly/testschecksolution.m	(revision 1909)
@@ -18,4 +18,4 @@
 	result=ismember({solution},{'diagnostic','prognostic','transient'});
 elseif strcmpi(mdtype,'3d')
-	result=ismember({solution},{'diagnostic','prognostic','transient','thermalsteady','thermaltransient','steadystate'});
+	result=ismember({solution},{'diagnostic','prognostic','transient','thermal_steady','thermal_transient','steadystate'});
 end
Index: sm/trunk/src/m/utils/Nightly/testsgetanalysis.m
===================================================================
--- /issm/trunk/src/m/utils/Nightly/testsgetanalysis.m	(revision 1908)
+++ 	(revision )
@@ -1,41 +1,0 @@
-function [analysis_type sub_analysis_type]=testsgetanalys(string),
-%TESTSGETANALYSIS - build the analysis type and sub analysis type from a string
-%
-%   This routine is used by nightly runs (runme.m and updatearchive.m).
-%   for an input string 'thermalsteady', it will output [thermal steady]
-%
-%   Usage:
-%      [analysis_type sub_analysis_type]=testsgetanalysis(string)
-%
-%   Example:
-%      [analysis_type sub_analysis_type]=testsgetanalysis('diagnostic');
-%
-%   See also: TESTSGETPACKAGE, TESTSGETFIELDS
-
-if strcmpi(string,'diagnostic'),
-	analysis_type='diagnostic';
-	sub_analysis_type='none';
-
-elseif strcmpi(string,'prognostic'),
-	analysis_type='prognostic';
-	sub_analysis_type='none';
-
-elseif strcmpi(string,'thermalsteady'),
-	analysis_type='thermal';
-	sub_analysis_type='none';
-
-elseif strcmpi(string,'thermaltransient'),
-	analysis_type='thermal';
-	sub_analysis_type='none';
-
-elseif strcmpi(string,'transient'),
-	sub_analysis_type='none';
-	analysis_type='transient';
-
-elseif strcmpi(string,'steadystate'),
-	sub_analysis_type='none';
-	analysis_type='steadystate';
-
-else
-	error(['testsgetanalysis error message: solution '  string ' not supported yet']);
-end
Index: sm/trunk/src/m/utils/Nightly/testsgetpackage.m
===================================================================
--- /issm/trunk/src/m/utils/Nightly/testsgetpackage.m	(revision 1908)
+++ 	(revision )
@@ -1,37 +1,0 @@
-function [md package]=testsgetpackage(md,string),
-%TESTSGETPACKAGE - build the package from a string
-%
-%   This routine is used by nightly runs (runme.m and updatearchive.m).
-%   for an input string 'cielo_serial', it will output 'cielo'
-%
-%   Usage:
-%      [md package]=testsgetpackage(md,string)
-%
-%   Example:
-%      [md package]=testsgetpackage(md,'cielo_serial')
-%
-%   See also: TESTSGETANALYSIS, TESTSGETFIELDS
-
-if strcmpi(string,'ice'),
-	package='ice';
-
-elseif strcmpi(string,'macayeal'),
-	package='macayeal';
-
-elseif strcmpi(string,'cielo_serial'),
-	package='cielo';
-	md.cluster='none';
-
-elseif strcmpi(string,'cielo_parallel'),
-	package='cielo';
-	md.cluster=oshostname;
-	%check and modify number of cpus if necessary
-	np=feature('numCores');
-	if np<md.np;
-		disp(['testsgetpackage warning: changing number of cpus to ' num2str(np) ]);
-		md.np=np;
-	end
-
-else
-	error(['testsgetpackage error message: package '  string ' not supported yet']);
-end
Index: /issm/trunk/src/m/utils/Nightly/testsparameterize.m
===================================================================
--- /issm/trunk/src/m/utils/Nightly/testsparameterize.m	(revision 1909)
+++ /issm/trunk/src/m/utils/Nightly/testsparameterize.m	(revision 1909)
@@ -0,0 +1,41 @@
+function [analysis_type sub_analysis_type]=testsgetanalys(string),
+%TESTSGETANALYSIS - build the analysis type and sub analysis type from a string
+%
+%   This routine is used by nightly runs (runme.m and updatearchive.m).
+%   for an input string 'thermalsteady', it will output [thermal steady]
+%
+%   Usage:
+%      [analysis_type sub_analysis_type]=testsgetanalysis(string)
+%
+%   Example:
+%      [analysis_type sub_analysis_type]=testsgetanalysis('diagnostic');
+%
+%   See also: TESTSGETPACKAGE, TESTSGETFIELDS
+
+if strcmpi(string,'diagnostic'),
+	analysis_type='diagnostic';
+	sub_analysis_type='none';
+
+elseif strcmpi(string,'prognostic'),
+	analysis_type='prognostic';
+	sub_analysis_type='none';
+
+elseif strcmpi(string,'thermalsteady'),
+	analysis_type='thermal';
+	sub_analysis_type='none';
+
+elseif strcmpi(string,'thermaltransient'),
+	analysis_type='thermal';
+	sub_analysis_type='none';
+
+elseif strcmpi(string,'transient'),
+	sub_analysis_type='none';
+	analysis_type='transient';
+
+elseif strcmpi(string,'steadystate'),
+	sub_analysis_type='none';
+	analysis_type='steadystate';
+
+else
+	error(['testsgetanalysis error message: solution '  string ' not supported yet']);
+end