Index: /issm/trunk-jpl/src/m/classes/clusters/camhpc.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/clusters/camhpc.m	(revision 21290)
+++ /issm/trunk-jpl/src/m/classes/clusters/camhpc.m	(revision 21291)
@@ -14,5 +14,6 @@
 		 cpuspernode   = 8;
 		 port          = 8000;
-		 queue         = 'arnold';
+		 project       = '';
+		 partition     = '';
 		 codepath      = '';
 		 executionpath = '';
@@ -41,5 +42,6 @@
 			 disp(sprintf('    cpuspernode: %i',cluster.cpuspernode));
 			 disp(sprintf('    np: %i',cluster.cpuspernode*cluster.numnodes));
-			 disp(sprintf('    queue: %s',cluster.queue));
+			 disp(sprintf('    project: %s',cluster.project));
+			 disp(sprintf('    partition: %s',cluster.partition));
 			 disp(sprintf('    codepath: %s',cluster.codepath));
 			 disp(sprintf('    executionpath: %s',cluster.executionpath));
@@ -56,9 +58,9 @@
 		 function md = checkconsistency(cluster,md,solution,analyses) % {{{
 
-			 available_queues={'c6145','default'};
+			 available_queues={'ARNOLD-SL3'};
 			 queue_requirements_time=[Inf Inf];
 			 queue_requirements_np=[80 80];
 
-			 QueueRequirements(available_queues,queue_requirements_time,queue_requirements_np,cluster.queue,cluster.np,1)
+			 QueueRequirements(available_queues,queue_requirements_time,queue_requirements_np,cluster.project,cluster.np,1)
 
 			 %Miscelaneous
@@ -78,5 +80,6 @@
 			 fprintf(fid,'#!/bin/bash\n');
 			 fprintf(fid,'#SBATCH --job-name=%s\n',modelname);
-			 fprintf(fid,'#SBATCH -p %s \n',cluster.queue);
+			 fprintf(fid,'#SBATCH -p %s \n',cluster.partition);
+			 fprintf(fid,'#SBATCH -A %s \n',cluster.project);
 			 fprintf(fid,'#SBATCH -N %i -n %i\n',cluster.numnodes,cluster.cpuspernode);
 			 fprintf(fid,'#SBATCH --time=%i\n',cluster.time*60); %walltime is in seconds.
@@ -87,5 +90,5 @@
 			 fprintf(fid,'source $ISSM_DIR/etc/environment.sh\n');       %FIXME
 			 fprintf(fid,'cd %s/%s\n\n',cluster.executionpath,dirname);
-			 fprintf(fid,'mpiexec -np %i %s/issm.exe %s %s %s\n',cluster.np,cluster.codepath,solution,[cluster.executionpath '/' dirname],modelname);
+			 fprintf(fid,'mpirun -np %i %s/issm.exe %s %s %s\n',cluster.np,cluster.codepath,solution,[cluster.executionpath '/' dirname],modelname);
 			 if ~io_gather, %concatenate the output files:
 				 fprintf(fid,'cat %s.outbin.* > %s.outbin',modelname,modelname);
@@ -96,5 +99,5 @@
 			 if cluster.interactive,
 				 fid=fopen([modelname '.run'],'w');
-				 fprintf(fid,'mpiexec -np %i %s/issm.exe %s %s %s\n',cluster.np,cluster.codepath,solution,[cluster.executionpath '/' dirname],modelname);
+				 fprintf(fid,'mpirun -np %i %s/issm.exe %s %s %s\n',cluster.np,cluster.codepath,solution,[cluster.executionpath '/' dirname],modelname);
 				 if ~io_gather, %concatenate the output files:
 					 fprintf(fid,'cat %s.outbin.* > %s.outbin',modelname,modelname);
Index: /issm/trunk-jpl/src/m/classes/organizer.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/organizer.m	(revision 21290)
+++ /issm/trunk-jpl/src/m/classes/organizer.m	(revision 21291)
@@ -109,5 +109,12 @@
 
 			%figure out if the data is there, otherwise, we have to use the default path supplied by user.
-			if exist(path,'file') | exist([path '.mat'],'file'),
+			if exist(path,'file'),
+				path=path;
+			elseif exist([path '.mat'],'file'),
+				path=[path '.mat'];
+			else
+				error(['Could not find ' path ]);
+			end
+			if exist(path,'file')
 				evalin('caller',['load -mat ' path]);
 				return;