source: issm/oecreview/Archive/21724-22754/ISSM-22047-22048.diff@ 22755

Last change on this file since 22755 was 22755, checked in by Mathieu Morlighem, 7 years ago

CHG: added 21724-22754
File size: 1.6 KB
RevLine 
[22755]1Index: ../trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp
2===================================================================
3--- ../trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp (revision 22047)
4+++ ../trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp (revision 22048)
5@@ -213,6 +213,16 @@
6 iomodel->FetchDataToInput(elements,"md.initialization.pressure",PressureEnum);
7 iomodel->FetchDataToInput(elements,"md.initialization.temperature",TemperatureEnum);
8 break;
9+ case 7:
10+ iomodel->FindConstant(&FrictionCoupling,"md.friction.coupling");
11+ iomodel->FetchDataToInput(elements,"md.friction.coefficient",FrictionCoefficientEnum);
12+ iomodel->FetchDataToInput(elements,"md.friction.coefficientcoulomb",FrictionCoefficientcoulombEnum);
13+ iomodel->FetchDataToInput(elements,"md.friction.p",FrictionPEnum);
14+ iomodel->FetchDataToInput(elements,"md.friction.q",FrictionQEnum);
15+ if (FrictionCoupling==1){
16+ iomodel->FetchDataToInput(elements,"md.friction.effective_pressure",FrictionEffectivePressureEnum);
17+ }
18+ break;
19 case 9:
20 iomodel->FetchDataToInput(elements,"md.friction.coefficient",FrictionCoefficientEnum);
21 iomodel->FetchDataToInput(elements,"md.friction.pressure_adjusted_temperature",FrictionPressureAdjustedTemperatureEnum);
22@@ -250,7 +260,7 @@
23 if(frictionlaw==4 || frictionlaw==6){
24 parameters->AddObject(iomodel->CopyConstantObject("md.friction.gamma",FrictionGammaEnum));
25 }
26- if(frictionlaw==3 || frictionlaw==1){
27+ if(frictionlaw==3 || frictionlaw==1 || frictionlaw==7){
28 parameters->AddObject(iomodel->CopyConstantObject("md.friction.coupling",FrictionCouplingEnum));
29 }
30 if(frictionlaw==9){
Note: See TracBrowser for help on using the repository browser.