Changeset 19235

Timestamp:

04/01/15 09:57:08 (10 years ago)

Author:

Mathieu Morlighem

Message:

BUG: do not get coefficient by defualt

File:

• issm/trunk-jpl/src/c/analyses/StressbalanceSIAAnalysis.cpp (modified) (7 diffs)

issm/trunk-jpl/src/c/analyses/StressbalanceSIAAnalysis.cpp

@@ -402 +402 @@
         Input* slopey_input    = element->GetInput(SurfaceSlopeYEnum);        _assert_(slopey_input);
         Input* thickness_input = element->GetInput(ThicknessEnum);            _assert_(thickness_input);
-        Input* drag_input      = element->GetInput(FrictionCoefficientEnum);  _assert_(drag_input);
+        Input* drag_input      = NULL;
+        Friction* friction     = NULL;
+        if(frictionlaw!=5){
+                drag_input = element->GetInput(FrictionCoefficientEnum);  _assert_(drag_input);
+        }
+        else{
+                friction=new Friction(element,3);
+        }
 
         /*Get Vertical segment indices*/
@@ -443 +450 @@
                 /*Deal with basal velocities*/
                 if(element->IsOnBase()){
-                        drag_input->GetInputValue(&drag,gauss);
-
                         switch(frictionlaw){
                                 case 1:
@@ -453 +458 @@
                                 case 2:
                                         /*Ritz et al. 1996*/
+                                        drag_input->GetInputValue(&drag,gauss);
                                         ub=drag*(rho_ice*gravity*thickness)*(rho_ice*gravity*thickness)*slope[0]/sqrt(slope2);
                                         vb=drag*(rho_ice*gravity*thickness)*(rho_ice*gravity*thickness)*slope[1]/sqrt(slope2);
@@ -458 +464 @@
                                 case 3:
                                         /*Rutt et al. 2009*/
+                                        drag_input->GetInputValue(&drag,gauss);
                                         ub=-drag*rho_ice*gravity*thickness*slope[0];
                                         vb=-drag*rho_ice*gravity*thickness*slope[1];
@@ -463 +470 @@
                                 case 4:
                                         /*Henning Akesson*/
+                                        drag_input->GetInputValue(&drag,gauss);
                                         drag = -4e-15 * surface + 8.6e-12;
                                         ub=-drag*rho_ice*gravity*thickness*slope[0];
@@ -468 +476 @@
                                         break;
                                 case 5: /*Weertman temp for Kevin*/{
-                                        Friction* friction=new Friction(element,3);
                                         friction->GetAlpha2WeertmanTemp(&drag,gauss);
                                         ub = -1./drag * rho_ice*gravity*thickness*slope[0];
@@ -487 +494 @@
         xDelete<int>(pairindices);
         xDelete<IssmDouble>(xyz_list);
+        delete friction;
         return pe;