Changeset 22050

Timestamp:

09/06/17 04:50:18 (8 years ago)

Author:

sjohnsen

Message:

NEW: added CoupledFlag(Neff) for frictionlaw 7, coulomb

File:

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

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

@@ -822 +822 @@
                         break;
                 case 7:
+                        iomodel->FindConstant(&FrictionCoupling,"md.friction.coupling");
                         iomodel->FetchDataToInput(elements,"md.friction.coefficient",FrictionCoefficientEnum);
                         iomodel->FetchDataToInput(elements,"md.friction.coefficientcoulomb",FrictionCoefficientcoulombEnum);
                         iomodel->FetchDataToInput(elements,"md.friction.p",FrictionPEnum);
                         iomodel->FetchDataToInput(elements,"md.friction.q",FrictionQEnum);
+                        if(FrictionCoupling==1){
+                                iomodel->FetchDataToInput(elements,"md.friction.effective_pressure",FrictionEffectivePressureEnum);
+                        }
                         break;
                 case 9:
@@ -897 +901 @@
         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==3 || frictionlaw==1 || frictionlaw==7) parameters->AddObject(iomodel->CopyConstantObject("md.friction.coupling",FrictionCouplingEnum));
         if(frictionlaw==5) parameters->AddObject(iomodel->CopyConstantObject("md.friction.f",FrictionFEnum));
         if(frictionlaw==9) parameters->AddObject(iomodel->CopyConstantObject("md.friction.gamma",FrictionGammaEnum));