[cig-commits] r17009 - short/3D/PyLith/branches/v1.5-stable/libsrc/friction
brad at geodynamics.org
brad at geodynamics.org
Mon Jun 14 20:46:25 PDT 2010
Author: brad
Date: 2010-06-14 20:46:25 -0700 (Mon, 14 Jun 2010)
New Revision: 17009
Modified:
short/3D/PyLith/branches/v1.5-stable/libsrc/friction/RateStateAgeing.cc
short/3D/PyLith/branches/v1.5-stable/libsrc/friction/SlipWeakening.cc
short/3D/PyLith/branches/v1.5-stable/libsrc/friction/StaticFriction.cc
Log:
Permit zero coefficient of friction values.
Modified: short/3D/PyLith/branches/v1.5-stable/libsrc/friction/RateStateAgeing.cc
===================================================================
--- short/3D/PyLith/branches/v1.5-stable/libsrc/friction/RateStateAgeing.cc 2010-06-14 00:38:29 UTC (rev 17008)
+++ short/3D/PyLith/branches/v1.5-stable/libsrc/friction/RateStateAgeing.cc 2010-06-15 03:46:25 UTC (rev 17009)
@@ -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/branches/v1.5-stable/libsrc/friction/SlipWeakening.cc
===================================================================
--- short/3D/PyLith/branches/v1.5-stable/libsrc/friction/SlipWeakening.cc 2010-06-14 00:38:29 UTC (rev 17008)
+++ short/3D/PyLith/branches/v1.5-stable/libsrc/friction/SlipWeakening.cc 2010-06-15 03:46:25 UTC (rev 17009)
@@ -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/branches/v1.5-stable/libsrc/friction/StaticFriction.cc
===================================================================
--- short/3D/PyLith/branches/v1.5-stable/libsrc/friction/StaticFriction.cc 2010-06-14 00:38:29 UTC (rev 17008)
+++ short/3D/PyLith/branches/v1.5-stable/libsrc/friction/StaticFriction.cc 2010-06-15 03:46:25 UTC (rev 17009)
@@ -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());
More information about the CIG-COMMITS
mailing list