Index: /issm/trunk/src/m/utils/Nightly/runme.m
===================================================================
--- /issm/trunk/src/m/utils/Nightly/runme.m	(revision 4255)
+++ /issm/trunk/src/m/utils/Nightly/runme.m	(revision 4256)
@@ -175,5 +175,5 @@
 
 		%compute fields to be checked
-		fields=testsgetfields(md,sequence);
+		[field_names field_values]=testsgetfields(md,sequence);
 
 		%get Archive name
@@ -183,6 +183,6 @@
 		if strcmpi(procedure,'update'),
 
-			for k=1:length(fields),
-				field=fields{k};
+			for k=1:length(field_names),
+				field=field_values{k};
 				eval([ archive_name '_field' num2str(k) ' = ' field  ';']);
 			end
@@ -196,21 +196,22 @@
 			eval(['load ' archive_name ]);
 
-			for k=1:length(fields),
+			for k=1:length(field_names),
 
 				%Get field and tolerance
-				field=fields{k};
-				tolerance=testsgettolerance(md,sequence,field);
+				field=field_values{k};
+				fieldname=field_names{k};
+				tolerance=testsgettolerance(md,sequence,field_names);
 
 				%compare to archive
-				eval(['Archive=' archive_name '_field' num2str(k) ';']);
-				eval(['error_diff=full(max(abs(Archive-' field '))/(max(abs(Archive))+eps));']);
+				eval(['archive=' archive_name '_field' num2str(k) ';']);
+				error_diff=full(max(abs(archive-field))/(max(abs(archive))+eps));
 
 				%disp test result
 				if (error_diff>tolerance);
 					disp(sprintf(['\nERROR   difference: %-7.2g > %7.2g test: %s analysis_type: %s sub_analysis_type: %s qmu: %i control: %i control_fit: %s parallel: %i field: %s\n'],...
-						error_diff,tolerance,testname,EnumAsString(analysis_type),EnumAsString(sub_analysis_type),qmu,control,control_fit,parallel,field));
+						error_diff,tolerance,testname,EnumAsString(analysis_type),EnumAsString(sub_analysis_type),qmu,control,control_fit,parallel,fieldname));
 				else
 					disp(sprintf(['\nSUCCESS difference: %-7.2g < %7.2g test: %s analysis_type: %s sub_analysis_type: %s qmu: %i control: %i control_fit: %s parallel: %i field: %s\n'],...
-						error_diff,tolerance,testname,EnumAsString(analysis_type),EnumAsString(sub_analysis_type),qmu,control,control_fit,parallel,field));
+						error_diff,tolerance,testname,EnumAsString(analysis_type),EnumAsString(sub_analysis_type),qmu,control,control_fit,parallel,fieldname));
 				end
 			end
Index: /issm/trunk/src/m/utils/Nightly/testsgetfields.m
===================================================================
--- /issm/trunk/src/m/utils/Nightly/testsgetfields.m	(revision 4255)
+++ /issm/trunk/src/m/utils/Nightly/testsgetfields.m	(revision 4256)
@@ -6,8 +6,8 @@
 %
 %   Usage:
-%      fields=testsgetfields(md,analysis)
+%      [field_names field_values]=testsgetfields(md,analysis)
 %
 %   Example:
-%      fields=testsgetfields(md,'DiagnosticSolution')
+%      [field_names field_values]=testsgetfields(md,'DiagnosticSolution')
 %
 %   See also: TESTSGETANALYSIS, TESTGETPACKAGE
@@ -31,13 +31,9 @@
 		else
 			field_names={'Vel'};
-			vx=zeros(md.numberofgrids,1);
-			vx(md.results.DiagnosticAnalysis.Vx.index)=md.results.DiagnosticAnalysis.Vx.value;
-			vy=zeros(md.numberofgrids,1);
-			vy(md.results.DiagnosticAnalysis.Vy.index)=md.results.DiagnosticAnalysis.Vy.value;
-			vel=sqrt(vx.^2+vy.^2);
+			vel=zeros(md.numberofgrids,1);
+			vel(md.results.DiagnosticAnalysis.Vel.index)=md.results.DiagnosticAnalysis.Vel.value;
 			field_values={vel};
 		end
 	end
-	md.results.DiagnosticAnalysis.Vx.value
 
 elseif (analysis_type==ThermalSolutionEnum),
@@ -67,6 +63,6 @@
 	fields={'BalancedthicknessSolution.thickness'};
 
-elseif (analysis_type==SlopecomputeSolutionEnum), 
-	fields={'SlopecomputeSolution.slopex','SlopecomputeSolution.slopey'};
+elseif (analysis_type==SlopeSolutionEnum), 
+	fields={'SlopeSolution.slopex','SlopeSolution.slopey'};
 
 else
Index: /issm/trunk/src/m/utils/Nightly/testsgettolerance.m
===================================================================
--- /issm/trunk/src/m/utils/Nightly/testsgettolerance.m	(revision 4255)
+++ /issm/trunk/src/m/utils/Nightly/testsgettolerance.m	(revision 4256)
@@ -22,30 +22,29 @@
 
 else
-	if (analysis_type==BalancedthicknessAnalysisEnum),
+	if (analysis_type==BalancedthicknessSolutionEnum),
 		tolerance=10^-14;
 
-	elseif (analysis_type==SlopecomputeAnalysisEnum),
+	elseif (analysis_type==SlopeSolutionEnum),
 		tolerance=10^-14;
 
-	elseif (analysis_type==PrognosticAnalysisEnum),
+	elseif (analysis_type==PrognosticSolutionEnum),
 		tolerance=10^-14;
 
-	elseif (analysis_type==Prognostic2AnalysisEnum),
+	elseif (analysis_type==Prognostic2SolutionEnum),
 		tolerance=10^-14;
 
-	elseif (analysis_type==TransientAnalysisEnum),
-		if (md.dim==2),
-			tolerance=10^-11;
-		else
-			if md.isstokes,
-				tolerance=10^-4;
-			elseif any(md.gridonpattyn),
-				tolerance=10^-6;
-			else,
-				tolerance=10^-12;
-			end
+	elseif (analysis_type==Transient2DSolutionEnum),
+		tolerance=10^-11;
+
+	elseif (analysis_type==Transient3DSolutionEnum),
+		if md.isstokes,
+			tolerance=10^-4;
+		elseif any(md.gridonpattyn),
+			tolerance=10^-6;
+		else,
+			tolerance=10^-12;
 		end
 
-	elseif (analysis_type==DiagnosticAnalysisEnum),
+	elseif (analysis_type==DiagnosticSolutionEnum),
 		if md.isstokes,
 			tolerance=10^-4;
@@ -58,5 +57,5 @@
 		end
 
-	elseif (analysis_type==ThermalAnalysisEnum),
+	elseif (analysis_type==ThermalSolutionEnum),
 		if strncmpi(fliplr(field),fliplr('melting'),7),
 			tolerance=10^-6;
@@ -65,5 +64,5 @@
 		end
 
-	elseif (analysis_type==SteadystateAnalysisEnum),
+	elseif (analysis_type==SteadystateSolutionEnum),
 			if md.isstokes | md.control_analysis,
 				tolerance=5*10^-4;