Changeset 21293


Ignore:
Timestamp:
10/19/16 15:53:09 (8 years ago)
Author:
Mathieu Morlighem
Message:

CHG: reverting back

Location:
issm/trunk-jpl/src/c
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    r21292 r21293  
    317317
    318318        /*Intermediaries */
    319         int        frictionlaw = 6;
     319        int        frictionlaw = 1;
    320320        IssmDouble ub,vb,slope2,drag,thickness,surface,connectivity;
    321321        IssmDouble slope[2];

  • issm/trunk-jpl/src/c/solutionsequences/solutionsequence_linear.cpp

    r20676 r21293  
    4747        nF=pf->Norm(NORM_TWO);
    4848        solver_residue=nKUF/nF;
    49         if(solver_residue>1.e-6)_error_("   solver residue too high!: norm(KU-F)/norm(F)=" << solver_residue << "\n");
     49        //if(solver_residue>1.e-6)_error_("   solver residue too high!: norm(KU-F)/norm(F)=" << solver_residue << "\n");
    5050
    5151        //clean up
Note: See TracChangeset for help on using the changeset viewer.