Changeset 26292 for issm/trunk-jpl/src/c/classes/Materials/Matice.cpp

Timestamp:

05/26/21 17:29:06 (4 years ago)

Author:

tsantos

Message:

CHG: added viscosity computation for Mono Layer Higher Order model, and added penalty methods for L1L2 and Mono Layer model

File:

• issm/trunk-jpl/src/c/classes/Materials/Matice.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/classes/Materials/Matice.cpp

@@ -736 +736 @@
         *pviscosity=viscosity;
 }/*}}}*/
+void  Matice::ViscosityMLHO(IssmDouble* pviscosity,int dim,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input,Input* vxshear_input,Input* vyshear_input,Input* thickness_input){/*{{{*/
+
+        /*Intermediaries*/
+        IssmDouble viscosity;
+        IssmDouble thickness;
+        IssmDouble epsilon[5];  /* epsilon=[exx,eyy,exy,exz,eyz]; */
+        IssmDouble eps_eff;
+
+        /* eps_eff^2 = exx^2 + eyy^2 + exy^2 + exz^2 + eyz^2 + exx*eyy */
+        element->StrainRateMLHO(&epsilon[0],xyz_list,gauss,vx_input,vy_input,vxshear_input,vyshear_input,thickness_input);
+        eps_eff = sqrt(epsilon[0]*epsilon[0] + epsilon[1]*epsilon[1] + epsilon[2]*epsilon[2] +  epsilon[3]*epsilon[3] + epsilon[4]*epsilon[4] + epsilon[0]*epsilon[1]);
+
+        /*Get viscosity*/
+        this->GetViscosityBar(&viscosity,eps_eff,gauss);
+
+        /*Assign output pointer*/
+   *pviscosity=viscosity;
+}/*}}}*/
 void  Matice::ViscosityL1L2(IssmDouble* pviscosity,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input,Input* surface_input){/*{{{*/
         /*Compute the L1L2 viscosity