Index: ../trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp =================================================================== --- ../trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp (revision 22047) +++ ../trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp (revision 22048) @@ -213,6 +213,16 @@ 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: iomodel->FetchDataToInput(elements,"md.friction.coefficient",FrictionCoefficientEnum); iomodel->FetchDataToInput(elements,"md.friction.pressure_adjusted_temperature",FrictionPressureAdjustedTemperatureEnum); @@ -250,7 +260,7 @@ if(frictionlaw==4 || frictionlaw==6){ 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)); } if(frictionlaw==9){