# [cig-commits] r18531 - short/3D/PyLith/trunk/libsrc/pylith/problems

knepley at geodynamics.org knepley at geodynamics.org
Thu Jun 2 17:23:22 PDT 2011

Author: knepley
Date: 2011-06-02 17:23:21 -0700 (Thu, 02 Jun 2011)
New Revision: 18531

Modified:
short/3D/PyLith/trunk/libsrc/pylith/problems/SolverNonlinear.cc
Log:
Do not fail on line search for friction

Modified: short/3D/PyLith/trunk/libsrc/pylith/problems/SolverNonlinear.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/problems/SolverNonlinear.cc	2011-06-02 22:58:55 UTC (rev 18530)
+++ short/3D/PyLith/trunk/libsrc/pylith/problems/SolverNonlinear.cc	2011-06-03 00:23:21 UTC (rev 18531)
@@ -210,7 +210,7 @@
Formulation* formulation = (Formulation*) context;
assert(0 != formulation);

-  // Project solution back to admissible space.
+  // Make sure we have an admissible Lagrange force (\lambda)
formulation->constrainSolnSpace(&tmpSolutionVec);

// Reform residual
@@ -377,7 +377,7 @@
"initial slope=%18.16e\n",
fnorm,*gnorm,*ynorm,minlambda,lambda,initslope);
CHKERRQ(ierr);
-      *flag = PETSC_FALSE;
+      ierr = PetscInfo1(snes,"Using last lambda tried %g\n",lambda);CHKERRQ(ierr);
break;
}
t1 = .5*((*gnorm)*(*gnorm) - fnorm*fnorm) - lambda*initslope;