Changeset 22049

Timestamp:

09/06/17 04:49:28 (8 years ago)

Author:

sjohnsen

Message:

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

File:

• issm/trunk-jpl/src/c/analyses/ThermalAnalysis.cpp (modified) (4 diffs)

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

@@ -162 +162 @@
                         iomodel->FetchDataToInput(elements,"md.friction.q",FrictionQEnum);
                         if (FrictionCoupling==1){
-                          iomodel->FetchDataToInput(elements,"md.friction.effective_pressure",FrictionEffectivePressureEnum);
+                                iomodel->FetchDataToInput(elements,"md.friction.effective_pressure",FrictionEffectivePressureEnum);
                         }
                         break;
@@ -175 +175 @@
                         iomodel->FetchDataToInput(elements,"md.friction.q",FrictionQEnum);
                         if (FrictionCoupling==1){
-                          iomodel->FetchDataToInput(elements,"md.friction.effective_pressure",FrictionEffectivePressureEnum);
+                                iomodel->FetchDataToInput(elements,"md.friction.effective_pressure",FrictionEffectivePressureEnum);
                         }
                         break;
@@ -196 +196 @@
                         iomodel->FetchDataToInput(elements,"md.initialization.pressure",PressureEnum);
                         iomodel->FetchDataToInput(elements,"md.initialization.temperature",TemperatureEnum);
+                        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:
@@ -232 +242 @@
                 parameters->AddObject(iomodel->CopyConstantObject("md.friction.gamma",FrictionGammaEnum));
         }
-        if(frictionlaw==3 || frictionlaw==1){
+        if(frictionlaw==3 || frictionlaw==1 || frictionlaw==7){
                 parameters->AddObject(iomodel->CopyConstantObject("md.friction.coupling",FrictionCouplingEnum));
         }