Changeset 19766

Timestamp:

11/19/15 16:15:54 (9 years ago)

Author:

aleahsommers

Message:

CHG: adding cap on gap and support for default friction law

File:

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

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

@@ -122 +122 @@
         /*Friction law variables*/
         switch(frictionlaw){
+                case 1:
+                        iomodel->FetchDataToInput(elements,FrictionCoefficientEnum);
+                        iomodel->FetchDataToInput(elements,FrictionPEnum);
+                        iomodel->FetchDataToInput(elements,FrictionQEnum);
+                        break;
                 case 8:
                         iomodel->FetchDataToInput(elements,FrictionCoefficientEnum);
@@ -488 +493 @@
         /*Divide by connectivity*/
         newgap = newgap/totalweights;
+        IssmDouble mingap = 0.00001;
+        if(newgap<mingap) newgap=mingap;
 
         /*Add new gap as an input*/