Changeset 27035 for issm/trunk/src/c/classes/Materials/Matice.cpp

Timestamp:

06/01/22 05:01:48 (3 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 27033

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c/classes/Materials/Matice.cpp (modified) (5 diffs)

issm/trunk/src/c/classes/Materials/Matice.cpp ¶

@@ -394 +394 @@
         }
         else{
-
-                /*if no strain rate, return maximum viscosity*/
-                if(eps_eff==0.){
-                        viscosity = 1.e+14/2.;
-                        //viscosity=2.5*pow(10.,17);
-                }
-
+                /*if strain rate is 0., it is probably our initial guess, use an average
+                 * viscosity instead of a large one*/
+                if(eps_eff==0.) viscosity = 1.e+14/2.;
                 else{
+                        /*if no strain rate, return maximum viscosity*/
+                        //if(eps_eff<1.e-6) eps_eff = 1e-6;
                         viscosity=(1.-D)*B/(2.*pow(E,1./n)*pow(eps_eff,(n-1.)/n));
                 }
@@ -736 +734 @@
         *pviscosity=viscosity;
 }/*}}}*/
-void  Matice::ViscosityMLHO(IssmDouble* pviscosity,int dim,IssmDouble* xyz_list,Gauss* gauss,Input* vxbase_input,Input* vybase_input,Input* vxshear_input,Input* vyshear_input,Input* thickness_input,Input* n_input){/*{{{*/
+void  Matice::ViscosityMOLHO(IssmDouble* pviscosity,int dim,IssmDouble* xyz_list,Gauss* gauss,Input* vxbase_input,Input* vybase_input,Input* vxshear_input,Input* vyshear_input,Input* thickness_input,Input* n_input){/*{{{*/
 
         /*Intermediaries*/
@@ -757 +755 @@
 
                 /* eps_eff^2 = exx^2 + eyy^2 + exy^2 + exz^2 + eyz^2 + exx*eyy (for a given zeta)*/
-                element->StrainRateMLHO(&epsilon[0],xyz_list,gauss,
+                element->StrainRateMOLHO(&epsilon[0],xyz_list,gauss,
                                                 vxbase_input,vybase_input,vxshear_input,vyshear_input,thickness_input,n_input,zeta);
                 epsilon_eff=sqrt(epsilon[0]*epsilon[0] + epsilon[1]*epsilon[1] + epsilon[2]*epsilon[2] 
@@ -797 +795 @@
         delete gauss_seg;
 }/*}}}*/
-void  Matice::ViscosityMLHOAdjoint(IssmDouble* pviscosity,int dim,IssmDouble* xyz_list,Gauss* gauss,Input* vxbase_input,Input* vybase_input,Input* vxshear_input,Input* vyshear_input,Input* thickness_input,Input* n_input){/*{{{*/
+void  Matice::ViscosityMOLHOAdjoint(IssmDouble* pviscosity,int dim,IssmDouble* xyz_list,Gauss* gauss,Input* vxbase_input,Input* vybase_input,Input* vxshear_input,Input* vyshear_input,Input* thickness_input,Input* n_input){/*{{{*/
 
         /* To compute the additional 5 terms in the viscosity appear in the adjoint equation*/
@@ -819 +817 @@
 
                 /* eps_eff^2 = exx^2 + eyy^2 + exy^2 + exz^2 + eyz^2 + exx*eyy (for a given zeta)*/
-                element->StrainRateMLHO(&epsilon[0],xyz_list,gauss,
+                element->StrainRateMOLHO(&epsilon[0],xyz_list,gauss,
                                                 vxbase_input,vybase_input,vxshear_input,vyshear_input,thickness_input,n_input,zeta);
                 epsilon_eff=sqrt(epsilon[0]*epsilon[0] + epsilon[1]*epsilon[1] + epsilon[2]*epsilon[2]