Changeset 19534

Timestamp:

09/02/15 10:35:34 (10 years ago)

Author:

Mathieu Morlighem

Message:

CHG: drag_input not always necessary

File:

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

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

@@ -338 +338 @@
         Input* thickness_input = element->GetInput(ThicknessEnum);            _assert_(thickness_input);
         Input* surface_input   = element->GetInput(SurfaceEnum);              _assert_(surface_input);
-        Input* drag_input      = element->GetInput(FrictionCoefficientEnum);  _assert_(drag_input);
+        Input* drag_input      = NULL;
+        if(frictionlaw!=5 && frictionlaw!=1){
+                drag_input = element->GetInput(FrictionCoefficientEnum);  _assert_(drag_input);
+        }
 
         Gauss* gauss=element->NewGauss();
@@ -348 +351 @@
                 thickness_input->GetInputValue(&thickness,gauss);
                 surface_input->GetInputValue(&surface,gauss);
-                drag_input->GetInputValue(&drag,gauss);
                 slopex_input->GetInputValue(&slope[0],gauss);
                 slopey_input->GetInputValue(&slope[1],gauss);
@@ -361 +363 @@
                         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);
@@ -366 +369 @@
                         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];