[cig-commits] r20054 - short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/problems
brad at geodynamics.org
brad at geodynamics.org
Tue May 8 15:27:51 PDT 2012
Author: brad
Date: 2012-05-08 15:27:51 -0700 (Tue, 08 May 2012)
New Revision: 20054
Modified:
short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/problems/SolverNonlinear.cc
Log:
Updated SNES line search to keep in sync with PETSc.
Modified: short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/problems/SolverNonlinear.cc
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/problems/SolverNonlinear.cc 2012-05-08 21:31:04 UTC (rev 20053)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/problems/SolverNonlinear.cc 2012-05-08 22:27:51 UTC (rev 20054)
@@ -248,7 +248,7 @@
SETERRQ(((PetscObject)linesearch)->comm, PETSC_ERR_USER, "SNESLineSearchBT requires a Jacobian matrix");
}
/* precheck */
- ierr = SNESLineSearchPreCheck(linesearch, &changed_y);CHKERRQ(ierr);
+ ierr = SNESLineSearchPreCheck(linesearch,X,Y,&changed_y);CHKERRQ(ierr);
ierr = SNESLineSearchSetSuccess(linesearch, PETSC_TRUE);CHKERRQ(ierr);
ierr = VecNorm(Y, NORM_2, &ynorm);CHKERRQ(ierr);
@@ -460,7 +460,7 @@
}
/* postcheck */
- ierr = SNESLineSearchPostCheck(linesearch, &changed_y, &changed_w);CHKERRQ(ierr);
+ ierr = SNESLineSearchPostCheck(linesearch,X,Y,W,&changed_y,&changed_w);CHKERRQ(ierr);
if (changed_y) {
ierr = VecWAXPY(W,-lambda,Y,X);CHKERRQ(ierr);
if (linesearch->ops->viproject) {
More information about the CIG-COMMITS
mailing list