Changeset 21873

Timestamp:

07/26/17 11:39:13 (8 years ago)

Author:

Mathieu Morlighem

Message:

CHG: added support for friction law 9

Location:

issm/trunk-jpl/src/c/analyses

Files:

• EnthalpyAnalysis.cpp (modified) (1 diff)
• ThermalAnalysis.cpp (modified) (1 diff)

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

@@ -221 +221 @@
                         break;
                 default:
-                        _error_("not supported");
+                        _error_("friction law not supported");
         }
 

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

@@ -197 +197 @@
                         iomodel->FetchDataToInput(elements,"md.initialization.temperature",TemperatureEnum);
                         break;
+                case 9:
+                        iomodel->FetchDataToInput(elements,"md.friction.coefficient",FrictionCoefficientEnum);
+                        iomodel->FetchDataToInput(elements,"md.friction.pressure_adjusted_temperature",FrictionPressureAdjustedTemperatureEnum);
+                        InputUpdateFromConstantx(elements,1.,FrictionPEnum);
+                        InputUpdateFromConstantx(elements,1.,FrictionQEnum);
+                        break;
                 default:
-                        _error_("not supported");
+                        _error_("friction law not supported");
         }
 }/*}}}*/