[cig-commits] r19787 - in short/3D/PyLith/trunk: examples/3d/hex8 libsrc/pylith/problems

[knepley at geodynamics.org]

Author: knepley
Date: 2012-03-15 09:51:23 -0700 (Thu, 15 Mar 2012)
New Revision: 19787

Modified:
   short/3D/PyLith/trunk/examples/3d/hex8/pylithapp.cfg
   short/3D/PyLith/trunk/libsrc/pylith/problems/SolverNonlinear.cc
Log:
Pushed a fix for new SNES line search organization


Modified: short/3D/PyLith/trunk/examples/3d/hex8/pylithapp.cfg
===================================================================
--- short/3D/PyLith/trunk/examples/3d/hex8/pylithapp.cfg	2012-03-15 16:02:49 UTC (rev 19786)
+++ short/3D/PyLith/trunk/examples/3d/hex8/pylithapp.cfg	2012-03-15 16:51:23 UTC (rev 19787)
@@ -75,6 +75,9 @@
 # ----------------------------------------------------------------------
 # Set the solver options.
 [pylithapp.petsc]
+#malloc = True
+#malloc_debug = True
+#malloc_dump = True
 
 # Preconditioner settings.
 pc_type = asm

Modified: short/3D/PyLith/trunk/libsrc/pylith/problems/SolverNonlinear.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/problems/SolverNonlinear.cc	2012-03-15 16:02:49 UTC (rev 19786)
+++ short/3D/PyLith/trunk/libsrc/pylith/problems/SolverNonlinear.cc	2012-03-15 16:51:23 UTC (rev 19787)
@@ -189,11 +189,11 @@
 					      void *lsctx,
 					      PetscVec x,
 					      PetscVec f,
+					      PetscVec g,
 					      PetscVec y,
+					      PetscVec w,
 					      PetscReal fnorm,
 					      PetscReal xnorm,
-					      PetscVec g,
-					      PetscVec w,
 					      PetscReal *ynorm,
 					      PetscReal *gnorm,
 					      PetscBool *flag)