Changeset 19233

Timestamp:

04/01/15 08:37:51 (10 years ago)

Author:

Mathieu Morlighem

Message:

NEW: added weertman like friction law for SIA (Kevin)

File:

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

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

@@ -109 +109 @@
         bool   isSIA;
         bool   islevelset;
+        int    frictionlaw;
         iomodel->Constant(&isSIA,FlowequationIsSIAEnum);
         iomodel->Constant(&islevelset,TransientIslevelsetEnum);
+        iomodel->Constant(&frictionlaw,FrictionLawEnum);
 
         /*Now, is the flag SIA on? otherwise, do nothing: */
@@ -125 +127 @@
                         counter++;
                 }
+        }
+
+        /*Friction law variables*/
+        switch(frictionlaw){
+                case 1:
+                        iomodel->FetchDataToInput(elements,FrictionCoefficientEnum);
+                        iomodel->FetchDataToInput(elements,FrictionPEnum);
+                        iomodel->FetchDataToInput(elements,FrictionQEnum);
+                        break;
+                case 2:
+                        iomodel->FetchDataToInput(elements,FrictionCEnum);
+                        iomodel->FetchDataToInput(elements,FrictionMEnum);
+                        break;
+                case 6:
+                        iomodel->FetchDataToInput(elements,FrictionCEnum);
+                        iomodel->FetchDataToInput(elements,FrictionMEnum);
+                        iomodel->FetchDataToInput(elements,PressureEnum);
+                        iomodel->FetchDataToInput(elements,TemperatureEnum);
+                        break;
+                default:
+                        _error_("not supported");
         }