Changeset 8128

Timestamp:

05/04/11 09:52:05 (14 years ago)

Author:

Mathieu Morlighem

Message:

minor fixes

Location:

issm/trunk/src/m/model

Files:

• ismodelselfconsistent.m (modified) (1 diff)
• plot/applyoptions.m (modified) (2 diffs)
• plot/plot_manager.m (modified) (2 diffs)
• plot/plot_unit.m (modified) (5 diffs)

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

@@ -152 +152 @@
 end
 if ~ismember(md.rheology_law,[NoneEnum PatersonEnum ArrheniusEnum]),
-        error(['model not consistent: model ' md.name ' hydrostatic_adjustment field should be AbsoluteEnum or IncrementalEnum']);
+        error(['model not consistent: model ' md.name ' rheology_law field should be NoneEnum, PatersonEnum or ArrheniusEnum']);
 end
 %}}}

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

@@ -1 @@
-function applyoptions(md,data,options,plothandle)
+function applyoptions(md,data,options)
 %APPLYOPTIONS - apply the options to current plot
 %
@@ -447 +447 @@
 %lighting
 if strcmpi(getfieldvalue(options,'light','off'),'on'),
-        set(plothandle,'FaceLighting','gouraud','FaceColor','interp','AmbientStrength',0.5);
+        set(gca,'FaceLighting','gouraud','FaceColor','interp','AmbientStrength',0.5);
         light('Position',[0 0.1 0.1],'Style','infinite');
 end

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

@@ -178 +178 @@
 
 %plot unit
-h=plot_unit(x,y,z,elements,data2,is2d,datatype,options);
+plot_unit(x,y,z,elements,data2,is2d,datatype,options);
         
 
@@ -189 +189 @@
 end
 
-applyoptions(md,data2,options,h);
+applyoptions(md,data2,options);
 
 %do ground overlay on kml plot_unit? 

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

@@ -1 @@
-function h=plot_unit(x,y,z,elements,data,is2d,datatype,options)
+function plot_unit(x,y,z,elements,data,is2d,datatype,options)
 %PLOT_UNIT - unit plot, display data
 %
 %   Usage:
-%      h=plot_unit(x,y,z,elements,data,is2d,datatype,options);
+%      plot_unit(x,y,z,elements,data,is2d,datatype,options);
 %
 %   See also: PLOTMODEL, PLOT_MANAGER
@@ -17 +17 @@
                 pos=find(~isnan(data)); %needed for element on water
                 if is2d,
-                        A=elements(pos,1); B=elements(pos,2); C=elements(pos,3); h=patch( 'Faces', [A B C], 'Vertices', [x y z],'CData', data(pos),'FaceColor','flat','EdgeColor',edgecolor);
+                        A=elements(pos,1); B=elements(pos,2); C=elements(pos,3); patch( 'Faces', [A B C], 'Vertices', [x y z],'CData', data(pos),'FaceColor','flat','EdgeColor',edgecolor);
                 else
                         A=elements(pos,1); B=elements(pos,2); C=elements(pos,3); D=elements(pos,4); E=elements(pos,5); F=elements(pos,6);
-                        h=patch( 'Faces', [A B C],  'Vertices', [x y z],'CData', data(pos),'FaceColor','flat','EdgeColor',edgecolor);
+                        patch( 'Faces', [A B C],  'Vertices', [x y z],'CData', data(pos),'FaceColor','flat','EdgeColor',edgecolor);
                         patch( 'Faces', [D E F],  'Vertices', [x y z],'CData', data(pos),'FaceColor','flat','EdgeColor',edgecolor);
                         patch( 'Faces', [A B E D],'Vertices', [x y z],'CData', data(pos),'FaceColor','flat','EdgeColor',edgecolor);
@@ -32 +32 @@
                 if is2d,
                         A=elements(:,1); B=elements(:,2); C=elements(:,3); 
-                        h=patch( 'Faces', [A B C], 'Vertices', [x y z],'FaceVertexCData', data(:),'FaceColor','interp','EdgeColor',edgecolor);
+                        patch( 'Faces', [A B C], 'Vertices', [x y z],'FaceVertexCData', data(:),'FaceColor','interp','EdgeColor',edgecolor);
                 else
                         A=elements(:,1); B=elements(:,2); C=elements(:,3); D=elements(:,4); E=elements(:,5); F=elements(:,6);
-                        h=patch( 'Faces', [A B C],  'Vertices', [x y z],'FaceVertexCData', data(:),'FaceColor','interp','EdgeColor',edgecolor);
+                        patch( 'Faces', [A B C],  'Vertices', [x y z],'FaceVertexCData', data(:),'FaceColor','interp','EdgeColor',edgecolor);
                         patch( 'Faces', [D E F],  'Vertices', [x y z],'FaceVertexCData', data(:),'FaceColor','interp','EdgeColor',edgecolor);
                         patch( 'Faces', [A B E D],'Vertices', [x y z],'FaceVertexCData', data(:),'FaceColor','interp','EdgeColor',edgecolor);
@@ -55 +55 @@
 
                 if is2d,
-                        h=patch( 'Faces',elements,'Vertices',[x y],'CData',data,'FaceColor','interp','EdgeColor',edgecolor);
+                        patch( 'Faces',elements,'Vertices',[x y],'CData',data,'FaceColor','interp','EdgeColor',edgecolor);
                 else
                         A=elements(:,1); B=elements(:,2); C=elements(:,3); D=elements(:,4); E=elements(:,5); F=elements(:,6);
-                        h=patch( 'Faces', [A B C], 'Vertices', [x y z],'CData', data,'FaceColor','interp','EdgeColor',edgecolor);
+                        patch( 'Faces', [A B C], 'Vertices', [x y z],'CData', data,'FaceColor','interp','EdgeColor',edgecolor);
                         patch( 'Faces', [D E F], 'Vertices', [x y z],'CData', data,'FaceColor','interp','EdgeColor',edgecolor);
                         patch( 'Faces', [A B E D], 'Vertices', [x y z],'CData', data,'FaceColor','interp','EdgeColor',edgecolor);
@@ -70 +70 @@
                 if is2d,
                         A=elements(:,1); B=elements(:,2); C=elements(:,3); 
-                        h=patch( 'Faces', [A B C], 'Vertices', [x y z],'CData', data(:),'FaceColor','flat','EdgeColor',edgecolor);
+                        patch( 'Faces', [A B C], 'Vertices', [x y z],'CData', data(:),'FaceColor','flat','EdgeColor',edgecolor);
                 else
                         A=elements(:,1); B=elements(:,2); C=elements(:,3); D=elements(:,4); E=elements(:,5); F=elements(:,6);
-                        h=patch( 'Faces', [A B C],  'Vertices', [x y z],'CData', data,'FaceColor','flat','EdgeColor',edgecolor);
+                        patch( 'Faces', [A B C],  'Vertices', [x y z],'CData', data,'FaceColor','flat','EdgeColor',edgecolor);
                         patch( 'Faces', [D E F],  'Vertices', [x y z],'CData', data,'FaceColor','flat','EdgeColor',edgecolor);
                         patch( 'Faces', [A B E D],'Vertices', [x y z],'CData', data,'FaceColor','flat','EdgeColor',edgecolor);