Index: /issm/trunk/src/m/classes/@model/model.m
===================================================================
--- /issm/trunk/src/m/classes/@model/model.m	(revision 5960)
+++ /issm/trunk/src/m/classes/@model/model.m	(revision 5961)
@@ -244,10 +244,5 @@
 
 	%Parallelisation parameters
-	md.cluster='';
-	md.np=0;
-	md.time=0;
-	md.queue='';
-	md.exclusive=0;
-	md.scheduler_configuration='';
+	md.cluster=none;
 	md.outlog='';
 	md.errlog='';
Index: /issm/trunk/src/m/classes/@model/setdefaultparameters.m
===================================================================
--- /issm/trunk/src/m/classes/@model/setdefaultparameters.m	(revision 5960)
+++ /issm/trunk/src/m/classes/@model/setdefaultparameters.m	(revision 5961)
@@ -223,6 +223,6 @@
 %Parallelisation parameters
 
-%cluster set as 'none' for serial
-md.cluster='none';
+%cluster set as none for serial
+md.cluster=none;
 
 %this option can be activated to load automatically the results
@@ -232,19 +232,4 @@
 md.waitonlock=Inf;
 
-%number of processors to be used (if parallel)
-md.np=8;
-
-%minutes
-md.time=60;
-
-%queue name for cluster
-md.queue='shortc';
-
-%exculsive mode (share no cpus)
-md.exclusive=1;
-
-%?????
-md.scheduler_configuration='local';
-
 %prerun allocation cleanup
 md.alloc_cleanup=1;
Index: /issm/trunk/src/m/model/display/displayparallel.m
===================================================================
--- /issm/trunk/src/m/model/display/displayparallel.m	(revision 5960)
+++ /issm/trunk/src/m/model/display/displayparallel.m	(revision 5961)
@@ -10,14 +10,7 @@
 
 disp(sprintf('   parallel computation parameters:'));
-
-disp(sprintf('\n      parallelisation:'));
-fielddisplay(md,'cluster','set to ''cluster_name'' to run in cluster, ''none'' to run serially');
-fielddisplay(md,'np','number of CPUS requested on cluster');
-fielddisplay(md,'exclusive','set to 1 if CPUS used are not to be shared with other users, 0 otherwise');
-fielddisplay(md,'time','amount of time requested on cluster');
+md.cluster
 fielddisplay(md,'alloc_cleanup','allocation cleanup before starting a job, default 1');
 fielddisplay(md,'waitonlock','maximum number of minutes to wait for batch results, or return 0');
-fielddisplay(md,'queue','special queue name on cluster? default is '''' ');
-
 disp(sprintf('\n      PETSc solver options:'));
 fielddisplay(md,'solverstring','solver string for Petsc. See solversetto... routines. Default is mumps');
Index: /issm/trunk/src/m/model/ismodelselfconsistent.m
===================================================================
--- /issm/trunk/src/m/model/ismodelselfconsistent.m	(revision 5960)
+++ /issm/trunk/src/m/model/ismodelselfconsistent.m	(revision 5961)
@@ -104,5 +104,5 @@
 fields={'numberofelements','numberofgrids','x','y','z','drag_coefficient','drag_type','drag_p','drag_q',...
 	'rho_ice','rho_water','rheology_B','elementoniceshelf','surface','thickness','bed','g','lowmem','sparsity','nsteps','maxiter',...
-	'tolx','np','eps_res','max_nonlinear_iterations','exclusive','rheology_n','gridonbed','gridonsurface','elementonbed','elementonsurface','deltaH','DeltaH','timeacc','timedec'};
+	'tolx','eps_res','max_nonlinear_iterations','rheology_n','gridonbed','gridonsurface','elementonbed','elementonsurface','deltaH','DeltaH','timeacc','timedec'};
 checknan(md,fields);
 %}}}}
Index: /issm/trunk/src/m/model/modeldefault/defaultparams.m
===================================================================
--- /issm/trunk/src/m/model/modeldefault/defaultparams.m	(revision 5960)
+++ /issm/trunk/src/m/model/modeldefault/defaultparams.m	(revision 5961)
@@ -12,7 +12,5 @@
 
 	%parallelization 
-	md.cluster=oshostname();
-	md.np=8;
-	md.time=60;
+	md.cluster=eval([oshostname() ';']);
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Index: /issm/trunk/src/m/utils/Analysis/setcluster.m
===================================================================
--- /issm/trunk/src/m/utils/Analysis/setcluster.m	(revision 5960)
+++ /issm/trunk/src/m/utils/Analysis/setcluster.m	(revision 5961)
@@ -5,6 +5,3 @@
 %      md=setcluster(md,cluster);
 
-md.cluster=cluster.name;
-md.np     =cluster.np;
-md.queue  =cluster.queue;
-md.time   =cluster.time;
+md.cluster=cluster;