Index: /issm/trunk/src/m/classes/clusters/pfe.m
===================================================================
--- /issm/trunk/src/m/classes/clusters/pfe.m	(revision 6377)
+++ /issm/trunk/src/m/classes/clusters/pfe.m	(revision 6378)
@@ -10,5 +10,5 @@
 		 % {{{1
 		 name='pfe'
-		 login='elarour';
+		 login='';
 		 numnodes=20;
 		 cpuspernode=8; 
@@ -17,6 +17,6 @@
 		 time=12*60;
 		 processor='neh';
-		 codepath='/staff/elarour/trunk/bin';
-		 executionpath='/nobackupp10/elarour/execution/pleiades';
+		 codepath='';
+		 executionpath='';
 		 interactive=0;
 		 bbftp=0;
@@ -30,4 +30,9 @@
 	 methods
 		 function cluster=pfe(varargin) % {{{1
+
+			 %initialize cluster using default settings if provided
+			 if (exist('pfe_settings')==2), pfe_settings; end
+
+			 %use provided options to change fields
 			 options=pairoptions(varargin{:});
 			 for i=1:size(options.list,1),
@@ -92,4 +97,9 @@
 				 error('IsConsistent error message: unknown processor type, should be ''neh'',''wes'' or ''har''');
 			 end
+
+			 %Miscelaneous
+			 if isempty(cluster.login), error('IsConsistent error message: login empty'); end
+			 if isempty(cluster.codepath), error('IsConsistent error message: codepath empty'); end
+			 if isempty(cluster.executionpath), error('IsConsistent error message: executionpath empty'); end
 
 		 end
@@ -182,8 +192,4 @@
 				disp('launching solution sequence on remote cluster');
 				issmssh(cluster.name,cluster.login,cluster.port,launchcommand);
-					
-				if cluster.interactive,
-					error('done uploading files to interactive directory on remote cluster');
-				end
 
 			else
Index: /issm/trunk/src/m/contrib/larour/pfe_settings.m
===================================================================
--- /issm/trunk/src/m/contrib/larour/pfe_settings.m	(revision 6378)
+++ /issm/trunk/src/m/contrib/larour/pfe_settings.m	(revision 6378)
@@ -0,0 +1,13 @@
+cluster.login='elarour';
+cluster.numnodes=20;
+cluster.cpuspernode=8; 
+cluster.port=1025;
+cluster.queue='long';
+cluster.time=12*60;
+cluster.processor='neh';
+cluster.codepath='/staff/elarour/trunk/bin';
+cluster.executionpath='/nobackupp10/elarour/execution/pleiades';
+cluster.interactive=0;
+cluster.bbftp=0;
+cluster.numstreams=8;
+cluster.hyperthreading=0;
Index: /issm/trunk/src/m/contrib/morlighe/pfe_settings.m
===================================================================
--- /issm/trunk/src/m/contrib/morlighe/pfe_settings.m	(revision 6378)
+++ /issm/trunk/src/m/contrib/morlighe/pfe_settings.m	(revision 6378)
@@ -0,0 +1,13 @@
+cluster.login='mmorligh';
+cluster.numnodes=20;
+cluster.cpuspernode=8; 
+cluster.port=1025;
+cluster.queue='long';
+cluster.time=12*60;
+cluster.processor='neh';
+cluster.codepath='/home1/mmorligh/trunk/bin';
+cluster.executionpath='/nobackupp20/mmorligh/execution/pleiades/';
+cluster.interactive=0;
+cluster.bbftp=0;
+cluster.numstreams=8;
+cluster.hyperthreading=0;
Index: /issm/trunk/src/m/contrib/seroussi/pfe_settings.m
===================================================================
--- /issm/trunk/src/m/contrib/seroussi/pfe_settings.m	(revision 6378)
+++ /issm/trunk/src/m/contrib/seroussi/pfe_settings.m	(revision 6378)
@@ -0,0 +1,13 @@
+cluster.login='hserouss';
+cluster.numnodes=20;
+cluster.cpuspernode=8; 
+cluster.port=1025;
+cluster.queue='long';
+cluster.time=12*60;
+cluster.processor='neh';
+cluster.codepath='/staff/hserouss/trunk/bin';
+cluster.executionpath='/nobackupp10/hserouss/execution/pleiades/';
+cluster.interactive=0;
+cluster.bbftp=0;
+cluster.numstreams=8;
+cluster.hyperthreading=0;
Index: /issm/trunk/src/m/model/solveparallel.m
===================================================================
--- /issm/trunk/src/m/model/solveparallel.m	(revision 6377)
+++ /issm/trunk/src/m/model/solveparallel.m	(revision 6378)
@@ -29,5 +29,5 @@
 
 	%Do we return, or just wait for results?
-	if (md.waitonlock~=0 &  ~strcmpi(options.batch,'yes')),
+	if (md.waitonlock>0 &  ~strcmpi(options.batch,'yes')),
 		%we wait for the done file
 		islock=waitonlock(md);
Index: /issm/trunk/src/m/model/waitonlock.m
===================================================================
--- /issm/trunk/src/m/model/waitonlock.m	(revision 6377)
+++ /issm/trunk/src/m/model/waitonlock.m	(revision 6378)
@@ -19,43 +19,11 @@
 if ~strcmpi(oshostname(),cluster),
 
-	if port, 
-		%there is a tunnel, so we have a short at looking for the lock file.
-
-		disp(['waiting for ' filename ' hold on... (Ctrl+C to exit)'])
-		time=0; ispresent=0;
-		while (ispresent==0 & time<timelimit)
-			[status, result]=system(['ssh -q -p ' num2str(port) ' ' login '@localhost "if ( -e ' executionpath '/' md.runtimename '/' md.name '.lock ) echo 1"']);
-			if ~isempty(result),
-				if ismember('1',result),
-					ispresent=1;
-				else
-					ispresent=0;
-				end
-			else
-				ispresent=0;
-			end
-			pause(10); %tunnel can be unstable, let's not use it too much
-			time=time+1/60;
-		end
-		disp(['waitonlock: lock detected, with value of result:|' result '|']);
-		
-		%build output
-		if (time>timelimit),
-			disp('Time limit exceeded. Increase md.waitonlock');
-			disp('The results must be loaded manually with md=loadresultsfromcluster(md).');
-			error(['waitonlock error message: time limit exceeded']);
-			flag=0;
-		else
-			flag=1;
-		end
+	disp('solution launched on remote cluster. log in to detect job completion.');
+	choice=input('Is the job successfully completed? (y/n)','s');
+	if ~strcmp(choice,'y'), 
+		disp('Results not loaded... exiting'); 
+		flag=0;
 	else
-		disp('solution launched on remote cluster. log in to detect job completion.');
-		choice=input('Is the job successfully completed? (y/n)','s');
-		if ~strcmp(choice,'y'), 
-			disp('Results not loaded... exiting'); 
-			flag=0;
-		else
-			flag=1;
-		end
+		flag=1;
 	end