Changeset 19162


Ignore:
Timestamp:
02/26/15 10:11:27 (10 years ago)
Author:
bdef
Message:

BUG: fix for the friction coupling

Location:
issm/trunk-jpl/src/c/analyses
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp

    r19161 r19162  
    230230        iomodel->Constant(&frictionlaw,FrictionLawEnum);
    231231        if(frictionlaw==4 || frictionlaw==6) parameters->AddObject(iomodel->CopyConstantObject(FrictionGammaEnum));
     232        if(frictionlaw==3) parameters->AddObject(iomodel->CopyConstantObject(FrictionCouplingEnum));
    232233}/*}}}*/
    233234

  • issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp

    r19161 r19162  
    890890        iomodel->Constant(&frictionlaw,FrictionLawEnum);
    891891        if(frictionlaw==4 || frictionlaw==6) parameters->AddObject(iomodel->CopyConstantObject(FrictionGammaEnum));
     892        if(frictionlaw==3) parameters->AddObject(iomodel->CopyConstantObject(FrictionCouplingEnum));
    892893
    893894}/*}}}*/

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

    r19161 r19162  
    185185        iomodel->Constant(&frictionlaw,FrictionLawEnum);
    186186        if(frictionlaw==4 || frictionlaw==6) parameters->AddObject(iomodel->CopyConstantObject(FrictionGammaEnum));
     187        if(frictionlaw==3) parameters->AddObject(iomodel->CopyConstantObject(FrictionCouplingEnum));
    187188}/*}}}*/
    188189
Note: See TracChangeset for help on using the changeset viewer.