Changeset 23800 for issm/trunk-jpl/src/c/classes/Elements/Penta.cpp

Timestamp:

03/15/19 11:03:25 (6 years ago)

Author:

Mathieu Morlighem

Message:

CHG: added SigmaVM to penta

File:

• issm/trunk-jpl/src/c/classes/Elements/Penta.cpp (modified) (4 diffs)

issm/trunk-jpl/src/c/classes/Elements/Penta.cpp

@@ -188 +188 @@
         IssmDouble  calvingrate[NUMVERTICES];
         IssmDouble  lambda1,lambda2,ex,ey,vx,vy,vel;
-        IssmDouble  B,sigma_vm,sigma_max,sigma_max_floating,sigma_max_grounded,n;
+        IssmDouble  B,sigma_max,sigma_max_floating,sigma_max_grounded,n;
         IssmDouble  epse_2,groundedice,bed;
+        IssmDouble  sigma_vm[NUMVERTICES];
 
         /* Get node coordinates and dof list: */
@@ -239 +240 @@
                 /*Calculate sigma_vm*/
                 epse_2    = 1./2. *(lambda1*lambda1 + lambda2*lambda2);
-                sigma_vm  = sqrt(3.) * B * pow(epse_2,1./(2.*n));
+                sigma_vm[iv] = sqrt(3.) * B * pow(epse_2,1./(2.*n));
 
                 /*Tensile stress threshold*/
@@ -253 +254 @@
                 }
                 else{
-                        calvingratex[iv]=vx*sigma_vm/sigma_max;
-                        calvingratey[iv]=vy*sigma_vm/sigma_max;
+                        calvingratex[iv]=vx*sigma_vm[iv]/sigma_max;
+                        calvingratey[iv]=vy*sigma_vm[iv]/sigma_max;
                 }
                 calvingrate[iv] =sqrt(calvingratex[iv]*calvingratex[iv] + calvingratey[iv]*calvingratey[iv]);
@@ -263 +264 @@
         this->inputs->AddInput(new PentaInput(CalvingrateyEnum,&calvingratey[0],P1Enum));
         this->inputs->AddInput(new PentaInput(CalvingCalvingrateEnum,&calvingrate[0],P1Enum));
+        this->inputs->AddInput(new PentaInput(SigmaVMEnum,&sigma_vm[0],P1Enum));
 
         this->InputExtrude(CalvingratexEnum,-1);
         this->InputExtrude(CalvingrateyEnum,-1);
         this->InputExtrude(CalvingCalvingrateEnum,-1);
+        this->InputExtrude(SigmaVMEnum,-1);
 
         /*Clean up and return*/