Changeset 1879

Timestamp:

08/25/09 12:23:12 (15 years ago)

Author:

Mathieu Morlighem

Message:

Added contour support in quiverplot

Location:

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

Files:

• plot_contour.m (modified) (3 diffs)
• plot_manager.m (modified) (2 diffs)

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

@@ -1 @@
-function plot_contour(md,data,options_structure);
+function plot_contour(md,datain,options_structure);
 %PLOT_CONTOUR - plot contours of a given field
 %
@@ -9 +9 @@
 %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 +17 @@
 
 %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

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

@@ -120 +120 @@
 %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 +133 @@
         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);