Changeset 24666 for issm/trunk-jpl/src/c/analyses/ThermalAnalysis.cpp

Timestamp:

03/16/20 02:01:18 (5 years ago)

Author:

rueckamp

Message:

CHG: add a limit for effective pressure

File:

• issm/trunk-jpl/src/c/analyses/ThermalAnalysis.cpp (modified) (1 diff)

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

@@ -275 +275 @@
         int frictionlaw;
         iomodel->FindConstant(&frictionlaw,"md.friction.law");
-        if(frictionlaw==4 || frictionlaw==6){
+        if(frictionlaw==6){
                 parameters->AddObject(iomodel->CopyConstantObject("md.friction.gamma",FrictionGammaEnum));
         }
-        if(frictionlaw==3 || frictionlaw==1 || frictionlaw==7){
+        if(frictionlaw==4){
+                parameters->AddObject(iomodel->CopyConstantObject("md.friction.gamma",FrictionGammaEnum));
                 parameters->AddObject(iomodel->CopyConstantObject("md.friction.coupling",FrictionCouplingEnum));
+                parameters->AddObject(iomodel->CopyConstantObject("md.friction.effective_pressure_limit",FrictionEffectivePressureLimitEnum));
+        }
+        if(frictionlaw==1 || frictionlaw==3 || frictionlaw==7){
+                parameters->AddObject(iomodel->CopyConstantObject("md.friction.coupling",FrictionCouplingEnum));
+                parameters->AddObject(iomodel->CopyConstantObject("md.friction.effective_pressure_limit",FrictionEffectivePressureLimitEnum));
         }
         if(frictionlaw==9){
                 parameters->AddObject(iomodel->CopyConstantObject("md.friction.gamma",FrictionGammaEnum));
+                parameters->AddObject(iomodel->CopyConstantObject("md.friction.effective_pressure_limit",FrictionEffectivePressureLimitEnum));
                 parameters->AddObject(new IntParam(FrictionCouplingEnum,0));
         }