Changeset 3202

Timestamp:

03/05/10 14:49:35 (15 years ago)

Author:

Eric.Larour

Message:

corrections for plots

Location:

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

Files:

• plot_manager.m (modified) (1 diff)
• plot_riftfraction.m (modified) (2 diffs)
• plot_riftpenetration.m (modified) (2 diffs)
• plot_riftrelvel.m (modified) (7 diffs)
• plot_rifts.m (modified) (2 diffs)
• plot_riftvel.m (modified) (6 diffs)
• quiver_colorbar.m (modified) (1 diff)

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

@@ -61 +61 @@
                         return;
                 case 'riftvel',
-                        plot_riftvel(md,options,subplotwidth,i);
+                        plot_riftvel(md,options,nlines,ncols,i);
                         return;
                 case 'rifts',
-                        plot_rifts(md,options,subplotwidth,i);
+                        plot_rifts(md,options,nlines,ncols,i);
                         return;
                 case 'riftrelvel',
-                        plot_riftrelvel(md,options,subplotwidth,i);
+                        plot_riftrelvel(md,options,nlines,ncols,i);
                         return;
                 case 'riftpenetration',
-                        plot_riftpenetration(md,options,subplotwidth,i);
+                        plot_riftpenetration(md,options,nlines,ncols,i);
                         return;
                 case 'riftfraction',
-                        plot_riftfraction(md,options,subplotwidth,i);
+                        plot_riftfraction(md,options,nlines,ncols,i);
                         return;
                 case 'sarpwr',

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

@@ -1 @@
-function plot_riftfraction(md,options,width,i);
+function plot_riftfraction(md,options,nlines,ncols,index);
 %PLOT_RIFTFRACTION - plot rift fractions
 %
@@ -15 +15 @@
 [x y z elements is2d]=processmesh(md,options);
 
-subplot(width,width,i); 
+subplot(nlines,ncols,index); 
 hold on
 

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

@@ -1 @@
-function plot_rifpenetration(md,options,width,i);
+function plot_rifpenetration(md,options,nlines,ncols,index);
 %PLOT_RIFTPENETRATION - plot rift penetration
 %
@@ -10 +10 @@
 [x y z elements is2d]=processmesh(md,options);
 
-subplot(width,width,i); 
+subplot(nlines,ncols,index); 
 hold on
 

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

@@ -1 @@
-function plot_riftrelvel(md,options,width,i);
+function plot_riftrelvel(md,options,nlines,ncols,index);
 %PLOT_RIFTRELVEL - plot rift relative velocities
 %
 %   Usage:
-%      plot_riftrelvel(md,options,width,i);
+%      plot_riftrelvel(md,options,nlines,ncols,i);
 %
 %   See also: PLOTMODEL
@@ -17 +17 @@
 
 %set as NaN all velocities not on rifts
-for i=1:size(md.rifts,1),
+u=NaN*ones(md.numberofgrids,1);
+v=NaN*ones(md.numberofgrids,1);
+for i=1:md.numrifts,
         penaltypairs=md.rifts(i).penaltypairs(:,[1 2]);
-        u=NaN*ones(md.numberofgrids,1);
-        v=NaN*ones(md.numberofgrids,1);
         u(md.rifts(i).penaltypairs(:,1))=md.vx(penaltypairs(:,1))-md.vx(penaltypairs(:,2));
         v(md.rifts(i).penaltypairs(:,1))=md.vy(penaltypairs(:,1))-md.vy(penaltypairs(:,2));
@@ -31 +31 @@
 
 %prepare plot
-subplot(width,width,i); 
+subplot(nlines,ncols,index); 
 hold on
 
@@ -37 +37 @@
 for i=1:size(md.segments,1),
         plot(x(md.segments(i,1:2)),y(md.segments(i,1:2)),'k.-');
+end
+
+%plot rifts vel
+h3=[];
+for i=1:quivers.numcolors
+        pos=find(quivers.colorind==i);
+        hprime=quiver(quivers.x(pos),quivers.y(pos),quivers.u(pos),quivers.v(pos),...
+                'Color',palette(i,:),'ShowArrowHead','on','AutoScale','off');
+        hprime=quiver(quivers.x(pos),quivers.y(pos),-quivers.u(pos),-quivers.v(pos),...
+                'Color',palette(i,:),'ShowArrowHead','on','AutoScale','off');
+        h3=[h3;hprime];
 end
 
@@ -47 +58 @@
         h1=plot(x(md.segments(i,1:2)),y(md.segments(i,1:2)),'b-');
 end
-
-for i=1:size(md.rifts,1),
+for i=1:md.numrifts,
+        
         %get grids on rift
         penaltypairs=md.rifts(i).penaltypairs;
@@ -66 +77 @@
                 %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(x(penaltypairs(j,1)) ,y(penaltypairs(j,1)),'r*');
+                        p2=plot(x(penaltypairs(j,1)) ,y(penaltypairs(j,1)),'*'); set(p2,'Color',[140 140 140]/255);
                         isp2=1;
                 else
@@ -79 +90 @@
         segments=md.rifts(i).segments(:,1:2);
 end
-
-%plot rifts vel
-h3=[];
-for i=1:quivers.numcolors
-        pos=find(quivers.colorind==i);
-        hprime=quiver(quivers.x(pos),quivers.y(pos),quivers.u(pos),quivers.v(pos),...
-                'Color',palette(i,:),'ShowArrowHead','on','AutoScale','off');
-        hprime=quiver(quivers.x(pos),quivers.y(pos),-quivers.u(pos),-quivers.v(pos),...
-                'Color',palette(i,:),'ShowArrowHead','on','AutoScale','off');
-        h3=[h3;hprime];
-end
-
 %legend
 if isp1 & isp2

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

@@ -1 @@
-function plot_rifts(md,options,width,i);
+function plot_rifts(md,options,nlines,ncols,index);
 %PLOT_RIFTS - plot rifts in a mesh
 %
@@ -11 +11 @@
 
 %plot mesh
-subplot(width,width,i); 
+subplot(nlines,ncols,index); 
 
 %offset to separate rift flanks.

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

@@ -1 @@
-function plot_riftvel(md,options,width,i);
+function plot_riftvel(md,options,nlines,ncols,index);
 %PLOT_RIFTVEL - plot rift velocity
 %
@@ -17 +17 @@
 
 %set as NaN all velocities not on rifts
-for i=1:size(md.rifts,1),
+u=NaN*ones(md.numberofgrids,1);
+v=NaN*ones(md.numberofgrids,1);
+for i=1:md.numrifts,
         penaltypairs=md.rifts(i).penaltypairs(:,[1 2]);
-        u=NaN*ones(md.numberofgrids,1);
-        v=NaN*ones(md.numberofgrids,1);
         u(penaltypairs(:))=md.vx(penaltypairs(:));
         v(penaltypairs(:))=md.vy(penaltypairs(:));
@@ -31 +31 @@
 
 %prepare plot
-subplot(width,width,i); 
+subplot(nlines,ncols,index); 
 hold on
 
@@ -37 +37 @@
 for i=1:size(md.segments,1),
         plot(x(md.segments(i,1:2)),y(md.segments(i,1:2)),'k.-');
+end
+
+%plot rifts vel
+h3=[];
+for i=1:quivers.numcolors
+        pos=find(quivers.colorind==i);
+        hprime=quiver(quivers.x(pos),quivers.y(pos),quivers.u(pos),quivers.v(pos),...
+                'Color',palette(i,:),'ShowArrowHead','on','AutoScale','off');
+        h3=[h3;hprime];
 end
 
@@ -66 +75 @@
                 %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(x(penaltypairs(j,1)) ,y(penaltypairs(j,1)),'r*');
+                        p2=plot(x(penaltypairs(j,1)) ,y(penaltypairs(j,1)),'*'); set(p2,'Color',[140 140 140]/255);
                         isp2=1;
                 else
@@ -80 +89 @@
 end
 
-%plot rifts vel
-h3=[];
-for i=1:quivers.numcolors
-        pos=find(quivers.colorind==i);
-        hprime=quiver(quivers.x(pos),quivers.y(pos),quivers.u(pos),quivers.v(pos),...
-                'Color',palette(i,:),'ShowArrowHead','on','AutoScale','off');
-        h3=[h3;hprime];
-end
 
 %legend

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

@@ -31 +31 @@
         fontsize=getfieldvalue(options,'fontsize',14);
         set(hcb,'FontSize',fontsize);
+        
+        if exist(options,'colorbartitle'),
+                backup=gca;
+                axes(hcb);lab=ylabel(getfieldvalue(options,'colorbartitle'));
+                set(lab,'Rotation',getfieldvalue(options,'colorbartitlerotation',-90));
+                set(lab,'VerticalAlignment','bottom');
+                axes(backup);
+        end
 end