[cig-commits] r17228 - short/3D/PyLith/trunk/libsrc/problems

[brad at geodynamics.org]

Author: brad
Date: 2010-09-28 19:00:58 -0700 (Tue, 28 Sep 2010)
New Revision: 17228

Modified:
   short/3D/PyLith/trunk/libsrc/problems/SolverNonlinear.cc
   short/3D/PyLith/trunk/libsrc/problems/SolverNonlinear.hh
Log:
Merge from trunk.

Modified: short/3D/PyLith/trunk/libsrc/problems/SolverNonlinear.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/problems/SolverNonlinear.cc	2010-09-29 01:59:24 UTC (rev 17227)
+++ short/3D/PyLith/trunk/libsrc/problems/SolverNonlinear.cc	2010-09-29 02:00:58 UTC (rev 17228)
@@ -183,7 +183,7 @@
 					      PetscReal xnorm,
 					      PetscReal *ynorm,
 					      PetscReal *gnorm,
-					      PetscTruth *flag)
+					      PetscBool *flag)
 { // lineSearch
   // Note that for line search purposes we work with with the related
   // minimization problem:
@@ -198,7 +198,7 @@
   PetscErrorCode ierr;
   PetscInt       count;
   SNES_LS        *neP = (SNES_LS*)snes->data;
-  PetscTruth     changed_w = PETSC_FALSE,changed_y = PETSC_FALSE;
+  PetscBool     changed_w = PETSC_FALSE,changed_y = PETSC_FALSE;
 
   PetscFunctionBegin;
   ierr = PetscLogEventBegin(SNES_LineSearch,snes,x,f,g);CHKERRQ(ierr);

Modified: short/3D/PyLith/trunk/libsrc/problems/SolverNonlinear.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/problems/SolverNonlinear.hh	2010-09-29 01:59:24 UTC (rev 17227)
+++ short/3D/PyLith/trunk/libsrc/problems/SolverNonlinear.hh	2010-09-29 02:00:58 UTC (rev 17228)
@@ -139,7 +139,7 @@
 			    PetscReal xnorm,
 			    PetscReal *ynorm,
 			    PetscReal *gnorm,
-			    PetscTruth *flag);
+			    PetscBool *flag);
 
 // PRIVATE METHODS //////////////////////////////////////////////////////
 private :