Index: /issm/trunk/src/m/model/shear2d.m
===================================================================
--- /issm/trunk/src/m/model/shear2d.m	(revision 9365)
+++ /issm/trunk/src/m/model/shear2d.m	(revision 9366)
@@ -6,4 +6,5 @@
 %   Usage:
 %      [sx,sy,sxy,s]=shear2d(md);
+%      s=shear2d(md);
 
 [alpha beta]=GetNodalFunctionsCoeff(md.elements,md.x,md.y); 
@@ -16,2 +17,7 @@
 sxy=(uy+vx)/2;
 s=sqrt(sx.^2+sy.^2+sxy.^2+sx.*sy);
+
+%if user requested only one output, it must be the norm
+if nargout==1,
+	sx=s;
+end
Index: sm/trunk/src/m/model/shearnorm2d.m
===================================================================
--- /issm/trunk/src/m/model/shearnorm2d.m	(revision 9365)
+++ 	(revision )
@@ -1,9 +1,0 @@
-function s=shearnorm2d(md)
-%SHEARNORM2D - computes the norm of the strain rate
-%
-%   Usage:
-%      s=shearnorm2d(md)
-%
-%   See also: shear2d
-
-[sx,sy,sxy,s]=shear2d(md);