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

[brad at geodynamics.org]

Author: brad
Date: 2012-03-15 15:17:44 -0700 (Thu, 15 Mar 2012)
New Revision: 19790

Modified:
   short/3D/PyLith/trunk/examples/3d/hex8/pylithapp.cfg
   short/3D/PyLith/trunk/examples/3d/hex8/step11.cfg
   short/3D/PyLith/trunk/libsrc/pylith/friction/StaticFriction.cc
Log:
Merge from stable.

Modified: short/3D/PyLith/trunk/examples/3d/hex8/pylithapp.cfg
===================================================================
--- short/3D/PyLith/trunk/examples/3d/hex8/pylithapp.cfg	2012-03-15 21:45:56 UTC (rev 19789)
+++ short/3D/PyLith/trunk/examples/3d/hex8/pylithapp.cfg	2012-03-15 22:17:44 UTC (rev 19790)
@@ -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
 # ----------------------------------------------------------------------

Modified: short/3D/PyLith/trunk/examples/3d/hex8/step11.cfg
===================================================================
--- short/3D/PyLith/trunk/examples/3d/hex8/step11.cfg	2012-03-15 21:45:56 UTC (rev 19789)
+++ short/3D/PyLith/trunk/examples/3d/hex8/step11.cfg	2012-03-15 22:17:44 UTC (rev 19790)
@@ -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/trunk/libsrc/pylith/friction/StaticFriction.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/friction/StaticFriction.cc	2012-03-15 21:45:56 UTC (rev 19789)
+++ short/3D/PyLith/trunk/libsrc/pylith/friction/StaticFriction.cc	2012-03-15 22:17:44 UTC (rev 19790)
@@ -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);