Changeset 23620
- Timestamp:
- 01/10/19 07:09:19 (6 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp
r23587 r23620 198 198 iomodel->FetchDataToInput(elements,"md.friction.p",FrictionPEnum); 199 199 iomodel->FetchDataToInput(elements,"md.friction.q",FrictionQEnum); 200 if (FrictionCoupling==1){ 201 iomodel->FetchDataToInput(elements,"md.friction.effective_pressure",FrictionEffectivePressureEnum); 200 if (FrictionCoupling==3){ 201 iomodel->FetchDataToInput(elements,"md.friction.effective_pressure",FrictionEffectivePressureEnum);} 202 else if(FrictionCoupling==4){ 203 iomodel->FetchDataToInput(elements,"md.friction.effective_pressure",EffectivePressureEnum); 202 204 } 203 205 break; … … 211 213 iomodel->FetchDataToInput(elements,"md.friction.As",FrictionAsEnum); 212 214 iomodel->FetchDataToInput(elements,"md.friction.q",FrictionQEnum); 213 if (FrictionCoupling==1){ 214 iomodel->FetchDataToInput(elements,"md.friction.effective_pressure",FrictionEffectivePressureEnum); 215 if (FrictionCoupling==3){ 216 iomodel->FetchDataToInput(elements,"md.friction.effective_pressure",FrictionEffectivePressureEnum);} 217 else if(FrictionCoupling==4){ 218 iomodel->FetchDataToInput(elements,"md.friction.effective_pressure",EffectivePressureEnum); 215 219 } 216 220 break; … … 241 245 iomodel->FetchDataToInput(elements,"md.friction.p",FrictionPEnum); 242 246 iomodel->FetchDataToInput(elements,"md.friction.q",FrictionQEnum); 243 if (FrictionCoupling==1){ 244 iomodel->FetchDataToInput(elements,"md.friction.effective_pressure",FrictionEffectivePressureEnum); 247 if (FrictionCoupling==3){ 248 iomodel->FetchDataToInput(elements,"md.friction.effective_pressure",FrictionEffectivePressureEnum);} 249 else if(FrictionCoupling==4){ 250 iomodel->FetchDataToInput(elements,"md.friction.effective_pressure",EffectivePressureEnum); 245 251 } 246 252 break;
Note:
See TracChangeset
for help on using the changeset viewer.