Changeset 10947

Timestamp:

11/29/11 07:53:25 (13 years ago)

Author:

Mathieu Morlighem

Message:

Fixed plot mesh for export_fig and added queues in pfe

Location:

issm/trunk-jpl/src/m

Files:

• classes/clusters/pfe.m (modified) (1 diff)
• model/plot/plot_mesh.m (modified) (1 diff)

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

@@ -67 +67 @@
                  function checkconsistency(cluster,md,solution,analyses) % {{{1
 
-                         available_queues={'long','debug'};
-                         queue_requirements_time=[7200 120];
-                         queue_requirements_np=[2048 150];
+                         available_queues={'long','normal','debug'};
+                         queue_requirements_time=[5*24*60 8*60 2*60];
+                         queue_requirements_np=[2048 2048 150];
 
                          QueueRequirements(available_queues,queue_requirements_time,queue_requirements_np,cluster.queue,cluster.np,cluster.time)

issm/trunk-jpl/src/m/model/plot/plot_mesh.m

@@ -20 +20 @@
 if is2d
         A=elements(:,1); B=elements(:,2); C=elements(:,3); 
-        patch( 'Faces', [A B C], 'Vertices', [x y z],'FaceVertexCData', [1 1 1],'FaceColor','none','EdgeColor',edgecolor,'linewidth',linewidth);
+        patch( 'Faces', [A B C], 'Vertices', [x y z],'FaceVertexCData',zeros(size(x)),'FaceColor','none','EdgeColor',edgecolor,'linewidth',linewidth);
 else
         if ~isplanet,
                 A=elements(:,1); B=elements(:,2); C=elements(:,3); D=elements(:,4); E=elements(:,5); F=elements(:,6);
-                patch( 'Faces', [A B C],  'Vertices', [x y z],'FaceVertexCData', [1 1 1],'FaceColor','none','EdgeColor',edgecolor,'linewidth',linewidth);
-                patch( 'Faces', [D E F],  'Vertices', [x y z],'FaceVertexCData', [1 1 1],'FaceColor','none','EdgeColor',edgecolor,'linewidth',linewidth);
-                patch( 'Faces', [A B E D],'Vertices', [x y z],'FaceVertexCData', [1 1 1],'FaceColor','none','EdgeColor',edgecolor,'linewidth',linewidth);
-                patch( 'Faces', [B E F C],'Vertices', [x y z],'FaceVertexCData', [1 1 1],'FaceColor','none','EdgeColor',edgecolor,'linewidth',linewidth);
-                patch( 'Faces', [C A D F],'Vertices', [x y z],'FaceVertexCData', [1 1 1],'FaceColor','none','EdgeColor',edgecolor,'linewidth',linewidth);
+                patch( 'Faces', [A B C],  'Vertices', [x y z],'FaceVertexCData',zeros(size(x)),'FaceColor','none','EdgeColor',edgecolor,'linewidth',linewidth);
+                patch( 'Faces', [D E F],  'Vertices', [x y z],'FaceVertexCData',zeros(size(x)),'FaceColor','none','EdgeColor',edgecolor,'linewidth',linewidth);
+                patch( 'Faces', [A B E D],'Vertices', [x y z],'FaceVertexCData',zeros(size(x)),'FaceColor','none','EdgeColor',edgecolor,'linewidth',linewidth);
+                patch( 'Faces', [B E F C],'Vertices', [x y z],'FaceVertexCData',zeros(size(x)),'FaceColor','none','EdgeColor',edgecolor,'linewidth',linewidth);
+                patch( 'Faces', [C A D F],'Vertices', [x y z],'FaceVertexCData',zeros(size(x)),'FaceColor','none','EdgeColor',edgecolor,'linewidth',linewidth);
         else
                 A=elements(:,1); B=elements(:,2); C=elements(:,3); 
                 if (size(elements,2)==4), D=elements(:,4); else D=C; end
-                patch( 'Faces', [A B C D],  'Vertices', [x y z],'FaceVertexCData', [1 1 1],'FaceColor','none','EdgeColor',edgecolor,'linewidth',linewidth);
+                patch( 'Faces', [A B C D],  'Vertices', [x y z],'FaceVertexCData',zeros(size(x)),'FaceColor','none','EdgeColor',edgecolor,'linewidth',linewidth);
         end
 end