[cig-commits] r19791 - in short/3D/PyLith/branches/pylith-scecdynrup: . examples/3d/hex8 libsrc/pylith/friction libsrc/pylith/problems

[brad at geodynamics.org]

Author: brad
Date: 2012-03-15 15:19:59 -0700 (Thu, 15 Mar 2012)
New Revision: 19791

Modified:
   short/3D/PyLith/branches/pylith-scecdynrup/examples/3d/hex8/pylithapp.cfg
   short/3D/PyLith/branches/pylith-scecdynrup/examples/3d/hex8/step11.cfg
   short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/friction/StaticFriction.cc
   short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/problems/SolverNonlinear.cc
   short/3D/PyLith/branches/pylith-scecdynrup/merge.sh
Log:
Merge from trunk.

Modified: short/3D/PyLith/branches/pylith-scecdynrup/examples/3d/hex8/pylithapp.cfg
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/examples/3d/hex8/pylithapp.cfg	2012-03-15 22:17:44 UTC (rev 19790)
+++ short/3D/PyLith/branches/pylith-scecdynrup/examples/3d/hex8/pylithapp.cfg	2012-03-15 22:19:59 UTC (rev 19791)
@@ -44,7 +44,11 @@
 [pylithapp.timedependent.formulation.time_step]
 # Define the total time for the simulation and the default time step size.
 total_time = 0.0*s ; total time of simulation
+# Define an appropriat time step for simulations. Important for
+# nondimensionalization of velocities and slip rates.
+dt = 5.0*year
 
+
 # ----------------------------------------------------------------------
 # materials
 # ----------------------------------------------------------------------
@@ -75,6 +79,9 @@
 # ----------------------------------------------------------------------
 # Set the solver options.
 [pylithapp.petsc]
+#malloc = True
+#malloc_debug = True
+#malloc_dump = True
 
 # Preconditioner settings.
 pc_type = asm

Modified: short/3D/PyLith/branches/pylith-scecdynrup/examples/3d/hex8/step11.cfg
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/examples/3d/hex8/step11.cfg	2012-03-15 22:17:44 UTC (rev 19790)
+++ short/3D/PyLith/branches/pylith-scecdynrup/examples/3d/hex8/step11.cfg	2012-03-15 22:19:59 UTC (rev 19791)
@@ -78,7 +78,7 @@
 db_initial = spatialdata.spatialdb.UniformDB
 db_initial.label = Dirichlet BC on +x
 db_initial.values = [displacement-x,displacement-y]
-db_initial.data = [-1.0*m,2.0*m]
+db_initial.data = [-1.0*m,3.0*m]
 
 # -x face
 [pylithapp.timedependent.bc.x_neg]
@@ -87,7 +87,7 @@
 db_initial = spatialdata.spatialdb.UniformDB
 db_initial.label = Dirichlet BC on -x
 db_initial.values = [displacement-x,displacement-y]
-db_initial.data = [1.0*m,-2.0*m]
+db_initial.data = [1.0*m,-3.0*m]
 
 # -z face
 [pylithapp.timedependent.bc.z_neg]

Modified: short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/friction/StaticFriction.cc
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/friction/StaticFriction.cc	2012-03-15 22:17:44 UTC (rev 19790)
+++ short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/friction/StaticFriction.cc	2012-03-15 22:19:59 UTC (rev 19791)
@@ -158,7 +158,7 @@
   assert(0 == numStateVars);
 
   const PylithScalar friction = (normalTraction <= 0.0) ?
-    -properties[p_coef] * normalTraction + properties[p_cohesion]: 
+    properties[p_cohesion] - properties[p_coef] * normalTraction :
     properties[p_cohesion];
 
   PetscLogFlops(2);

Modified: short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/problems/SolverNonlinear.cc
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/problems/SolverNonlinear.cc	2012-03-15 22:17:44 UTC (rev 19790)
+++ short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/problems/SolverNonlinear.cc	2012-03-15 22:19:59 UTC (rev 19791)
@@ -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)

Modified: short/3D/PyLith/branches/pylith-scecdynrup/merge.sh
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/merge.sh	2012-03-15 22:17:44 UTC (rev 19790)
+++ short/3D/PyLith/branches/pylith-scecdynrup/merge.sh	2012-03-15 22:19:59 UTC (rev 19791)
@@ -1,2 +1,2 @@
 svn up
-svn merge -r 16682:HEAD svn+ssh://svn@geodynamics.org/cig/short/3D/PyLith/trunk .
+svn merge -r REV_FROM_LAST_MERGE:HEAD svn+ssh://svn@geodynamics.org/cig/short/3D/PyLith/trunk .