Changeset 19926

Timestamp:

01/05/16 20:32:12 (9 years ago)

Author:

aleahsommers

Message:

CHG: Added condition to prevent negative pressure

File:

• issm/trunk-jpl/src/c/analyses/HydrologySommersAnalysis.cpp (modified) (3 diffs)

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

@@ -240 +240 @@
 
         /*Build friction element, needed later: */
-        Friction* friction=new Friction(element,3);
+        Friction* friction=new Friction(element,2);
 
         /* Start  looping on the number of gaussian points: */
@@ -337 +337 @@
                 if(values[i]>rho_ice*thickness[i]/rho_water+bed[i]){
                         values[i] = rho_ice*thickness[i]/rho_water+bed[i];
+                }
+
+                /*Make sure that negative pressure is not allowed*/
+      if(values[i]<bed[i]){
+                        values[i] = bed[i];
                 }
 
@@ -434 +439 @@
 
         /*Build friction element, needed later: */
-        Friction* friction=new Friction(element,3);
+        Friction* friction=new Friction(element,2);
 
         /*Keep track of weights*/