Changeset 22047

Timestamp:

09/06/17 04:43:52 (8 years ago)

Author:

sjohnsen

Message:

NEW: added CoupledFlag for frictionlaw 7, coulomb

File:

• issm/trunk-jpl/src/c/classes/Loads/Friction.cpp (modified) (3 diffs)

issm/trunk-jpl/src/c/classes/Loads/Friction.cpp

@@ -289 +289 @@
 
         /*diverse: */
+        int         CoupledFlag;
         IssmDouble  r,s;
         IssmDouble  drag_p, drag_q;
@@ -308 +309 @@
         IssmDouble rho_ice          = element->GetMaterialParameter(MaterialsRhoIceEnum);
         IssmDouble gravity          = element->GetMaterialParameter(ConstantsGEnum);
+        element->parameters->FindParam(&CoupledFlag,FrictionCouplingEnum);
 
         //compute r and q coefficients: */
@@ -314 +316 @@
 
         //From base and thickness, compute effective pressure when drag is viscous:
-        Neff=gravity*(rho_ice*thickness+rho_water*(base-sealevel));
+        switch(CoupledFlag){
+                case 0:
+                        Neff=gravity*(rho_ice*thickness+rho_water*(base-sealevel));
+                        break;  
+                case 1:
+                        element->GetInputValue(&Neff,gauss,FrictionEffectivePressureEnum);
+                        break;
+                case 2:
+                        element->GetInputValue(&Neff,gauss,EffectivePressureEnum);
+                        break;
+                default:
+                        _error_("not supported");
+        }
+
         if(Neff<0)Neff=0;