[cig-commits] r17014 - in short/3D/PyLith/trunk: doc/userguide/governingeqns libsrc/friction libsrc/topology

[brad at geodynamics.org]

Author: brad
Date: 2010-06-21 19:49:32 -0700 (Mon, 21 Jun 2010)
New Revision: 17014

Modified:
   short/3D/PyLith/trunk/doc/userguide/governingeqns/governingeqns.lyx
   short/3D/PyLith/trunk/libsrc/friction/RateStateAgeing.cc
   short/3D/PyLith/trunk/libsrc/friction/SlipWeakening.cc
   short/3D/PyLith/trunk/libsrc/friction/StaticFriction.cc
   short/3D/PyLith/trunk/libsrc/topology/RefineUniform.cc
Log:
Merge from stable.

Modified: short/3D/PyLith/trunk/doc/userguide/governingeqns/governingeqns.lyx
===================================================================
--- short/3D/PyLith/trunk/doc/userguide/governingeqns/governingeqns.lyx	2010-06-19 20:39:58 UTC (rev 17013)
+++ short/3D/PyLith/trunk/doc/userguide/governingeqns/governingeqns.lyx	2010-06-22 02:49:32 UTC (rev 17014)
@@ -1537,7 +1537,7 @@
  The Green-Lagrange strain provides a measure of the strain relative to
  the original, undeformed configuration.
 \begin_inset Formula \begin{gather}
-\varepsilon_{ij}=\frac{1}{2}(u_{i,j}+u_{j,i}+u_{k,i}u_{k,i}),\text{ or}\\
+\varepsilon_{ij}=\frac{1}{2}(u_{i,j}+u_{j,i}+u_{k,i}u_{k,j}),\text{ or}\\
 \varepsilon_{ij}=X_{ji}X_{ij}-\delta_{ij},\text{ where}\\
 X_{ij}=x_{i,j}(t)=\frac{\partial}{\partial x_{j}}(x_{i}(0)+u_{i}(t)),\end{gather}
 

Modified: short/3D/PyLith/trunk/libsrc/friction/RateStateAgeing.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/friction/RateStateAgeing.cc	2010-06-19 20:39:58 UTC (rev 17013)
+++ short/3D/PyLith/trunk/libsrc/friction/RateStateAgeing.cc	2010-06-22 02:49:32 UTC (rev 17014)
@@ -143,9 +143,9 @@
   const double b = dbValues[db_b];
   const double cohesion = dbValues[db_cohesion];
  
-  if (frictionCoef <= 0.0) {
+  if (frictionCoef < 0.0) {
     std::ostringstream msg;
-    msg << "Spatial database returned nonpositive value for reference coefficient "
+    msg << "Spatial database returned negative value for reference coefficient "
 	<< "of Rate and State friction Ageing Law.\n"
 	<< "reference coefficient of friction: " << frictionCoef << "\n";
     throw std::runtime_error(msg.str());

Modified: short/3D/PyLith/trunk/libsrc/friction/SlipWeakening.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/friction/SlipWeakening.cc	2010-06-19 20:39:58 UTC (rev 17013)
+++ short/3D/PyLith/trunk/libsrc/friction/SlipWeakening.cc	2010-06-22 02:49:32 UTC (rev 17014)
@@ -133,17 +133,17 @@
   const double db_do = dbValues[db_d0];
   const double db_c = dbValues[db_cohesion];
 
-  if (db_static <= 0.0) {
+  if (db_static < 0.0) {
     std::ostringstream msg;
-    msg << "Spatial database returned nonpositive value for static coefficient "
+    msg << "Spatial database returned negative value for static coefficient "
 	<< "of friction.\n"
 	<< "static coefficient of friction: " << db_static << "\n";
     throw std::runtime_error(msg.str());
   } // if
 
-  if (db_dynamic <= 0.0) {
+  if (db_dynamic < 0.0) {
     std::ostringstream msg;
-    msg << "Spatial database returned nonpositive value for dynamic coefficient "
+    msg << "Spatial database returned negative value for dynamic coefficient "
 	<< "of friction.\n"
 	<< "dynamic coefficient of friction: " << db_dynamic << "\n";
     throw std::runtime_error(msg.str());

Modified: short/3D/PyLith/trunk/libsrc/friction/StaticFriction.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/friction/StaticFriction.cc	2010-06-19 20:39:58 UTC (rev 17013)
+++ short/3D/PyLith/trunk/libsrc/friction/StaticFriction.cc	2010-06-22 02:49:32 UTC (rev 17014)
@@ -93,9 +93,9 @@
   const double coef = dbValues[db_coef];
   const double cohesion = dbValues[db_cohesion];
  
-  if (coef <= 0.0) {
+  if (coef < 0.0) {
     std::ostringstream msg;
-    msg << "Spatial database returned nonpositive value for coefficient "
+    msg << "Spatial database returned negative value for coefficient "
 	<< "of friction.\n"
 	<< "coefficient of friction: " << coef << "\n";
     throw std::runtime_error(msg.str());

Modified: short/3D/PyLith/trunk/libsrc/topology/RefineUniform.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/topology/RefineUniform.cc	2010-06-19 20:39:58 UTC (rev 17013)
+++ short/3D/PyLith/trunk/libsrc/topology/RefineUniform.cc	2010-06-22 02:49:32 UTC (rev 17014)
@@ -107,10 +107,12 @@
     new SieveMesh::sieve_type(mesh.comm(), mesh.debug());
 
   std::map<edge_type, point_type> edge2vertex;
-    
+   
+#if 0 // DON'T KNOW NEW INTERFACE 
   newSieveMesh->setSieve(newSieve);
   ALE::MeshBuilder<Mesh>::refineTetrahedra(*mesh.sieveMesh(), * newSieveMesh,
 					   edge2vertex);
+#endif
 
   // Fix material ids
   const int numCells = sieveMesh->heightStratum(0)->size();