Changeset 20214

Timestamp:

02/19/16 00:31:58 (9 years ago)

Author:

cborstad

Message:

CHG: damage can be passed as an argument to compute damage-dependent mechanical properties

File:

• issm/trunk-jpl/src/m/mech/mechanicalproperties.m (modified) (3 diffs)

issm/trunk-jpl/src/m/mech/mechanicalproperties.m

@@ -1 @@
-function md=mechanicalproperties(md,vx,vy)
+function md=mechanicalproperties(md,vx,vy,varargin)
 %MECHANICALPROPERTIES - compute stress and strain rate for a goven velocity
 %
@@ -23 +23 @@
         disp('Warning: the model has some non SSA elements. These will be treated like SSA''s elements');
 end
+
+%get damage, if passed
+options = pairoptions(varargin{:});
+damage = getfieldvalue(options,'damage',zeros(md.mesh.numberofvertices,1));
 
 %initialization
@@ -62 +66 @@
         nu(location)=B_bar(location);
 elseif isa(md.materials,'matdamageice')
-        % FIXME this needs to use md.damage.D or damage from a solution
-        Zinv=md.materials.rheology_Z(index)*summation/3;
+        Zinv=1-damage(index)*summation/3;
         location=find(second_inv~=0);
         nu(location)=Zinv(location).*B_bar(location)./(second_inv(location).^power(location));