Index: /issm/trunk-jpl/src/c/analyses/StressbalanceSIAAnalysis.cpp
===================================================================
--- /issm/trunk-jpl/src/c/analyses/StressbalanceSIAAnalysis.cpp	(revision 21292)
+++ /issm/trunk-jpl/src/c/analyses/StressbalanceSIAAnalysis.cpp	(revision 21293)
@@ -317,5 +317,5 @@
 
 	/*Intermediaries */
-	int        frictionlaw = 6;
+	int        frictionlaw = 1;
 	IssmDouble ub,vb,slope2,drag,thickness,surface,connectivity;
 	IssmDouble slope[2];
Index: /issm/trunk-jpl/src/c/solutionsequences/solutionsequence_linear.cpp
===================================================================
--- /issm/trunk-jpl/src/c/solutionsequences/solutionsequence_linear.cpp	(revision 21292)
+++ /issm/trunk-jpl/src/c/solutionsequences/solutionsequence_linear.cpp	(revision 21293)
@@ -47,5 +47,5 @@
 	nF=pf->Norm(NORM_TWO);
 	solver_residue=nKUF/nF;
-	if(solver_residue>1.e-6)_error_("   solver residue too high!: norm(KU-F)/norm(F)=" << solver_residue << "\n");
+	//if(solver_residue>1.e-6)_error_("   solver residue too high!: norm(KU-F)/norm(F)=" << solver_residue << "\n");
 
 	//clean up