Changeset 21776

Timestamp:

06/30/17 10:50:52 (8 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixing Basile's commit

File:

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

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

@@ -248 +248 @@
         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) parameters->AddObject(iomodel->CopyConstantObject("md.friction.coupling",FrictionCouplingEnum));
-        if(frictionlaw==9) parameters->AddObject(iomodel->CopyConstantObject("md.friction.gamma",FrictionGammaEnum));
+        if(frictionlaw==4 || frictionlaw==6){
+                parameters->AddObject(iomodel->CopyConstantObject("md.friction.gamma",FrictionGammaEnum));
+                parameters->AddObject(new BoolParam(FrictionCouplingEnum,false));
+        }
+        if(frictionlaw==3 || frictionlaw==1){
+                parameters->AddObject(iomodel->CopyConstantObject("md.friction.coupling",FrictionCouplingEnum));
+        }
+        if(frictionlaw==9){
+                parameters->AddObject(iomodel->CopyConstantObject("md.friction.gamma",FrictionGammaEnum));
+        }
 }/*}}}*/