source: issm/oecreview/Archive/23390-24306/ISSM-23619-23620.diff@ 24307

Last change on this file since 24307 was 24307, checked in by Mathieu Morlighem, 5 years ago

NEW: adding Archive/23390-24306
File size: 2.3 KB
RevLine 
[24307]1Index: ../trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp
2===================================================================
3--- ../trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp (revision 23619)
4+++ ../trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp (revision 23620)
5@@ -197,8 +197,10 @@
6 iomodel->FetchDataToInput(elements,"md.friction.coefficient",FrictionCoefficientEnum);
7 iomodel->FetchDataToInput(elements,"md.friction.p",FrictionPEnum);
8 iomodel->FetchDataToInput(elements,"md.friction.q",FrictionQEnum);
9- if (FrictionCoupling==1){
10- iomodel->FetchDataToInput(elements,"md.friction.effective_pressure",FrictionEffectivePressureEnum);
11+ if (FrictionCoupling==3){
12+ iomodel->FetchDataToInput(elements,"md.friction.effective_pressure",FrictionEffectivePressureEnum);}
13+ else if(FrictionCoupling==4){
14+ iomodel->FetchDataToInput(elements,"md.friction.effective_pressure",EffectivePressureEnum);
15 }
16 break;
17 case 2:
18@@ -210,8 +212,10 @@
19 iomodel->FetchDataToInput(elements,"md.friction.C",FrictionCEnum);
20 iomodel->FetchDataToInput(elements,"md.friction.As",FrictionAsEnum);
21 iomodel->FetchDataToInput(elements,"md.friction.q",FrictionQEnum);
22- if (FrictionCoupling==1){
23- iomodel->FetchDataToInput(elements,"md.friction.effective_pressure",FrictionEffectivePressureEnum);
24+ if (FrictionCoupling==3){
25+ iomodel->FetchDataToInput(elements,"md.friction.effective_pressure",FrictionEffectivePressureEnum);}
26+ else if(FrictionCoupling==4){
27+ iomodel->FetchDataToInput(elements,"md.friction.effective_pressure",EffectivePressureEnum);
28 }
29 break;
30 case 4:
31@@ -240,8 +244,10 @@
32 iomodel->FetchDataToInput(elements,"md.friction.coefficientcoulomb",FrictionCoefficientcoulombEnum);
33 iomodel->FetchDataToInput(elements,"md.friction.p",FrictionPEnum);
34 iomodel->FetchDataToInput(elements,"md.friction.q",FrictionQEnum);
35- if (FrictionCoupling==1){
36- iomodel->FetchDataToInput(elements,"md.friction.effective_pressure",FrictionEffectivePressureEnum);
37+ if (FrictionCoupling==3){
38+ iomodel->FetchDataToInput(elements,"md.friction.effective_pressure",FrictionEffectivePressureEnum);}
39+ else if(FrictionCoupling==4){
40+ iomodel->FetchDataToInput(elements,"md.friction.effective_pressure",EffectivePressureEnum);
41 }
42 break;
43 case 9:
Note: See TracBrowser for help on using the repository browser.