Changeset 7380

Timestamp:

02/07/11 16:23:42 (14 years ago)

Author:

seroussi

Message:

added all type of elements in plot_elements_type

File:

• issm/trunk/src/m/model/plot/plot_elementstype.m (modified) (3 diffs)

issm/trunk/src/m/model/plot/plot_elementstype.m

@@ -35 +35 @@
         p5=patch( 'Faces', [A B C], 'Vertices', [x y z],'CData',MacAyealPattynApproximationEnum,'FaceColor','flat','EdgeColor',edgecolor);
         %Stokes elements
-        alpha=0.35;
         posS=find(data==StokesApproximationEnum);
-        if ~isempty(posS)
-                A=elements(posS,1); B=elements(posS,2); C=elements(posS,3);
-        %       p4=patch( 'Faces', [A B C], 'Vertices', [x y z],'CData',StokesApproximationEnum,'FaceColor','flat','EdgeColor',edgecolor,'EdgeAlpha',alpha,'FaceAlpha',alpha);
-        %       legend([p1 p2 p3 p4],'Hutter''s elements','MacAyeal''s elements','Pattyn''s elements','Stokes''s elements');
-        else
-                legend([p1 p2 p3 p5],'Hutter''s elements','MacAyeal''s elements','Pattyn''s elements','MacAyealPattyn''s elements');
-        end
+        A=elements(posS,1); B=elements(posS,2); C=elements(posS,3); 
+        p6=patch( 'Faces', [A B C], 'Vertices', [x y z],'CData',StokesApproximationEnum,'FaceColor','flat','EdgeColor',edgecolor);
+        %MacAyealStokes elements
+        posMS=find(data==MacAyealStokesApproximationEnum);
+        A=elements(posMS,1); B=elements(posMS,2); C=elements(posMS,3); 
+        p7=patch( 'Faces', [A B C], 'Vertices', [x y z],'CData',MacAyealStokesApproximationEnum,'FaceColor','flat','EdgeColor',edgecolor);
+        %PattynStokes elements
+        posPS=find(data==PattynStokesApproximationEnum);
+        A=elements(posPS,1); B=elements(posPS,2); C=elements(posPS,3); 
+        p8=patch( 'Faces', [A B C], 'Vertices', [x y z],'CData',PattynStokesApproximationEnum,'FaceColor','flat','EdgeColor',edgecolor);
+        legend([p1 p2 p3 p5 p6 p7 p8],'Hutter''s elements','MacAyeal''s elements','Pattyn''s elements','MacAyealPattyn''s elements','Stokes''s elements','MacAyealStokes''s elements','PattynStokes''s elements');
 else
         %Hutter elements
@@ -70 +73 @@
         patch( 'Faces', [C A D F],'Vertices', [x y z],'CData', PattynApproximationEnum,'FaceColor','flat','EdgeColor',edgecolor);
         %Stokes elements
+        save data data
         posS=find(data==StokesApproximationEnum);
         A=elements(posS,1); B=elements(posS,2); C=elements(posS,3); D=elements(posS,4); E=elements(posS,5); F=elements(posS,6);
@@ -93 +97 @@
         patch( 'Faces', [B E F C],'Vertices', [x y z],'CData', PattynStokesApproximationEnum,'FaceColor','flat','EdgeColor',edgecolor);
         patch( 'Faces', [C A D F],'Vertices', [x y z],'CData', PattynStokesApproximationEnum,'FaceColor','flat','EdgeColor',edgecolor);
-        legend([p1 p2 p3 p4 p5 p6],'Hutter''s elements','MacAyeal''s elements','Pattyn''s elements','Stokes''s elements','MacAyealPattyn''s elements','PattynStokes''s elements');
+        %MacAyealStokes elements
+        PosMS=find(data==MacAyealStokesApproximationEnum);
+        A=elements(PosMS,1); B=elements(PosMS,2); C=elements(PosMS,3); D=elements(PosMS,4); E=elements(PosMS,5); F=elements(PosMS,6);
+        p7=patch( 'Faces', [A B C],'Vertices', [x y z],'CData', MacAyealStokesApproximationEnum,'FaceColor','flat','EdgeColor',edgecolor);
+        patch( 'Faces', [D E F],  'Vertices', [x y z],'CData', MacAyealStokesApproximationEnum,'FaceColor','flat','EdgeColor',edgecolor);
+        patch( 'Faces', [A B E D],'Vertices', [x y z],'CData', MacAyealStokesApproximationEnum,'FaceColor','flat','EdgeColor',edgecolor);
+        patch( 'Faces', [B E F C],'Vertices', [x y z],'CData', MacAyealStokesApproximationEnum,'FaceColor','flat','EdgeColor',edgecolor);
+        patch( 'Faces', [C A D F],'Vertices', [x y z],'CData', MacAyealStokesApproximationEnum,'FaceColor','flat','EdgeColor',edgecolor);
+        legend([p1 p2 p3 p4 p5 p6 p7],'Hutter''s elements','MacAyeal''s elements','Pattyn''s elements','Stokes''s elements','MacAyealPattyn''s elements','PattynStokes''s elements','MacAyealStokes''s elements');
 end