Changeset 21875

Timestamp:

07/26/17 11:48:03 (8 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixed coupling param missing for friction 9

File:

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

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

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