Index: /issm/trunk-jpl/src/m/classes/clusters/vilje.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/clusters/vilje.m	(revision 20314)
+++ /issm/trunk-jpl/src/m/classes/clusters/vilje.m	(revision 20315)
@@ -6,18 +6,18 @@
 %      cluster=greenplanet('np',3,'login','username');
 
-classdef greenplanet
+classdef vilje
     properties (SetAccess=public)  
 		 % {{{
 		 name          = 'vilje'
 		 login         = '';
-		 accountname    ='';
+         accountname    ='';
 		 numnodes      = 20;
-		 cpuspernode   = 8;
-		 port          = 8000;
+		 cpuspernode   = '';
+		 port          = '';
 		 queue         = '';
 		 codepath      = '';
 		 executionpath = '';
 		 interactive   = 0;
-		 time          = 24*60;
+		 time          = '';
 		 memory        = 2;
 	 end
@@ -41,5 +41,5 @@
 			 disp(sprintf('    name: %s',cluster.name));
 			 disp(sprintf('    login: %s',cluster.login));
-			 disp(sprintf('    accountname: %s',cluster.accountname));
+                         disp(sprintf('    accountname: %s',cluster.accountname));
 			 disp(sprintf('    port: %i',cluster.port));
 			 disp(sprintf('    numnodes: %i',cluster.numnodes));
@@ -60,9 +60,9 @@
 			 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.queue,cluster.np,1)
 
 			 %Miscelaneous
 			 if isempty(cluster.login), md = checkmessage(md,'login empty'); end
-			 if isempty(cluster.accountname), md = checkmessage(md,'accountname empty'); end
+                         if isempty(cluster.accountname), md = checkmessage(md,'accountname empty'); end
 			 if isempty(cluster.codepath), md = checkmessage(md,'codepath empty'); end
 			 if isempty(cluster.executionpath), md = checkmessage(md,'executionpath empty'); end
@@ -82,9 +82,10 @@
 			 fprintf(fid,'#PBS -S /bin/bash\n');
 			 fprintf(fid,'#PBS -N %s\n',modelname);
-			 fprintf(fid,'#PBS -l select=%i:ncpus=%i:model=%s\n',cluster.numnodes,cluster.cpuspernode,cluster.processor);
-			 fprintf(fid,'#PBS -l walltime=%i\n',cluster.time*60);  %walltime is hh:mm:ss
-			 fprintf(fid,'#PBS -A %s\n',cluster.accountname);
-			 fprintf(fid,'#PBS -q %s \n',cluster.queue);
-			 fprintf(fid,'#PBS -l mem=%igb\n',cluster.memory);
+                         fprintf(fid,'#PBS -l select=%i:ncpus=%i:mpiprocs=%i\n',cluster.numnodes,cluster.cpuspernode,16);
+                         fprintf(fid,'#PBS -l walltime=%s\n',cluster.time); %walltime is in seconds.
+                         fprintf(fid,'#PBS -A %s\n',cluster.accountname);
+%			 fprintf(fid,'#PBS -q %s \n',cluster.queue);
+%			 fprintf(fid,'#PBS -l mem=%igb\n',cluster.memory);
+%			 fprintf(fid,'#PBS -M mmorligh@uci.edu\n');
 			 fprintf(fid,'#PBS -o %s.outlog \n',modelname);
 			 fprintf(fid,'#PBS -e %s.errlog \n\n',modelname);
@@ -92,5 +93,5 @@
 			 fprintf(fid,'source $ISSM_DIR/etc/environment.sh\n');       %FIXME
 			 fprintf(fid,'cd %s/%s\n\n',cluster.executionpath,modelname);
-			 fprintf(fid,'mpiexec -np %i %s/kriging.exe %s %s\n',cluster.np,cluster.codepath,[cluster.executionpath '/' modelname],modelname);
+			 fprintf(fid,'mpiexec_mpt -n %i %s/kriging.exe %s %s\n',cluster.np,cluster.codepath,[cluster.executionpath '/' modelname],modelname);
 			 if ~io_gather, %concatenate the output files:
 				 fprintf(fid,'cat %s.outbin.* > %s.outbin',modelname,modelname);
@@ -111,9 +112,10 @@
 			 fprintf(fid,'#PBS -S /bin/bash\n');
 			 fprintf(fid,'#PBS -N %s\n',modelname);
-			 fprintf(fid,'#PBS -q %s \n',cluster.queue);
-			 fprintf(fid,'#PBS -l select=%i:ncpus=%i:model=%s\n',cluster.numnodes,cluster.cpuspernode,cluster.processor);
-			 fprintf(fid,'#PBS -l walltime=%i\n',cluster.time*60); %walltime is in seconds.
-			 fprintf(fid,'#PBS -A %s\n',cluster.accountname);
-			 fprintf(fid,'#PBS -l mem=%igb\n',cluster.memory);
+%			 fprintf(fid,'#PBS -q %s \n',cluster.queue);
+             fprintf(fid,'#PBS -l select=%i:ncpus=%i:mpiprocs=%i\n',cluster.numnodes,cluster.cpuspernode,16);
+             %fprintf(fid,'#PBS -l select=%i:ncpus=%i\n',cluster.numnodes,cluster.cpuspernode);
+			 fprintf(fid,'#PBS -l walltime=%s\n',cluster.time); %walltime is in seconds.
+                         fprintf(fid,'#PBS -A %s\n',cluster.accountname);
+%			 fprintf(fid,'#PBS -l mem=%igb\n',cluster.memory);
 %			 fprintf(fid,'#PBS -M mmorligh@uci.edu\n');
 			 fprintf(fid,'#PBS -o %s.outlog \n',modelname);
@@ -122,5 +124,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,EnumToString(solution),[cluster.executionpath '/' dirname],modelname);
+			 fprintf(fid,'mpiexec_mpt -n %i %s/issm.exe %s %s %s\n',cluster.np,cluster.codepath,EnumToString(solution),[cluster.executionpath '/' dirname],modelname);
 			 if ~io_gather, %concatenate the output files:
 				 fprintf(fid,'cat %s.outbin.* > %s.outbin',modelname,modelname);