Index: /issm/trunk/src/m/classes/public/plot/plot_contour.m
===================================================================
--- /issm/trunk/src/m/classes/public/plot/plot_contour.m	(revision 1878)
+++ /issm/trunk/src/m/classes/public/plot/plot_contour.m	(revision 1879)
@@ -1,3 +1,3 @@
-function plot_contour(md,data,options_structure);
+function plot_contour(md,datain,options_structure);
 %PLOT_CONTOUR - plot contours of a given field
 %
@@ -9,5 +9,5 @@
 %process data and model
 [x y z index is2d]=processmesh(md,options_structure);
-[data isongrid isquiver]=processdata(md,data,options_structure);
+[data isongrid isquiver]=processdata(md,datain,options_structure);
 
 %check is2d
@@ -17,5 +17,10 @@
 
 %first, process data: must be on grids
+if isquiver
+	%take norm
+	data=sqrt(sum(datain.*datain,2));
+end
 if ~isongrid
+	%take average
 	data=averaging(md,data,0);
 end
Index: /issm/trunk/src/m/classes/public/plot/plot_manager.m
===================================================================
--- /issm/trunk/src/m/classes/public/plot/plot_manager.m	(revision 1878)
+++ /issm/trunk/src/m/classes/public/plot/plot_manager.m	(revision 1879)
@@ -120,12 +120,12 @@
 %process data and model
 [x y z elements is2d]=processmesh(md,options_structure);
-[data isongrid isquiver]=processdata(md,data,options_structure);
+[data2 isongrid isquiver]=processdata(md,data,options_structure);
 
 %standard plot:
 subplot(width,width,i);
-plot_unit(x,y,z,elements,data,isongrid,is2d,isquiver,options_structure);
+plot_unit(x,y,z,elements,data2,isongrid,is2d,isquiver,options_structure);
 
 %apply all options
-if isnan(options_structure.shading) & isnan(options_structure.edgecolor) & size(data,1)==md.numberofgrids,
+if isnan(options_structure.shading) & isnan(options_structure.edgecolor) & size(data2,1)==md.numberofgrids,
 	options_structure.shading='interp';
 end
@@ -133,3 +133,6 @@
 	options_structure.colorbar=2;
 end
-applyoptions(md,data,options_structure);
+if isquiver & (iscell(options_structure.contourlevels) | ~isnan(options_structure.contourlevels)),
+	data2=data;
+end
+applyoptions(md,data2,options_structure);