Index: sm/trunk/src/m/utils/Nightly/runme.m
===================================================================
--- /issm/trunk/src/m/utils/Nightly/runme.m	(revision 2174)
+++ 	(revision )
@@ -1,35 +1,0 @@
-function varargout=runme(varargin)
-%RUNME - test deck for ISSM nightly runs
-%
-%   Usage:
-%      varargout=runme(varargin);
-%
-%   Examples:
-%      runme;
-%      runme('analysis_type',{'prognostic','diagnostic'});
-%      runme('analysis_type',{'prognostic','diagnostic'},'parallel',0);
-%      runme('analysis_type',{'prognostic','diagnostic'},'parallel',1);
-%
-%   See Also: NIGHTLYRUN UPDATEARCHIVE
-
-% This file can be run to check that the current version of issm is giving 
-% coherent results.
-% The results of this test will indicate if there is a difference between current computations 
-% and archived results.
-
-% Errors  between archived results and the current version will get flagged if they are not within 
-% a certain tolerance. 
-
-%check arguments
-if nargout>1
-	help runme
-	error('runme error message: bad usage');
-end
-
-%call runme_core
-md=runme_core('procedure','check',varargin{:});
-
-%output model md if requested
-if nargout==1, 
-	varargout{1}=md; 
-end
Index: /issm/trunk/src/m/utils/Nightly/runme_core.m
===================================================================
--- /issm/trunk/src/m/utils/Nightly/runme_core.m	(revision 2174)
+++ /issm/trunk/src/m/utils/Nightly/runme_core.m	(revision 2175)
@@ -1,10 +1,13 @@
-function md=runme_core(varargin)
-%RUNME_CORE - test deck for ISSM nightly runs
+function md=runme(varargin)
+%RUNME - test deck for ISSM nightly runs
 %
 %   Usage:
-%      md=runme_core(varargin);
+%      md=runme(varargin);
 %
 %   Examples:
-%      md=runme_core('parallel',1,'update');
+%      runme;
+%      runme('analysis_type',{'prognostic','diagnostic'});
+%      runme('analysis_type',{'prognostic','diagnostic'},'parallel',0);
+%      runme('procedure','update','analysis_type',{'prognostic','diagnostic'},'parallel',1);
 %
 %   See Also: UPDATEARCHIVE RUNME
@@ -24,11 +27,11 @@
 %check arguments
 if nargout~=1
-	help runme_core
-	error('runme_core error message: bad usage');
-end
-
-%warning if a runme_core already exists:
+	help runme
+	error('runme error message: bad usage');
+end
+
+%warning if a runme already exists:
 if exist('./runme.m')
-	disp('this is the nighlty run runme_core, located in src/m/utils/Nightly/runme_core.m')
+	disp('this is the nighlty run runme, located in src/m/utils/Nightly/runme.m')
 	disp('Another local runme exist but is not executed')
 end
@@ -36,5 +39,5 @@
 %read configuration
 if ~exist('./configuration.m')
-	error('runme_core error message: configuration file ''configuration.m'' not found');
+	error('runme error message: configuration file ''configuration.m'' not found');
 else
 	configuration;
@@ -104,5 +107,5 @@
 	procedure=find_option(options,'procedure');
 	if isempty(procedure),
-		disp('runme_core warning: no procedure found, defaulting to test checking')
+		disp('runme warning: no procedure found, defaulting to test checking')
 		procedure='check';
 	end
@@ -151,5 +154,5 @@
 			md.fit(:)=2;
 		else
-			error(['runme_core error message: for control solution, ' control_fit ' fit is not supported!']);
+			error(['runme error message: for control solution, ' control_fit ' fit is not supported!']);
 		end
 	end
@@ -184,6 +187,16 @@
 		end
 
-		%CHECK TEST?
-		if strcmpi(testtype,'check'),
+		%UPDATE ARCHIVE?
+		if strcmpi(procedure,'update'),
+
+			for k=1:length(fields),
+				field=fields{k};
+				eval([ archive_name '_field' num2str(k) ' = md.results. ' field  ';']);
+			end
+			eval(['save ' archive_name ' ' archive_name '_field*']);
+			disp(sprintf(['File ' archive_name ' saved\n']));
+
+		%ELSE: CHECK TEST
+		else,
 
 			%load archive
@@ -207,19 +220,4 @@
 				end
 			end
-
-		%UPDATE ARCHIVE?
-		elseif strcmpi(testtype,'update'),
-
-			for k=1:length(fields),
-				field=fields{k};
-				eval([ archive_name '_field' num2str(k) ' = md.results. ' field  ';']);
-			end
-			eval(['save ' archive_name ' ' archive_name '_field*']);
-			disp(sprintf(['File ' archive_name ' saved\n']));
-
-		else
-
-			error('runme_core error message: unknown runtype. should be ''check'' or ''update''');
-
 		end
 
Index: sm/trunk/src/m/utils/Nightly/updatearchive.m
===================================================================
--- /issm/trunk/src/m/utils/Nightly/updatearchive.m	(revision 2174)
+++ 	(revision )
@@ -1,33 +1,0 @@
-function varargout=updatearchive(varargin)
-%UPDATEARCHIVE - update test deck for ISSM nightly runs
-%
-%   Usage:
-%      varargout=updatearchive(varargin);
-%
-%   Examples:
-%      updatearchive;
-%      updatearchive('analysis_type',{'prognostic','diagnostic'});
-%      updatearchive('analysis_type',{'prognostic','diagnostic'},'parallel',0);
-%      updatearchive('analysis_type',{'prognostic','diagnostic'},'parallel',1);
-%
-%   See Also: NIGHTLYRUN RUNME
-
-% This file can be run to update that the current version of issm is giving 
-% coherent results. 
-% Just run this file in Matlab, with a properly setup ISSM code. 
-% The results of this test will indicate if there is a difference between current computations 
-% and archived results.
-
-%check arguments
-if nargout>1
-	help updatearchive
-	error('updatearchive error message: bad usage');
-end
-
-%call updatearchive_core
-md=runme_core('procedure','update',varargin{:});
-
-%output model md if requested
-if nargout==1, 
-	varargout{1}=md; 
-end