Changeset 2695

Timestamp:

12/02/09 08:01:09 (15 years ago)

Author:

Mathieu Morlighem

Message:

lots of good modifs of rift plots

Location:

issm/trunk/src/m/classes/public/plot

Files:

• plot_riftfraction.m (modified) (3 diffs)
• plot_riftpenetration.m (modified) (6 diffs)
• plot_riftrelvel.m (modified) (6 diffs)
• plot_rifts.m (modified) (4 diffs)
• plot_riftvel.m (modified) (6 diffs)
• plotdoc.m (modified) (1 diff)

issm/trunk/src/m/classes/public/plot/plot_riftfraction.m

@@ -1 +1 @@
 function plot_riftfraction(md,options,width,i);
-%PLOT_RIFTRELVEL - plot rift fractions
+%PLOT_RIFTFRACTION - plot rift fractions
 %
 %   Usage:
@@ -7 +7 @@
 %   See also: PLOTMODEL
 
+%process data and model
+[x y z elements is2d]=processmesh(md,options);
+
+subplot(width,width,i); 
+hold on
+
 %plot mesh boundaries
-subplot(width,width,i); 
-
-%units
-if exist(options,'unit'),
-        unit=getfieldvalue(options,'unit');
-        md.x=md.x*unit;
-        md.y=md.y*unit;
-        md.z=md.z*unit;
-end
-
 for i=1:size(md.segments,1),
-        h1=plot(md.x(md.segments(i,1:2)),md.y(md.segments(i,1:2)),'k.-');hold on;
+        h1=plot(x(md.segments(i,1:2)),y(md.segments(i,1:2)),'k.-');
 end
 
@@ -38 +34 @@
 for i=1:length(md.rifts), 
         segments=md.rifts(i).segments(:,1:2)';
-        xc=md.x(segments(:));
-        yc=md.y(segments(:));
+        xc=x(segments(:));
+        yc=y(segments(:));
         zc=fractions(segments(:));
         h2=patch('Xdata',xc,'Ydata',yc,'Zdata',zc,'Cdata',zc,'facecolor','none','edgecolor','flat');
 end
 legend([h1,h2],'mesh boundaries','rifts')
+hold off
 
 %apply options
-options=addfielddefault(options,'title','Rift relative velocities');
+options=addfielddefault(options,'title','Rift ice/water fraction ???????'); %Eric, could you enter a better title?
 options=addfielddefault(options,'colorbar',0);
 applyoptions(md,[],options);

issm/trunk/src/m/classes/public/plot/plot_riftpenetration.m

@@ -7 +7 @@
 %   See also: PLOTMODEL
 
+%process data and model
+[x y z elements is2d]=processmesh(md,options);
+
+subplot(width,width,i); 
+hold on
+
 %plot mesh boundaries
-subplot(width,width,i); 
-
-%units
-if exist(options,'unit'),
-        unit=getfieldvalue(options,'unit');
-        md.x=md.x*unit;
-        md.y=md.y*unit;
-        md.z=md.z*unit;
+for i=1:size(md.segments,1),
+        plot(x(md.segments(i,1:2)),y(md.segments(i,1:2)),'k.-');
 end
-
-for i=1:size(md.segments,1),
-        plot(md.x(md.segments(i,1:2)),md.y(md.segments(i,1:2)),'k.-');hold on;
-end
-
-hold on;
 
 isp1=0;
@@ -30 +24 @@
         %plot mesh boundaries
         for i=1:size(md.segments,1),
-                h1=plot(md.x(md.segments(i,1:2)),md.y(md.segments(i,1:2)),'b-');
+                h1=plot(x(md.segments(i,1:2)),y(md.segments(i,1:2)),'b-');
         end
         for i=1:size(md.rifts,1),
@@ -37 +31 @@
                 segments=md.rifts(i).segments;
                 for j=1:size(segments,1),
-                        plot(md.x(segments(j,1:2)),md.y(segments(j,1:2)),'b-');
+                        plot(x(segments(j,1:2)),y(segments(j,1:2)),'b-');
                 end
 
@@ -52 +46 @@
                         %if penetration is negative, plot in black, positive, plot in red;: ie: if rift is closing, black, if rift is opening, red.
                         if(penetration>0),
-                                p2=plot(md.x(penaltypairs(j,1)) ,md.y(penaltypairs(j,1)),'r*');
+                                p2=plot(x(penaltypairs(j,1)) ,y(penaltypairs(j,1)),'r*');
                                 isp2=1;
                         else
-                                p1=plot(md.x(penaltypairs(j,1)) ,md.y(penaltypairs(j,1)),'k*');
+                                p1=plot(x(penaltypairs(j,1)) ,y(penaltypairs(j,1)),'k*');
                                 isp1=1;
                         end
@@ -61 +55 @@
 
                 %point out the tips
-                h2=plot(md.x(md.rifts(i).tips(1)),md.y(md.rifts(i).tips(1)),'g*');
-                plot(md.x(md.rifts(i).tips(2)),md.y(md.rifts(i).tips(2)),'g*');
+                h2=plot(x(md.rifts(i).tips(1)),y(md.rifts(i).tips(1)),'g*');
+                plot(x(md.rifts(i).tips(2)),y(md.rifts(i).tips(2)),'g*');
         end
         if isp1 & isp2
@@ -76 +70 @@
         error('plot error message: no rifts available!');
 end
+hold off
 
 %apply options

issm/trunk/src/m/classes/public/plot/plot_riftrelvel.m

@@ -7 +7 @@
 %   See also: PLOTMODEL
 
+%process data and model
+[x y z elements is2d]=processmesh(md,options);
+
+subplot(width,width,i); 
+hold on
+
 %plot mesh boundaries
-subplot(width,width,i); 
-
-%units
-if exist(options,'unit'),
-        unit=getfieldvalue(options,'unit');
-        md.x=md.x*unit;
-        md.y=md.y*unit;
-        md.z=md.z*unit;
-end
-
 for i=1:size(md.segments,1),
-        plot(md.x(md.segments(i,1:2)),md.y(md.segments(i,1:2)),'k.-');hold on;
+        plot(x(md.segments(i,1:2)),y(md.segments(i,1:2)),'k.-');
 end
 
 %plot rift velocities
-hold on;
-
 isp1=0;
 isp2=0;
@@ -31 +25 @@
         %plot mesh boundaries
         for i=1:size(md.segments,1),
-                h1=plot(md.x(md.segments(i,1:2)),md.y(md.segments(i,1:2)),'b-');
+                h1=plot(x(md.segments(i,1:2)),y(md.segments(i,1:2)),'b-');
         end
         for i=1:size(md.rifts,1),
@@ -38 +32 @@
                 segments=md.rifts(i).segments;
                 for j=1:size(segments,1),
-                        plot(md.x(segments(j,1:2)),md.y(segments(j,1:2)),'b-');
+                        plot(x(segments(j,1:2)),y(segments(j,1:2)),'b-');
                 end
 
@@ -50 +44 @@
                         %if penetration is negative, plot in black, positive, plot in red;: ie: if rift is closing, black, if rift is opening, red.
                         if(penetration>0),
-                                p2=plot(md.x(penaltypairs(j,1)) ,md.y(penaltypairs(j,1)),'r*');
+                                p2=plot(x(penaltypairs(j,1)) ,y(penaltypairs(j,1)),'r*');
                                 isp2=1;
                         else
-                                p1=plot(md.x(penaltypairs(j,1)) ,md.y(penaltypairs(j,1)),'k*');
+                                p1=plot(x(penaltypairs(j,1)) ,y(penaltypairs(j,1)),'k*');
                                 isp1=1;
                         end
@@ -59 +53 @@
 
                 %point out the tips
-                h2=plot(md.x(md.rifts(i).tips(1)),md.y(md.rifts(i).tips(1)),'g*');
-                plot(md.x(md.rifts(i).tips(2)),md.y(md.rifts(i).tips(2)),'g*');
+                h2=plot(x(md.rifts(i).tips(1)),y(md.rifts(i).tips(1)),'g*');
+                plot(x(md.rifts(i).tips(2)),y(md.rifts(i).tips(2)),'g*');
 
                 %plot relative velocities
-                h=quiver(md.x(penaltypairs(:,1)),md.y(penaltypairs(:,1)),md.vx(penaltypairs(:,2))-md.vx(penaltypairs(:,1)),md.vy(penaltypairs(:,2))-md.vy(penaltypairs(:,1)));
+                h=quiver(x(penaltypairs(:,1)),y(penaltypairs(:,1)),md.vx(penaltypairs(:,2))-md.vx(penaltypairs(:,1)),md.vy(penaltypairs(:,2))-md.vy(penaltypairs(:,1)));
                 set(h,'Color',[0 1 0]);
         end
@@ -78 +72 @@
         error('plot error message: no rifts available!');
 end
+hold off
 
 %apply options

issm/trunk/src/m/classes/public/plot/plot_rifts.m

@@ -1 +1 @@
 function plot_rifts(md,options,width,i);
-%PLOT_RIFTVEL - plot rifts in a mesh
+%PLOT_RIFTS - plot rifts in a mesh
 %
 %   Usage:
@@ -7 +7 @@
 %   See also: PLOTMODEL
 
-%plot mesh boundaries
+%process data and model
+[x y z elements is2d]=processmesh(md,options);
+
+%plot mesh
 subplot(width,width,i); 
 
-%units
-if exist(options,'unit'),
-        unit=getfieldvalue(options,'unit');
-        md.x=md.x*unit;
-        md.y=md.y*unit;
-        md.z=md.z*unit;
-end
-
-if exist(options,'offset'),
-        offset=getfieldvalue(options,'offset');
-else
-        offset=500;
-end
-
-
-%plot rifts
-hold on;
-
-isp1=0;
-isp2=0;
-                        
 %offset to separate rift flanks.
-
+offset=getfieldvalue(options,'offset',500);
 if isstruct(md.rifts),
         
@@ -42 +24 @@
                         normal(1)=penaltypairs(j,5);
                         normal(2)=penaltypairs(j,6);
-                        md.x(penaltypairs(j,1))=md.x(penaltypairs(j,1))-normal(1)*offset;
-                        md.y(penaltypairs(j,1))=md.y(penaltypairs(j,1))-normal(2)*offset;
+                        x(penaltypairs(j,1))=x(penaltypairs(j,1))-normal(1)*offset;
+                        y(penaltypairs(j,1))=y(penaltypairs(j,1))-normal(2)*offset;
                 end
         end
 end
-
-%process data and model
-[x y z elements is2d]=processmesh(md,options);
-
-%plot mesh
-subplot(width,width,i); 
 
 %plot mesh
@@ -67 +43 @@
 end
 
-
 %apply options
 options=addfielddefault(options,'title','Rifts');

issm/trunk/src/m/classes/public/plot/plot_riftvel.m

@@ -7 +7 @@
 %   See also: PLOTMODEL
 
+%process data and model
+[x y z elements is2d]=processmesh(md,options);
+
+subplot(width,width,i); 
+hold on
+
 %plot mesh boundaries
-subplot(width,width,i); 
-
-%units
-if exist(options,'unit'),
-        unit=getfieldvalue(options,'unit');
-        md.x=md.x*unit;
-        md.y=md.y*unit;
-        md.z=md.z*unit;
-end
-
 for i=1:size(md.segments,1),
-        plot(md.x(md.segments(i,1:2)),md.y(md.segments(i,1:2)),'k.-');hold on;
+        plot(x(md.segments(i,1:2)),y(md.segments(i,1:2)),'k.-');
 end
 
 %plot rift velocities
-hold on;
-
 isp1=0;
 isp2=0;
@@ -31 +25 @@
         %plot mesh boundaries
         for i=1:size(md.segments,1),
-                h1=plot(md.x(md.segments(i,1:2)),md.y(md.segments(i,1:2)),'b-');
+                h1=plot(x(md.segments(i,1:2)),y(md.segments(i,1:2)),'b-');
         end
         for i=1:size(md.rifts,1),
@@ -38 +32 @@
                 segments=md.rifts(i).segments;
                 for j=1:size(segments,1),
-                        plot(md.x(segments(j,1:2)),md.y(segments(j,1:2)),'b-');
+                        plot(x(segments(j,1:2)),y(segments(j,1:2)),'b-');
                 end
 
@@ -50 +44 @@
                         %if penetration is negative, plot in black, positive, plot in red;: ie: if rift is closing, black, if rift is opening, red.
                         if(penetration>0),
-                                p2=plot(md.x(penaltypairs(j,1)) ,md.y(penaltypairs(j,1)),'r*');
+                                p2=plot(x(penaltypairs(j,1)) ,y(penaltypairs(j,1)),'r*');
                                 isp2=1;
                         else
-                                p1=plot(md.x(penaltypairs(j,1)) ,md.y(penaltypairs(j,1)),'k*');
+                                p1=plot(x(penaltypairs(j,1)) ,y(penaltypairs(j,1)),'k*');
                                 isp1=1;
                         end
@@ -59 +53 @@
 
                 %point out the tips
-                h2=plot(md.x(md.rifts(i).tips(1)),md.y(md.rifts(i).tips(1)),'g*');
-                plot(md.x(md.rifts(i).tips(2)),md.y(md.rifts(i).tips(2)),'g*');
+                h2=plot(x(md.rifts(i).tips(1)),y(md.rifts(i).tips(1)),'g*');
+                plot(x(md.rifts(i).tips(2)),y(md.rifts(i).tips(2)),'g*');
                 segments=md.rifts(i).segments(:,1:2);
-                h3=quiver(md.x(segments),md.y(segments),md.vx(segments),md.vy(segments));
+                h3=quiver(x(segments),y(segments),md.vx(segments),md.vy(segments));
                 set(h3,'Color',[1 0 0]);
         end
@@ -77 +71 @@
         error('plot error message: no rifts available!');
 end
+hold off
 
 %apply options

issm/trunk/src/m/classes/public/plot/plotdoc.m

@@ -30 +30 @@
 disp('                  - ''riftpenetration'': penetration levels for a fault');
 disp('                  - ''riftfraction'': fill fractions for every node of the rifts');
+disp('                  - ''rifts'': plot mesh with an offset so that rifts are visible');
 disp('                  - ''strainrate_tensor'': plot the components of the strainrate tensor (exx,eyy,ezz,exy,exz,eyz) if computed');
 disp('                  - ''strainrate_principal'': plot the strainrate tensor principal axis and principal values)');