Index: /issm/trunk/src/m/utils/Nightly/runme.m
===================================================================
--- /issm/trunk/src/m/utils/Nightly/runme.m	(revision 2176)
+++ /issm/trunk/src/m/utils/Nightly/runme.m	(revision 2177)
@@ -175,5 +175,5 @@
 
 		%compute fields to be checked
-		fields=testsgetfields2(md,sequence);
+		fields=testsgetfields(md,sequence);
 
 		%get Archive name
@@ -207,5 +207,5 @@
 				%Get field and tolerance
 				field=fields{k};
-				tolerance=testsgettolerance2(md,sequence,field);
+				tolerance=testsgettolerance(md,sequence,field);
 
 				%compare to archive
Index: /issm/trunk/src/m/utils/Nightly/testsgetfields.m
===================================================================
--- /issm/trunk/src/m/utils/Nightly/testsgetfields.m	(revision 2177)
+++ /issm/trunk/src/m/utils/Nightly/testsgetfields.m	(revision 2177)
@@ -0,0 +1,58 @@
+function fields=testsgetfields(md,sequence),
+%TESTSGETFIELDS - build the fields to be checked from a analysis
+%
+%   This routine is used by nightly runs (runme.m and updatearchive.m).
+%   for an input analysis 'prognostic', it will output 'cielo'
+%
+%   Usage:
+%      fields=testsgetfields(md,analysis)
+%
+%   Example:
+%      fields=testsgetfields(md,'diagnostic')
+%
+%   See also: TESTSGETANALYSIS, TESTGETPACKAGE
+
+%recover what is being requested.
+analysis_type=sequence{1};
+sub_analysis_type=sequence{2};
+qmu=sequence{3};
+control=sequence{4};
+control_fit=sequence{5};
+parallel=sequence{6};
+
+if strcmpi(analysis_type,'diagnostic'),
+	if control,
+		fields={'diagnostic.vel','diagnostic.J','diagnostic.parameter'};
+	elseif qmu,
+		fields={'dakota.importancefactors'};
+	else
+		if strcmpi(md.type,'3d')
+			fields={'diagnostic.vy','diagnostic.vz'};
+		else
+			fields={'diagnostic.vel'};
+		end
+	end
+
+elseif strcmpi(analysis_type,'thermal'),
+	fields={'thermal(end).temperature','thermal(end).melting'};
+
+elseif strcmpi(analysis_type,'prognostic'),
+	fields={'prognostic.thickness'};
+
+elseif strcmpi(analysis_type,'transient'), 
+	if strcmpi(md.type,'3d')
+		fields={'transient(end).vel','transient(end).pressure','transient(end).temperature','transient(end).melting','transient(end).thickness','transient(end).surface','transient(end).bed'};
+	else
+		fields={'transient(end).vel','transient(end).thickness','transient(end).surface','transient(end).bed'};
+	end
+
+elseif strcmpi(analysis_type,'steadystate'), 
+	if control,
+		fields={'steadystate.vel','steadystate.J','steadystate.parameter'};
+	else
+		fields={'steadystate.vel','steadystate.pressure','steadystate.temperature'};
+	end
+
+else
+	error(['testsgetfields error message: requested sequence not supported yet']);
+end
Index: sm/trunk/src/m/utils/Nightly/testsgetfields2.m
===================================================================
--- /issm/trunk/src/m/utils/Nightly/testsgetfields2.m	(revision 2176)
+++ 	(revision )
@@ -1,58 +1,0 @@
-function fields=testsgetfields2(md,sequence),
-%TESTSGETFIELDS - build the fields to be checked from a analysis
-%
-%   This routine is used by nightly runs (runme.m and updatearchive.m).
-%   for an input analysis 'prognostic', it will output 'cielo'
-%
-%   Usage:
-%      fields=testsgetfields(md,analysis)
-%
-%   Example:
-%      fields=testsgetfields(md,'diagnostic')
-%
-%   See also: TESTSGETANALYSIS, TESTGETPACKAGE
-
-%recover what is being requested.
-analysis_type=sequence{1};
-sub_analysis_type=sequence{2};
-qmu=sequence{3};
-control=sequence{4};
-control_fit=sequence{5};
-parallel=sequence{6};
-
-if strcmpi(analysis_type,'diagnostic'),
-	if control,
-		fields={'diagnostic.vel','diagnostic.J','diagnostic.parameter'};
-	elseif qmu,
-		fields={'dakota.importancefactors'};
-	else
-		if strcmpi(md.type,'3d')
-			fields={'diagnostic.vy','diagnostic.vz'};
-		else
-			fields={'diagnostic.vel'};
-		end
-	end
-
-elseif strcmpi(analysis_type,'thermal'),
-	fields={'thermal(end).temperature','thermal(end).melting'};
-
-elseif strcmpi(analysis_type,'prognostic'),
-	fields={'prognostic.thickness'};
-
-elseif strcmpi(analysis_type,'transient'), 
-	if strcmpi(md.type,'3d')
-		fields={'transient(end).vel','transient(end).pressure','transient(end).temperature','transient(end).melting','transient(end).thickness','transient(end).surface','transient(end).bed'};
-	else
-		fields={'transient(end).vel','transient(end).thickness','transient(end).surface','transient(end).bed'};
-	end
-
-elseif strcmpi(analysis_type,'steadystate'), 
-	if control,
-		fields={'steadystate.vel','steadystate.J','steadystate.parameter'};
-	else
-		fields={'steadystate.vel','steadystate.pressure','steadystate.temperature'};
-	end
-
-else
-	error(['testsgetfields error message: requested sequence not supported yet']);
-end
Index: /issm/trunk/src/m/utils/Nightly/testsgettolerance.m
===================================================================
--- /issm/trunk/src/m/utils/Nightly/testsgettolerance.m	(revision 2177)
+++ /issm/trunk/src/m/utils/Nightly/testsgettolerance.m	(revision 2177)
@@ -0,0 +1,73 @@
+function tolerance=testsgettolerance(md,sequence,field),
+%TESTSGETTOLERANCE - give the tolerance for the nightly run 
+%
+%   This routine is used by nightly runs (runme.m and updatearchive.m).
+%   It gives the accepted tolerance, given the package, the analysis_type and the field check.
+%
+%   Usage:
+%      tolerance=testsgettolerance2(md,package,analysis_type,field),
+%
+%   Example:
+%      tolerance=testsgettolerance2(md,'cielo','diagnostic','vel'),
+%
+%   See also: TESTSGETANALYSIS, TESTGETPACKAGE
+
+%recover what is being requested.
+analysis_type=sequence{1};
+sub_analysis_type=sequence{2};
+qmu=sequence{3};
+control=sequence{4};
+control_fit=sequence{5};
+parallel=sequence{6};
+
+if ~parallel,
+	tolerance=10^-12;
+
+else
+	if strcmpi(analysis_type,'prognostic'),
+		tolerance=10^-14;
+
+	elseif strcmpi(analysis_type,'transient'),
+		if strcmpi(md.type,'2d'),
+			tolerance=10^-11;
+		else
+			if md.isstokes,
+				tolerance=10^-4;
+			elseif any(md.gridonpattyn),
+				tolerance=10^-6;
+			else,
+				tolerance=10^-12;
+			end
+		end
+
+	elseif strcmpi(analysis_type,'diagnostic'),
+		if md.isstokes,
+			tolerance=10^-4;
+		elseif any(md.gridonpattyn),
+			tolerance=10^-6;
+		elseif ~isnans(md.rifts),
+			tolerance=10^-10;
+		else,
+			tolerance=10^-13;
+		end
+
+	elseif strcmpi(analysis_type,'thermal'),
+		if strncmpi(fliplr(field),fliplr('melting'),7),
+			tolerance=10^-6;
+		elseif strncmpi(fliplr(field),fliplr('temperature'),11),
+			tolerance=10^-11;
+		end
+
+	elseif (strcmpi(analysis_type,'steadystate')),
+			if md.isstokes,
+				tolerance=5*10^-5;
+			elseif any(md.gridonpattyn),
+				tolerance=2*10^-8;
+			else,
+				tolerance=10^-10;
+			end
+
+	else
+		error(['testsgettolerance2 error message: analysis_type '  analysis_type ' not supported yet with package cielo_parallel']);
+	end
+end
Index: sm/trunk/src/m/utils/Nightly/testsgettolerance2.m
===================================================================
--- /issm/trunk/src/m/utils/Nightly/testsgettolerance2.m	(revision 2176)
+++ 	(revision )
@@ -1,73 +1,0 @@
-function tolerance=testsgettolerance2(md,sequence,field),
-%TESTSGETTOLERANCE - give the tolerance for the nightly run 
-%
-%   This routine is used by nightly runs (runme.m and updatearchive.m).
-%   It gives the accepted tolerance, given the package, the analysis_type and the field check.
-%
-%   Usage:
-%      tolerance=testsgettolerance2(md,package,analysis_type,field),
-%
-%   Example:
-%      tolerance=testsgettolerance2(md,'cielo','diagnostic','vel'),
-%
-%   See also: TESTSGETANALYSIS, TESTGETPACKAGE
-
-%recover what is being requested.
-analysis_type=sequence{1};
-sub_analysis_type=sequence{2};
-qmu=sequence{3};
-control=sequence{4};
-control_fit=sequence{5};
-parallel=sequence{6};
-
-if ~parallel,
-	tolerance=10^-12;
-
-else
-	if strcmpi(analysis_type,'prognostic'),
-		tolerance=10^-14;
-
-	elseif strcmpi(analysis_type,'transient'),
-		if strcmpi(md.type,'2d'),
-			tolerance=10^-11;
-		else
-			if md.isstokes,
-				tolerance=10^-4;
-			elseif any(md.gridonpattyn),
-				tolerance=10^-6;
-			else,
-				tolerance=10^-12;
-			end
-		end
-
-	elseif strcmpi(analysis_type,'diagnostic'),
-		if md.isstokes,
-			tolerance=10^-4;
-		elseif any(md.gridonpattyn),
-			tolerance=10^-6;
-		elseif ~isnans(md.rifts),
-			tolerance=10^-10;
-		else,
-			tolerance=10^-13;
-		end
-
-	elseif strcmpi(analysis_type,'thermal'),
-		if strncmpi(fliplr(field),fliplr('melting'),7),
-			tolerance=10^-6;
-		elseif strncmpi(fliplr(field),fliplr('temperature'),11),
-			tolerance=10^-11;
-		end
-
-	elseif (strcmpi(analysis_type,'steadystate')),
-			if md.isstokes,
-				tolerance=5*10^-5;
-			elseif any(md.gridonpattyn),
-				tolerance=2*10^-8;
-			else,
-				tolerance=10^-10;
-			end
-
-	else
-		error(['testsgettolerance2 error message: analysis_type '  analysis_type ' not supported yet with package cielo_parallel']);
-	end
-end