Changeset 21626 for issm/trunk-jpl/src/c/classes/Elements/Tria.cpp

Timestamp:

03/23/17 15:47:16 (8 years ago)

Author:

youngmc3

Message:

CHG: added calving stress thresholds and calving max parameters

File:

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

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

@@ -216 +216 @@
         IssmDouble  calvingrate[NUMVERTICES];
         IssmDouble  lambda1,lambda2,ex,ey,vx,vy,vel;
-        IssmDouble  sigma_vm,sigma_max,epse_2,groundedice;
+        IssmDouble  sigma_vm,sigma_max,sigma_max_floating,sigma_max_grounded;
+        IssmDouble  epse_2,groundedice;
 
         /* Get node coordinates and dof list: */
@@ -227 +228 @@
         IssmDouble  B   = this->GetMaterialParameter(MaterialsRheologyBbarEnum);
         IssmDouble  n   = this->GetMaterialParameter(MaterialsRheologyNEnum);
+        this->parameters->FindParam(&sigma_max_floating,CalvingStressThresholdFloatingiceEnum);
+        this->parameters->FindParam(&sigma_max_grounded,CalvingStressThresholdGroundediceEnum);
 
         /* Start looping on the number of vertices: */
@@ -254 +257 @@
                 epse_2    = 1./2. *(lambda1*lambda1 + lambda2*lambda2);
                 sigma_vm  = sqrt(3.) * B * pow(epse_2,1./(2.*n));
-                //sigma_max = 125.e+3;
-                sigma_max = 350.e+3;
-                sigma_max = 450.e+3;
-                sigma_max = 800.e+3; //too much
-                //sigma_max = 700.e+3;
-                //sigma_max = 670.e+3;
-                //sigma_max = 550.e+3;
-                sigma_max = 750.e+3; //too high
-                sigma_max = 850.e+3; //too low
-                sigma_max = 800.e+3; //IUGG previous test
-                sigma_max = 1000.e+3; //850 seems small
-
-                if(groundedice<0) sigma_max=200.e+3;
+
+                /*OLD (keep for a little bit)*/
+                //sigma_max = 800.e+3; //IUGG previous test
+                //sigma_max = 1000.e+3; //GRL
+                //if(groundedice<0) sigma_max=150.e+3;
+
+                /*Tensile stress threshold*/
+                if(groundedice<0)
+                 sigma_max = sigma_max_floating;
+                else
+                 sigma_max = sigma_max_grounded;
 
                 /*Assign values*/
@@ -294 +295 @@
         IssmDouble  calvingratey[NUMVERTICES];
         IssmDouble  calvingrate[NUMVERTICES];
-
 
         /* Get node coordinates and dof list: */