Changeset 22754

Timestamp:

05/09/18 21:11:18 (7 years ago)

Author:

Mathieu Morlighem

Message:

CHG: removing stress from mechanical properties output as it is actually the deviatoric stress

Location:

issm/trunk-jpl/src/m/mech

Files:

• mechanicalproperties.m (modified) (1 diff)
• mechanicalproperties.py (modified) (1 diff)

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

@@ -111 +111 @@
 %plug onto the model
 %NB: Matlab sorts the eigen value in increasing order, we want the reverse
-%NOTE: all stresses below are deviatoric
-stress=struct('xx',[],'yy',[],'xy',[],'principalvalue1',[],'principalaxis1',[],'principalvalue2',[],'principalaxis2',[],'effectivevalue',[]);
-stress.xx=tau_xx;
-stress.yy=tau_yy;
-stress.xy=tau_xy;
-stress.principalvalue1=valuesstress(:,1);
-stress.principalaxis1=directionsstress(:,1:2);
-stress.principalvalue2=valuesstress(:,2);
-stress.principalaxis2=directionsstress(:,3:4);
-stress.effectivevalue=1/sqrt(2)*sqrt(stress.xx.^2+stress.yy.^2+2*stress.xy.^2); % effective shear stress (sqrt(J2))
-md.results.stress=stress;
-
 strainrate=struct('xx',[],'yy',[],'xy',[],'principalvalue1',[],'principalaxis1',[],'principalvalue2',[],'principalaxis2',[],'effectivevalue',[]);
 strainrate.xx=ux*md.constants.yts; %strain rate in 1/a instead of 1/s

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

@@ -125 +125 @@
         ##plug onto the model
         ##NB: Matlab sorts the eigen value in increasing order, we want the reverse
-        stress=results()
-        stress.xx=tau_xx
-        stress.yy=tau_yy
-        stress.xy=tau_xy
-        stress.principalvalue1=valuesstress[:,0]
-        stress.principalaxis1=directionsstress[:,0:2]
-        stress.principalvalue2=valuesstress[:,1]
-        stress.principalaxis2=directionsstress[:,2:4]
-        stress.effectivevalue=1./np.sqrt(2.)*np.sqrt(stress.xx**2+stress.yy**2+2.*stress.xy**2)
-        md.results.stress=stress
         
         strainrate=results()