Index: /issm/trunk/src/m/utils/Nightly/nightlyrun.m
===================================================================
--- /issm/trunk/src/m/utils/Nightly/nightlyrun.m	(revision 1977)
+++ /issm/trunk/src/m/utils/Nightly/nightlyrun.m	(revision 1978)
@@ -18,23 +18,25 @@
 %      nightlyrun({'ice'},{'prognostic','diagnostic'},1,3);
 
-%check arguments
-if (nargin>4)
-	help nightlyrun
-	error('nightlyrun error message: bad usage');
-end
-
 %use ISSM_DIR generated by startup.m
 global ISSM_DIR
 
-%recover rank and numprocs: 
-if nargin>=2,
+%check number of inputs
+if nargin==0,
+	packages={'macayeal','ice','cielo_serial','cielo_parallel'};
+	rank=1;
+	numprocs=1;
+elseif nargin==1,
+	packages=varargin{1};
+	rank=1;
+	numprocs=1;
+elseif nargin==3,
+	packages=varargin{1};
 	rank=varargin{end-1};
 	numprocs=varargin{end};
-	if ~isnumeric(rank),
-		rank=1;
-	end
-	if ~isnumeric(numprocs),
-		numprocs=1;
-	end
+	if ~isnumeric(rank), rank=1; end
+	if ~isnumeric(numprocs), numprocs=1; end
+else
+	help nightlyrun
+	error('nightlyrun error message: bad usage');
 end
 
@@ -46,11 +48,4 @@
 
 list=listfilesparallel(rank,numprocs);
-
-%Get packages
-if nargin,
-	packages=varargin{1};
-else
-	packages={'macayeal','ice','cielo_serial','cielo_parallel'};
-end
 
 %Go through list of decks, and run the deck runme.m files package by package.
