Changeset 18739

Timestamp:

11/05/14 15:52:15 (10 years ago)

Author:

Mathieu Morlighem

Message:

CHG: reverting Sylvester's commit

Location:

issm/trunk-jpl/src/m

Files:

• boundaryconditions/SetMarineIceSheetBC.m (modified) (1 diff)
• classes/clusters/hpc.m (modified) (1 diff)
• os/oshostname.m (modified) (1 diff)
• solve/waitonlock.m (modified) (1 diff)

issm/trunk-jpl/src/m/boundaryconditions/SetMarineIceSheetBC.m

@@ -54 +54 @@
 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;

issm/trunk-jpl/src/m/classes/clusters/hpc.m

@@ -50 +50 @@
                  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)

issm/trunk-jpl/src/m/os/oshostname.m

@@ -5 +5 @@
 %
 %
-hostname='sylvestre';
-return;
 
 if ispc(),

issm/trunk-jpl/src/m/solve/waitonlock.m

@@ -61 +61 @@
                 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)));