Index: /issm/trunk/src/m/classes/public/plot/plot_manager.m
===================================================================
--- /issm/trunk/src/m/classes/public/plot/plot_manager.m	(revision 3201)
+++ /issm/trunk/src/m/classes/public/plot/plot_manager.m	(revision 3202)
@@ -61,17 +61,17 @@
 			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',
Index: /issm/trunk/src/m/classes/public/plot/plot_riftfraction.m
===================================================================
--- /issm/trunk/src/m/classes/public/plot/plot_riftfraction.m	(revision 3201)
+++ /issm/trunk/src/m/classes/public/plot/plot_riftfraction.m	(revision 3202)
@@ -1,3 +1,3 @@
-function plot_riftfraction(md,options,width,i);
+function plot_riftfraction(md,options,nlines,ncols,index);
 %PLOT_RIFTFRACTION - plot rift fractions
 %
@@ -15,5 +15,5 @@
 [x y z elements is2d]=processmesh(md,options);
 
-subplot(width,width,i); 
+subplot(nlines,ncols,index); 
 hold on
 
Index: /issm/trunk/src/m/classes/public/plot/plot_riftpenetration.m
===================================================================
--- /issm/trunk/src/m/classes/public/plot/plot_riftpenetration.m	(revision 3201)
+++ /issm/trunk/src/m/classes/public/plot/plot_riftpenetration.m	(revision 3202)
@@ -1,3 +1,3 @@
-function plot_rifpenetration(md,options,width,i);
+function plot_rifpenetration(md,options,nlines,ncols,index);
 %PLOT_RIFTPENETRATION - plot rift penetration
 %
@@ -10,5 +10,5 @@
 [x y z elements is2d]=processmesh(md,options);
 
-subplot(width,width,i); 
+subplot(nlines,ncols,index); 
 hold on
 
Index: /issm/trunk/src/m/classes/public/plot/plot_riftrelvel.m
===================================================================
--- /issm/trunk/src/m/classes/public/plot/plot_riftrelvel.m	(revision 3201)
+++ /issm/trunk/src/m/classes/public/plot/plot_riftrelvel.m	(revision 3202)
@@ -1,7 +1,7 @@
-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,8 +17,8 @@
 
 %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,5 +31,5 @@
 
 %prepare plot
-subplot(width,width,i); 
+subplot(nlines,ncols,index); 
 hold on
 
@@ -37,4 +37,15 @@
 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,6 +58,6 @@
 	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,5 +77,5 @@
 		%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,16 +90,4 @@
 	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
Index: /issm/trunk/src/m/classes/public/plot/plot_rifts.m
===================================================================
--- /issm/trunk/src/m/classes/public/plot/plot_rifts.m	(revision 3201)
+++ /issm/trunk/src/m/classes/public/plot/plot_rifts.m	(revision 3202)
@@ -1,3 +1,3 @@
-function plot_rifts(md,options,width,i);
+function plot_rifts(md,options,nlines,ncols,index);
 %PLOT_RIFTS - plot rifts in a mesh
 %
@@ -11,5 +11,5 @@
 
 %plot mesh
-subplot(width,width,i); 
+subplot(nlines,ncols,index); 
 
 %offset to separate rift flanks.
Index: /issm/trunk/src/m/classes/public/plot/plot_riftvel.m
===================================================================
--- /issm/trunk/src/m/classes/public/plot/plot_riftvel.m	(revision 3201)
+++ /issm/trunk/src/m/classes/public/plot/plot_riftvel.m	(revision 3202)
@@ -1,3 +1,3 @@
-function plot_riftvel(md,options,width,i);
+function plot_riftvel(md,options,nlines,ncols,index);
 %PLOT_RIFTVEL - plot rift velocity
 %
@@ -17,8 +17,8 @@
 
 %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,5 +31,5 @@
 
 %prepare plot
-subplot(width,width,i); 
+subplot(nlines,ncols,index); 
 hold on
 
@@ -37,4 +37,13 @@
 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,5 +75,5 @@
 		%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,12 +89,4 @@
 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
Index: /issm/trunk/src/m/classes/public/plot/quiver_colorbar.m
===================================================================
--- /issm/trunk/src/m/classes/public/plot/quiver_colorbar.m	(revision 3201)
+++ /issm/trunk/src/m/classes/public/plot/quiver_colorbar.m	(revision 3202)
@@ -31,3 +31,11 @@
 	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
