source: issm/oecreview/Archive/18296-19100/ISSM-19084-19085.diff@ 19102

Index: ../trunk-jpl/src/c/classes/Elements/Tria.cpp
===================================================================
--- ../trunk-jpl/src/c/classes/Elements/Tria.cpp        (revision 19084)
+++ ../trunk-jpl/src/c/classes/Elements/Tria.cpp        (revision 19085)
@@ -358,20 +358,16 @@
 
                /*Get Eigen values*/
                Matrix2x2Eigen(&lambda1,&lambda2,&ex,&ey,epsilon[0],epsilon[2],epsilon[1]);
-
-               /*Process Eigen values*/
-               lambda1>0? lambda1 = pow(lambda1,.3) : lambda1=0.;
-               lambda2>0? lambda2 = pow(lambda2,.3) : lambda2=0.;
-               lambda1 = lambda1*5.e-2;
-               lambda2 = lambda2*5.e-2;
                _assert_(!xIsNan<IssmDouble>(lambda1));
                _assert_(!xIsNan<IssmDouble>(lambda2));
 
+               /*Process Eigen values (only account for extension)*/
+               lambda1 = max(lambda1,0.);
+               lambda2 = max(lambda2,0.);
+
                /*Assign values*/
-               //calvingratex[iv]=ex*lambda1 - ey*lambda2;
-               //calvingratey[iv]=ey*lambda1 + ex*lambda2;
-               calvingratex[iv]=vx/vel*(lambda1 + lambda2);
-               calvingratey[iv]=vy/vel*(lambda1 + lambda2);
+               calvingratex[iv]=vx*pow(lambda1 + lambda2,1./3.)*3.e+2;
+               calvingratey[iv]=vy*pow(lambda1 + lambda2,1./3.)*3.e+2;
                calvingrate[iv]=sqrt(calvingratex[iv]*calvingratex[iv] + calvingratey[iv]*calvingratey[iv]);
        }