Changeset 6287

Timestamp:

10/14/10 12:06:29 (14 years ago)

Author:

Mathieu Morlighem

Message:

plot quiver back to NORMAL

Location:

issm/trunk/src/m/model

Files:

• SectionValues.m (modified) (1 diff)
• ismodelselfconsistent.m (modified) (1 diff)
• plot/plot_manager.m (modified) (1 diff)
• plot/plot_quiver.m (modified) (3 diffs)
• plot/plot_riftrelvel.m (modified) (1 diff)
• plot/plotdoc.m (modified) (1 diff)

issm/trunk/src/m/model/SectionValues.m

@@ -82 +82 @@
 
         %Interpolation of data on specified points
-        %data_interp=InterpFromMeshToMesh2d(md.elements,md.x,md.y,data,X,Y);
-        data_interp=griddata(md.x,md.y,data,X,Y);
+        data_interp=InterpFromMeshToMesh2d(md.elements,md.x,md.y,data,X,Y);
+        %data_interp=griddata(md.x,md.y,data,X,Y);
 
         %Compute index

issm/trunk/src/m/model/ismodelselfconsistent.m

@@ -35 +35 @@
 
 % Common checks
+%VERBOSE{{{1
+if md.verbose~=floor(abs(md.verbose)),
+        error(['field verbose should be a positive integer']);
+end
+%}}}
 %COUNTER {{{1
 if md.counter<3,

issm/trunk/src/m/model/plot/plot_manager.m

@@ -107 +107 @@
                 
                 case 'quiver'
-                        plot_quiver(md,options,nlines,ncols,i);
-                        return
+                        data=[md.vx md.vy]; %Go ahead and try plot_unit
 
                 case {'strainrate_tensor','strainrate','strainrate_principal','strainrate_principalaxis1','strainrate_principalaxis2','strainrate_principalaxis3',...

issm/trunk/src/m/model/plot/plot_quiver.m

@@ -1 @@
-function plot_quiver(md,options,nlines,ncols,index);
+function plot_quiver(x,y,u,v,options),
 %PLOT_QUIVER - quiver plot with colors
 %
@@ -10 +10 @@
 %      plot_quiver(md.x,md.y,md.vx,md.vy,options);
 
-%prepare plot
-subplot(nlines,ncols,index); 
-hold on
-
-fields=getfieldvalue(options,'quiver_field',{'vx','vy'});
-
-%call fields vx and vy, for ease of use
-if ischar(fields{1}), vx=md.(fields{1}); else vx=fields{1}; end
-if ischar(fields{2}), vy=md.(fields{2}); else vy=fields{2}; end
-
 %process fields
-[quivers,palette]=quiver_process(md.x,md.y,vx,vy,options);
+[quivers,palette]=quiver_process(x,y,u,v,options);
 
 %loop over the number of colors
@@ -35 +25 @@
 %take care of colorbar
 quiver_colorbar(quivers,options);
-
-
-%apply options
-options=addfielddefault(options,'title','Quiver plot.');
-options=addfielddefault(options,'colorbar',1);
-applyoptions(md,[],options);

issm/trunk/src/m/model/plot/plot_riftrelvel.m

@@ -105 +105 @@
 hold off
 
-
-
 %apply options
 quiver_colorbar(quivers,options);

issm/trunk/src/m/model/plot/plotdoc.m

@@ -50 +50 @@
 disp('                  - ''qmustddev'': plot of stddev distribution in sampling analysis with scaled response. needs option qmudata for descriptor');
 disp('                  - ''part_hist'': partitioning node and area histogram');
-disp('                  - ''quiver'': quiver plot. specify quiver fields. ''quiver_field'',{''vx'',''vy''} (default) or ''quiver_field'',{field1,field2}');
+disp('                  - ''quiver'': quiver plot');
 
 disp('       ''alloptions'': apply the options to all subplots if ''on''');