Index: ../trunk-jpl/src/m/os/oshostname.m
===================================================================
--- ../trunk-jpl/src/m/os/oshostname.m	(revision 18738)
+++ ../trunk-jpl/src/m/os/oshostname.m	(revision 18739)
@@ -4,8 +4,6 @@
 %   usage: hostname=oshostname();
 %
 %
-hostname='sylvestre';
-return;
 
 if ispc(),
 	[status,hostname]=system('hostname');
Index: ../trunk-jpl/src/m/solve/waitonlock.m
===================================================================
--- ../trunk-jpl/src/m/solve/waitonlock.m	(revision 18738)
+++ ../trunk-jpl/src/m/solve/waitonlock.m	(revision 18739)
@@ -60,7 +60,7 @@
 		ispresent=(exist(lockfilename,'file') & exist(logfilename,'file'));
 		time=etime(clock,time0)/60;
 	else
-		pause(60);
+		pause(5);
 		time=etime(clock,time0);
 		fprintf('\rchecking for job completion (time: %i min %i sec)      ',floor(time/60),floor(rem(time,60)));
 		time=time/60; %converts time from sec to min
Index: ../trunk-jpl/src/m/boundaryconditions/SetMarineIceSheetBC.m
===================================================================
--- ../trunk-jpl/src/m/boundaryconditions/SetMarineIceSheetBC.m	(revision 18738)
+++ ../trunk-jpl/src/m/boundaryconditions/SetMarineIceSheetBC.m	(revision 18739)
@@ -53,25 +53,15 @@
 %First find segments that are not completely on the front
 if strcmp(elementtype(md.mesh),'Penta'),
 	numbernodesfront=4;
-	%I added the next part. If not, there would be no segments !
-	md.mesh.vertexconnectivity=NodeConnectivity(md.mesh.elements2d,md.mesh.numberofvertices2d);
-	md.mesh.elementconnectivity=ElementConnectivity(md.mesh.elements2d,md.mesh.vertexconnectivity);
-	segments2=contourenvelope(md);
-	md.mesh.vertexonboundary=zeros(md.mesh.numberofvertices/md.mesh.numberoflayers,1); md.mesh.vertexonboundary(segments2(:,1:2))=1;
-	md.mesh.vertexonboundary=repmat(md.mesh.vertexonboundary,md.mesh.numberoflayers,1);
-	%Then do it for 3d as usual
-	md.mesh.vertexconnectivity=NodeConnectivity(md.mesh.elements,md.mesh.numberofvertices);
-	md.mesh.elementconnectivity=ElementConnectivity(md.mesh.elements,md.mesh.vertexconnectivity);
 elseif strcmp(elementtype(md.mesh),'Tria'),
 	numbernodesfront=2;
-	segments2=md.mesh.segments;
 else
 	error('mesh type not supported yet');
 end
-segmentsfront=md.mask.ice_levelset(segments2(:,1:numbernodesfront))==0;
+segmentsfront=md.mask.ice_levelset(md.mesh.segments(:,1:numbernodesfront))==0;
 segments=find(sum(segmentsfront,2)~=numbernodesfront);
 %Find all nodes for these segments and spc them
-pos=segments2(segments,1:numbernodesfront);
+pos=md.mesh.segments(segments,1:numbernodesfront);
 md.stressbalance.spcvx(pos(:))=0;
 md.stressbalance.spcvy(pos(:))=0;
 md.stressbalance.spcvz(pos(:))=0; % FIXME probably shouldn't spc vertical velocity here
Index: ../trunk-jpl/src/m/classes/clusters/hpc.m
===================================================================
--- ../trunk-jpl/src/m/classes/clusters/hpc.m	(revision 18738)
+++ ../trunk-jpl/src/m/classes/clusters/hpc.m	(revision 18739)
@@ -49,9 +49,9 @@
 		 %}}}
 		 function md = checkconsistency(cluster,md,solution,analyses) % {{{
 
-			 available_queues={'pub64','free64','free48','free*,pub64','free*','free*,free64'};
-			 queue_requirements_time=[Inf Inf Inf Inf Inf Inf];
-			 queue_requirements_np=[64 64 48 48 48 48];
+			 available_queues={'pub64','free64','free48','free*,pub64','free*'};
+			 queue_requirements_time=[Inf Inf Inf Inf Inf];
+			 queue_requirements_np=[64 64 48 48 48];
 
 			 QueueRequirements(available_queues,queue_requirements_time,queue_requirements_np,cluster.queue,cluster.np,1)
 
