[cig-commits] r21056 - in short/3D/PyLith/branches/v1.7-trunk: libsrc/pylith libsrc/pylith/friction modulesrc/friction pylith pylith/friction unittests/libtests/friction unittests/libtests/friction/data unittests/pytests/friction
brad at geodynamics.org
brad at geodynamics.org
Mon Nov 19 17:52:16 PST 2012
Author: brad
Date: 2012-11-19 17:52:16 -0800 (Mon, 19 Nov 2012)
New Revision: 21056
Added:
short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/friction/SlipWeakeningStress.cc
short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/friction/SlipWeakeningStress.hh
short/3D/PyLith/branches/v1.7-trunk/modulesrc/friction/SlipWeakeningStress.i
short/3D/PyLith/branches/v1.7-trunk/pylith/friction/SlipWeakeningStress.py
short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/friction/TestSlipWeakeningStress.cc
short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/friction/TestSlipWeakeningStress.hh
short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/friction/data/SlipWeakeningStressData.cc
short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/friction/data/SlipWeakeningStressData.hh
short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/friction/TestSlipWeakeningStress.py
Modified:
short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/Makefile.am
short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/friction/Makefile.am
short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/friction/frictionfwd.hh
short/3D/PyLith/branches/v1.7-trunk/modulesrc/friction/Makefile.am
short/3D/PyLith/branches/v1.7-trunk/modulesrc/friction/friction.i
short/3D/PyLith/branches/v1.7-trunk/pylith/Makefile.am
short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/friction/Makefile.am
short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/friction/TestFrictionModel.cc
short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/friction/data/SlipWeakeningTimeData.hh
short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/friction/Makefile.am
short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/friction/testfriction.py
Log:
Added SlipWeakeningStress for stress-based slip-weakening friction model (includes forced weakening with time for nucleation).
Modified: short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/Makefile.am
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/Makefile.am 2012-11-20 00:55:43 UTC (rev 21055)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/Makefile.am 2012-11-20 01:52:16 UTC (rev 21056)
@@ -105,6 +105,7 @@
friction/StaticFriction.cc \
friction/SlipWeakening.cc \
friction/SlipWeakeningTime.cc \
+ friction/SlipWeakeningStress.cc \
friction/RateStateAgeing.cc \
friction/TimeWeakening.cc \
materials/Metadata.cc \
Modified: short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/friction/Makefile.am
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/friction/Makefile.am 2012-11-20 00:55:43 UTC (rev 21055)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/friction/Makefile.am 2012-11-20 01:52:16 UTC (rev 21056)
@@ -25,6 +25,7 @@
StaticFriction.hh \
SlipWeakening.hh \
SlipWeakeningTime.hh \
+ SlipWeakeningStress.hh \
RateStateAgeing.hh \
TimeWeakening.hh \
frictionfwd.hh
Added: short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/friction/SlipWeakeningStress.cc
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/friction/SlipWeakeningStress.cc (rev 0)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/friction/SlipWeakeningStress.cc 2012-11-20 01:52:16 UTC (rev 21056)
@@ -0,0 +1,332 @@
+// -*- C++ -*-
+//
+// ----------------------------------------------------------------------
+//
+// Brad T. Aagaard, U.S. Geological Survey
+// Charles A. Williams, GNS Science
+// Matthew G. Knepley, University of Chicago
+//
+// This code was developed as part of the Computational Infrastructure
+// for Geodynamics (http://geodynamics.org).
+//
+// Copyright (c) 2010-2011 University of California, Davis
+//
+// See COPYING for license information.
+//
+// ----------------------------------------------------------------------
+//
+
+#include <portinfo>
+
+#include "SlipWeakeningStress.hh" // implementation of object methods
+
+#include "pylith/materials/Metadata.hh" // USES Metadata
+
+#include "pylith/utils/array.hh" // USES scalar_array
+#include "pylith/utils/constdefs.h" // USES MAXSCALAR
+
+#include "spatialdata/units/Nondimensional.hh" // USES Nondimensional
+
+#include "petsc.h" // USES PetscLogFlops
+
+#include <cassert> // USES assert()
+#include <sstream> // USES std::ostringstream
+#include <stdexcept> // USES std::runtime_error
+
+// ----------------------------------------------------------------------
+namespace pylith {
+ namespace friction {
+ namespace _SlipWeakeningStress {
+
+ // Number of physical properties.
+ const int numProperties = 4;
+
+ // Physical properties.
+ const pylith::materials::Metadata::ParamDescription properties[4] = {
+ { "static_stress", 1, pylith::topology::FieldBase::SCALAR },
+ { "dynamic_stress", 1, pylith::topology::FieldBase::SCALAR },
+ { "slip_weakening_parameter", 1, pylith::topology::FieldBase::SCALAR },
+ { "weakening_time", 1, pylith::topology::FieldBase::SCALAR },
+ };
+
+ // Number of State Variables.
+ const int numStateVars = 2;
+
+ // State Variables.
+ const pylith::materials::Metadata::ParamDescription stateVars[] = {
+ { "cumulative_slip", 1, pylith::topology::FieldBase::SCALAR },
+ { "previous_slip", 1, pylith::topology::FieldBase::SCALAR },
+ };
+
+ // Values expected in spatial database
+ const int numDBProperties = 4;
+ const char* dbProperties[4] = { "static-stress",
+ "dynamic-stress",
+ "slip-weakening-parameter",
+ "weakening-time",
+ };
+
+ const int numDBStateVars = 2;
+ const char* dbStateVars[2] = { "cumulative-slip",
+ "previous-slip",
+ };
+
+ } // _SlipWeakeningStress
+ } // friction
+} // pylith
+
+// Indices of physical properties
+const int pylith::friction::SlipWeakeningStress::p_stressStatic = 0;
+const int pylith::friction::SlipWeakeningStress::p_stressDyn =
+ pylith::friction::SlipWeakeningStress::p_stressStatic + 1;
+const int pylith::friction::SlipWeakeningStress::p_d0 =
+ pylith::friction::SlipWeakeningStress::p_stressDyn + 1;
+const int pylith::friction::SlipWeakeningStress::p_weaktime =
+ pylith::friction::SlipWeakeningStress::p_d0 + 1;
+
+// Indices of database values (order must match dbProperties)
+const int pylith::friction::SlipWeakeningStress::db_stressStatic = 0;
+const int pylith::friction::SlipWeakeningStress::db_stressDyn =
+ pylith::friction::SlipWeakeningStress::db_stressStatic + 1;
+const int pylith::friction::SlipWeakeningStress::db_d0 =
+ pylith::friction::SlipWeakeningStress::db_stressDyn + 1;
+const int pylith::friction::SlipWeakeningStress::db_weaktime =
+ pylith::friction::SlipWeakeningStress::db_d0 + 1;
+
+// Indices of state variables.
+const int pylith::friction::SlipWeakeningStress::s_slipCum = 0;
+const int pylith::friction::SlipWeakeningStress::s_slipPrev =
+ pylith::friction::SlipWeakeningStress::s_slipCum + 1;
+
+// Indices of database values (order must match dbProperties)
+const int pylith::friction::SlipWeakeningStress::db_slipCum = 0;
+const int pylith::friction::SlipWeakeningStress::db_slipPrev =
+ pylith::friction::SlipWeakeningStress::db_slipCum + 1;
+
+// ----------------------------------------------------------------------
+// Default constructor.
+pylith::friction::SlipWeakeningStress::SlipWeakeningStress(void) :
+ FrictionModel(materials::Metadata(_SlipWeakeningStress::properties,
+ _SlipWeakeningStress::numProperties,
+ _SlipWeakeningStress::dbProperties,
+ _SlipWeakeningStress::numDBProperties,
+ _SlipWeakeningStress::stateVars,
+ _SlipWeakeningStress::numStateVars,
+ _SlipWeakeningStress::dbStateVars,
+ _SlipWeakeningStress::numDBStateVars))
+{ // constructor
+} // constructor
+
+// ----------------------------------------------------------------------
+// Destructor.
+pylith::friction::SlipWeakeningStress::~SlipWeakeningStress(void)
+{ // destructor
+} // destructor
+
+// ----------------------------------------------------------------------
+// Compute properties from values in spatial database.
+void
+pylith::friction::SlipWeakeningStress::_dbToProperties(PylithScalar* const propValues,
+ const scalar_array& dbValues) const
+{ // _dbToProperties
+ assert(propValues);
+ const int numDBValues = dbValues.size();
+ assert(_SlipWeakeningStress::numDBProperties == numDBValues);
+
+ const PylithScalar db_static = dbValues[db_stressStatic];
+ const PylithScalar db_dyn = dbValues[db_stressDyn];
+ const PylithScalar db_do = dbValues[db_d0];
+ const PylithScalar db_t = dbValues[db_weaktime];
+
+ if (db_static < 0.0) {
+ std::ostringstream msg;
+ msg << "Spatial database returned negative value for static stress.\n"
+ << "static stress: " << db_static << "\n";
+ throw std::runtime_error(msg.str());
+ } // if
+
+ if (db_dyn < 0.0) {
+ std::ostringstream msg;
+ msg << "Spatial database returned negative value for dynamic stress.\n"
+ << "dynamic stress: " << db_dyn << "\n";
+ throw std::runtime_error(msg.str());
+ } // if
+
+ if (db_d0 <= 0.0) {
+ std::ostringstream msg;
+ msg << "Spatial database returned nonpositive value for slip weakening parameter.\n"
+ << "slip weakening parameter: " << db_d0 << "\n";
+ throw std::runtime_error(msg.str());
+ } // if
+
+ if (db_t < 0.0) {
+ std::ostringstream msg;
+ msg << "Spatial database returned negative value for weakening time.\n"
+ << "weakening time: " << db_t << "\n";
+ throw std::runtime_error(msg.str());
+ } // if
+
+ propValues[p_stressStatic] = db_static;
+ propValues[p_stressDyn] = db_dyn;
+ propValues[p_d0] = db_do;
+ propValues[p_weaktime] = db_t;
+
+} // _dbToProperties
+
+// ----------------------------------------------------------------------
+// Nondimensionalize properties.
+void
+pylith::friction::SlipWeakeningStress::_nondimProperties(PylithScalar* const values,
+ const int nvalues) const
+{ // _nondimProperties
+ assert(_normalizer);
+ assert(values);
+ assert(nvalues == _SlipWeakeningStress::numProperties);
+
+ const PylithScalar lengthScale = _normalizer->lengthScale();
+ const PylithScalar pressureScale = _normalizer->pressureScale();
+ const PylithScalar timeScale = _normalizer->timeScale();
+
+ values[p_d0] /= lengthScale;
+ values[p_stressStatic] /= pressureScale;
+ values[p_stressDyn] /= pressureScale;
+ values[p_weaktime] /= timeScale;
+} // _nondimProperties
+
+// ----------------------------------------------------------------------
+// Dimensionalize properties.
+void
+pylith::friction::SlipWeakeningStress::_dimProperties(PylithScalar* const values,
+ const int nvalues) const
+{ // _dimProperties
+ assert(_normalizer);
+ assert(values);
+ assert(nvalues == _SlipWeakeningStress::numProperties);
+
+ const PylithScalar lengthScale = _normalizer->lengthScale();
+ const PylithScalar pressureScale = _normalizer->pressureScale();
+ const PylithScalar timeScale = _normalizer->timeScale();
+
+ values[p_d0] *= lengthScale;
+ values[p_stressStatic] *= pressureScale;
+ values[p_stressDyn] *= pressureScale;
+ values[p_weaktime] *= timeScale;
+} // _dimProperties
+
+// ----------------------------------------------------------------------
+// Compute state variables from values in spatial database.
+void
+pylith::friction::SlipWeakeningStress::_dbToStateVars(PylithScalar* const stateValues,
+ const scalar_array& dbValues) const
+{ // _dbToStateVars
+ assert(stateValues);
+ const int numDBValues = dbValues.size();
+ assert(_SlipWeakeningStress::numDBStateVars == numDBValues);
+
+ const PylithScalar cumulativeSlip = dbValues[db_slipCum];
+ const PylithScalar previousSlip = dbValues[db_slipPrev];
+
+ stateValues[s_slipCum] = cumulativeSlip;
+ stateValues[s_slipPrev] = previousSlip;
+} // _dbToStateVars
+
+// ----------------------------------------------------------------------
+// Nondimensionalize state variables.
+void
+pylith::friction::SlipWeakeningStress::_nondimStateVars(PylithScalar* const values,
+ const int nvalues) const
+{ // _nondimStateVars
+ assert(_normalizer);
+ assert(values);
+ assert(nvalues == _SlipWeakeningStress::numStateVars);
+
+ const PylithScalar lengthScale = _normalizer->lengthScale();
+
+ values[s_slipCum] /= lengthScale;
+ values[s_slipPrev] /= lengthScale;
+} // _nondimStateVars
+
+// ----------------------------------------------------------------------
+// Dimensionalize state variables.
+void
+pylith::friction::SlipWeakeningStress::_dimStateVars(PylithScalar* const values,
+ const int nvalues) const
+{ // _dimStateVars
+ assert(_normalizer);
+ assert(values);
+ assert(nvalues == _SlipWeakeningStress::numStateVars);
+
+ const PylithScalar lengthScale = _normalizer->lengthScale();
+
+ values[s_slipCum] *= lengthScale;
+ values[s_slipPrev] *= lengthScale;
+} // _dimStateVars
+
+// ----------------------------------------------------------------------
+// Compute friction from properties and state variables.
+PylithScalar
+pylith::friction::SlipWeakeningStress::_calcFriction(const PylithScalar t,
+ const PylithScalar slip,
+ const PylithScalar slipRate,
+ const PylithScalar normalTraction,
+ const PylithScalar* properties,
+ const int numProperties,
+ const PylithScalar* stateVars,
+ const int numStateVars)
+{ // _calcFriction
+ assert(properties);
+ assert(_SlipWeakeningStress::numProperties == numProperties);
+ assert(stateVars);
+ assert(_SlipWeakeningStress::numStateVars == numStateVars);
+
+ PylithScalar friction = 0.0;
+ if (normalTraction <= 0.0) {
+ // if fault is in compression
+ if (stateVars[s_slipCum] < properties[p_d0] &&
+ t < properties[p_weaktime]) {
+ // if/else linear slip-weakening form
+ friction = properties[p_stressStatic] -
+ (properties[p_stressStatic] - properties[p_stressDyn]) *
+ stateVars[s_slipCum] / properties[p_d0];
+ } else {
+ friction = properties[p_stressDyn];
+ } // if/else
+ } // if
+
+ PetscLogFlops(6);
+
+ return friction;
+} // _calcFriction
+
+// ----------------------------------------------------------------------
+// Update state variables (for next time step).
+void
+pylith::friction::SlipWeakeningStress::_updateStateVars(const PylithScalar t,
+ const PylithScalar slip,
+ const PylithScalar slipRate,
+ const PylithScalar normalTraction,
+ PylithScalar* const stateVars,
+ const int numStateVars,
+ const PylithScalar* properties,
+ const int numProperties)
+{ // _updateStateVars
+ assert(properties);
+ assert(_SlipWeakeningStress::numProperties == numProperties);
+ assert(stateVars);
+ assert(_SlipWeakeningStress::numStateVars == numStateVars);
+
+ const PylithScalar tolerance = 1.0e-12;
+ if (slipRate > tolerance) {
+ const PylithScalar slipPrev = stateVars[s_slipPrev];
+
+ stateVars[s_slipPrev] = slip;
+ stateVars[s_slipCum] += fabs(slip - slipPrev);
+ } else {
+ // Sliding has stopped, so reset state variables.
+ stateVars[s_slipPrev] = slip;
+ stateVars[s_slipCum] = 0.0;
+ } // else
+} // _updateStateVars
+
+
+// End of file
Added: short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/friction/SlipWeakeningStress.hh
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/friction/SlipWeakeningStress.hh (rev 0)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/friction/SlipWeakeningStress.hh 2012-11-20 01:52:16 UTC (rev 21056)
@@ -0,0 +1,180 @@
+// -*- C++ -*-
+//
+// ----------------------------------------------------------------------
+//
+// Brad T. Aagaard, U.S. Geological Survey
+// Charles A. Williams, GNS Science
+// Matthew G. Knepley, University of Chicago
+//
+// This code was developed as part of the Computational Infrastructure
+// for Geodynamics (http://geodynamics.org).
+//
+// Copyright (c) 2010-2011 University of California, Davis
+//
+// See COPYING for license information.
+//
+// ----------------------------------------------------------------------
+//
+
+/** @file libsrc/friction/SlipWeakeningStress.hh
+ *
+ * @brief C++ slip weakening fault constitutive model with
+ * stress-based friction and additional time parameter for nucleation.
+ */
+
+#if !defined(pylith_friction_slipweakeningstress_hh)
+#define pylith_friction_slipweakeningstress_hh
+
+// Include directives ---------------------------------------------------
+#include "FrictionModel.hh" // ISA FrictionModel
+
+// SlipWeakeningStress -------------------------------------------------------
+/** @brief C++ slip weakening fault constitutive model.
+ *
+ * Friction is equal stress as a function of slip.
+ */
+
+class pylith::friction::SlipWeakeningStress : public FrictionModel
+{ // class SlipWeakeningStress
+ friend class TestSlipWeakeningStress; // unit testing
+
+ // PUBLIC METHODS /////////////////////////////////////////////////////
+public :
+
+ /// Default constructor.
+ SlipWeakeningStress(void);
+
+ /// Destructor.
+ ~SlipWeakeningStress(void);
+
+ // PROTECTED METHODS //////////////////////////////////////////////////
+protected :
+
+ /// These methods should be implemented by every constitutive model.
+
+ /** Compute properties from values in spatial database.
+ *
+ * @param propValues Array of property values.
+ * @param dbValues Array of database values.
+ */
+ void _dbToProperties(PylithScalar* const propValues,
+ const scalar_array& dbValues) const;
+
+ /** Nondimensionalize properties.
+ *
+ * @param values Array of property values.
+ * @param nvalues Number of values.
+ */
+ void _nondimProperties(PylithScalar* const values,
+ const int nvalues) const;
+
+ /** Dimensionalize properties.
+ *
+ * @param values Array of property values.
+ * @param nvalues Number of values.
+ */
+ void _dimProperties(PylithScalar* const values,
+ const int nvalues) const;
+
+ /** Compute friction from properties and state variables.
+ *
+ * @param slip Current slip at location.
+ * @param slipRate Current slip rate at location.
+ * @param normalTraction Normal traction at location.
+ * @param properties Properties at location.
+ * @param numProperties Number of properties.
+ * @param stateVars State variables at location.
+ * @param numStateVars Number of state variables.
+ */
+ void _dbToStateVars(PylithScalar* const stateValues,
+ const scalar_array& dbValues) const;
+
+ /** Nondimensionalize state variables.
+ *
+ * @param values Array of initial state values.
+ * @param nvalues Number of values.
+ */
+ void _nondimStateVars(PylithScalar* const values,
+ const int nvalues) const;
+
+ /** Dimensionalize state variables.
+ *
+ * @param values Array of initial state values.
+ * @param nvalues Number of values.
+ */
+ void _dimStateVars(PylithScalar* const values,
+ const int nvalues) const;
+
+ /** Compute friction from properties and state variables.
+ *
+ * @param t Time in simulation.
+ * @param slip Current slip at location.
+ * @param slipRate Current slip rate at location.
+ * @param normalTraction Normal traction at location.
+ * @param properties Properties at location.
+ * @param numProperties Number of properties.
+ * @param stateVars State variables at location.
+ * @param numStateVars Number of state variables.
+ */
+ PylithScalar _calcFriction(const PylithScalar t,
+ const PylithScalar slip,
+ const PylithScalar slipRate,
+ const PylithScalar normalTraction,
+ const PylithScalar* properties,
+ const int numProperties,
+ const PylithScalar* stateVars,
+ const int numStateVars);
+
+ /** Update state variables (for next time step).
+ *
+ * @param t Time in simulation.
+ * @param slip Current slip at location.
+ * @param slipRate Current slip rate at location.
+ * @param normalTraction Normal traction at location.
+ * @param stateVars State variables at location.
+ * @param numStateVars Number of state variables.
+ * @param properties Properties at location.
+ * @param numProperties Number of properties.
+ */
+ void _updateStateVars(const PylithScalar t,
+ const PylithScalar slip,
+ const PylithScalar slipRate,
+ const PylithScalar normalTraction,
+ PylithScalar* const stateVars,
+ const int numStateVars,
+ const PylithScalar* properties,
+ const int numProperties);
+
+ // PRIVATE MEMBERS ////////////////////////////////////////////////////
+private :
+
+ /// Indices for properties in section and spatial database.
+ static const int p_stressStatic;
+ static const int p_stressDyn;
+ static const int p_d0;
+ static const int p_weaktime;
+
+ static const int db_stressStatic;
+ static const int db_stressDyn;
+ static const int db_d0;
+ static const int db_weaktime;
+
+ /// Indices for state variables in section and spatial database.
+ static const int s_slipCum;
+ static const int s_slipPrev;
+
+ static const int db_slipCum;
+ static const int db_slipPrev;
+
+ // NOT IMPLEMENTED ////////////////////////////////////////////////////
+private :
+
+ SlipWeakeningStress(const SlipWeakeningStress&); ///< Not implemented.
+ const SlipWeakeningStress& operator=(const SlipWeakeningStress&); ///< Not implemented
+
+}; // class SlipWeakeningStress
+
+#endif // pylith_friction_slipweakeningstress_hh
+
+
+// End of file
Modified: short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/friction/frictionfwd.hh
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/friction/frictionfwd.hh 2012-11-20 00:55:43 UTC (rev 21055)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/friction/frictionfwd.hh 2012-11-20 01:52:16 UTC (rev 21056)
@@ -35,6 +35,7 @@
class StaticFriction;
class SlipWeakening;
class SlipWeakeningTime;
+ class SlipWeakeningStress;
class RateStateAgeing;
class TimeWeakening;
Modified: short/3D/PyLith/branches/v1.7-trunk/modulesrc/friction/Makefile.am
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/modulesrc/friction/Makefile.am 2012-11-20 00:55:43 UTC (rev 21055)
+++ short/3D/PyLith/branches/v1.7-trunk/modulesrc/friction/Makefile.am 2012-11-20 01:52:16 UTC (rev 21056)
@@ -29,6 +29,7 @@
StaticFriction.i \
SlipWeakening.i \
SlipWeakeningTime.i \
+ SlipWeakeningStress.i \
RateStateAgeing.i \
TimeWeakening.i
Added: short/3D/PyLith/branches/v1.7-trunk/modulesrc/friction/SlipWeakeningStress.i
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/modulesrc/friction/SlipWeakeningStress.i (rev 0)
+++ short/3D/PyLith/branches/v1.7-trunk/modulesrc/friction/SlipWeakeningStress.i 2012-11-20 01:52:16 UTC (rev 21056)
@@ -0,0 +1,92 @@
+// -*- C++ -*-
+//
+// ----------------------------------------------------------------------
+//
+// Brad T. Aagaard, U.S. Geological Survey
+// Charles A. Williams, GNS Science
+// Matthew G. Knepley, University of Chicago
+//
+// This code was developed as part of the Computational Infrastructure
+// for Geodynamics (http://geodynamics.org).
+//
+// Copyright (c) 2010-2011 University of California, Davis
+//
+// See COPYING for license information.
+//
+// ----------------------------------------------------------------------
+//
+
+/** @file modulesrc/friction/SlipWeakeningStress.i
+ *
+ * Python interface to C++ SlipWeakeningStress object.
+ */
+
+namespace pylith {
+ namespace friction {
+
+ class SlipWeakeningStress : public FrictionModel
+ { // class SlipWeakeningStress
+
+ // PUBLIC METHODS /////////////////////////////////////////////////
+ public :
+
+ /// Default constructor.
+ SlipWeakeningStress(void);
+
+ /// Destructor.
+ ~SlipWeakeningStress(void);
+
+ // PROTECTED METHODS //////////////////////////////////////////////
+ protected :
+
+ /** Compute properties from values in spatial database.
+ *
+ * @param propValues Array of property values.
+ * @param dbValues Array of database values.
+ */
+ void _dbToProperties(PylithScalar* const propValues,
+ const scalar_array& dbValues) const;
+
+ /** Nondimensionalize properties.
+ *
+ * @param values Array of property values.
+ * @param nvalues Number of values.
+ */
+ void _nondimProperties(PylithScalar* const values,
+ const int nvalues) const;
+
+ /** Dimensionalize properties.
+ *
+ * @param values Array of property values.
+ * @param nvalues Number of values.
+ */
+ void _dimProperties(PylithScalar* const values,
+ const int nvalues) const;
+
+ /** Compute friction from properties and state variables.
+ *
+ * @param t Current time.
+ * @param slip Current slip at location.
+ * @param slipRate Current slip rate at location.
+ * @param normalTraction Normal traction at location.
+ * @param properties Properties at location.
+ * @param numProperties Number of properties.
+ * @param stateVars State variables at location.
+ * @param numStateVars Number of state variables.
+ */
+ PylithScalar _calcFriction(const PylithScalar t,
+ const PylithScalar slip,
+ const PylithScalar slipRate,
+ const PylithScalar normalTraction,
+ const PylithScalar* properties,
+ const int numProperties,
+ const PylithScalar* stateVars,
+ const int numStateVars);
+
+ }; // class SlipWeakeningStress
+
+ } // friction
+} // pylith
+
+
+// End of file
Modified: short/3D/PyLith/branches/v1.7-trunk/modulesrc/friction/friction.i
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/modulesrc/friction/friction.i 2012-11-20 00:55:43 UTC (rev 21055)
+++ short/3D/PyLith/branches/v1.7-trunk/modulesrc/friction/friction.i 2012-11-20 01:52:16 UTC (rev 21056)
@@ -30,6 +30,7 @@
#include "pylith/friction/StaticFriction.hh"
#include "pylith/friction/SlipWeakening.hh"
#include "pylith/friction/SlipWeakeningTime.hh"
+#include "pylith/friction/SlipWeakeningStress.hh"
#include "pylith/friction/RateStateAgeing.hh"
#include "pylith/friction/TimeWeakening.hh"
@@ -66,6 +67,7 @@
%include "StaticFriction.i"
%include "SlipWeakening.i"
%include "SlipWeakeningTime.i"
+%include "SlipWeakeningStress.i"
%include "RateStateAgeing.i"
%include "TimeWeakening.i"
Modified: short/3D/PyLith/branches/v1.7-trunk/pylith/Makefile.am
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/pylith/Makefile.am 2012-11-20 00:55:43 UTC (rev 21055)
+++ short/3D/PyLith/branches/v1.7-trunk/pylith/Makefile.am 2012-11-20 01:52:16 UTC (rev 21056)
@@ -71,6 +71,7 @@
friction/StaticFriction.py \
friction/SlipWeakening.py \
friction/SlipWeakeningTime.py \
+ friction/SlipWeakeningStress.py \
friction/RateStateAgeing.py \
friction/TimeWeakening.py \
materials/__init__.py \
Added: short/3D/PyLith/branches/v1.7-trunk/pylith/friction/SlipWeakeningStress.py
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/pylith/friction/SlipWeakeningStress.py (rev 0)
+++ short/3D/PyLith/branches/v1.7-trunk/pylith/friction/SlipWeakeningStress.py 2012-11-20 01:52:16 UTC (rev 21056)
@@ -0,0 +1,79 @@
+#!/usr/bin/env python
+#
+# ----------------------------------------------------------------------
+#
+# Brad T. Aagaard, U.S. Geological Survey
+# Charles A. Williams, GNS Science
+# Matthew G. Knepley, University of Chicago
+#
+# This code was developed as part of the Computational Infrastructure
+# for Geodynamics (http://geodynamics.org).
+#
+# Copyright (c) 2010-2011 University of California, Davis
+#
+# See COPYING for license information.
+#
+# ----------------------------------------------------------------------
+#
+
+## @file pylith/friction/SlipWeakeningStress.py
+##
+## @brief Python object implementing slip weakening with stress levels
+## and forced weakening at a give time (sometimes used for
+## nucleation).
+##
+## Factory: friction_model.
+
+from FrictionModel import FrictionModel
+from friction import SlipWeakeningStress as ModuleSlipWeakeningStress
+
+# SlipWeakeningStress class
+class SlipWeakeningStress(FrictionModel, ModuleSlipWeakeningStress):
+ """
+ Python object implementing Slip Weakening.
+
+ Factory: friction_model.
+ """
+
+ # PUBLIC METHODS /////////////////////////////////////////////////////
+
+ def __init__(self, name="slipweakening"):
+ """
+ Constructor.
+ """
+ FrictionModel.__init__(self, name)
+ self.availableFields = \
+ {'vertex': \
+ {'info': ["static_stress",
+ "dynamic_stress",
+ "slip_weakening_parameter",
+ "weakening_time"],
+ 'data': ["cumulative_slip",
+ "previous_slip"]},
+ 'cell': \
+ {'info': [],
+ 'data': []}}
+ self._loggingPrefix = "FrSWS "
+ return
+
+
+ # PRIVATE METHODS ////////////////////////////////////////////////////
+
+ def _createModuleObj(self):
+ """
+ Call constructor for module object for access to C++ object.
+ """
+ ModuleSlipWeakeningStress.__init__(self)
+ return
+
+
+# FACTORIES ////////////////////////////////////////////////////////////
+
+def friction_model():
+ """
+ Factory associated with SlipWeakeningStress.
+ """
+ return SlipWeakeningStress()
+
+
+# End of file
Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/friction/Makefile.am
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/friction/Makefile.am 2012-11-20 00:55:43 UTC (rev 21055)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/friction/Makefile.am 2012-11-20 01:52:16 UTC (rev 21056)
@@ -32,6 +32,7 @@
TestStaticFriction.cc \
TestSlipWeakening.cc \
TestSlipWeakeningTime.cc \
+ TestSlipWeakeningStress.cc \
TestRateStateAgeing.cc \
TestTimeWeakening.cc
@@ -41,6 +42,7 @@
TestStaticFriction.hh \
TestSlipWeakening.hh \
TestSlipWeakeningTime.hh \
+ TestSlipWeakeningStress.hh \
TestRateStateAgeing.hh \
TestTimeWeakening.hh
@@ -50,6 +52,7 @@
data/StaticFrictionData.cc \
data/SlipWeakeningData.cc \
data/SlipWeakeningTimeData.cc \
+ data/SlipWeakeningStressData.cc \
data/RateStateAgeingData.cc \
data/TimeWeakeningData.cc
@@ -59,6 +62,7 @@
data/StaticFrictionData.hh \
data/SlipWeakeningData.hh \
data/SlipWeakeningTimeData.hh \
+ data/SlipWeakeningStressData.hh \
data/RateStateAgeingData.hh \
data/TimeWeakeningData.hh
Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/friction/TestFrictionModel.cc
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/friction/TestFrictionModel.cc 2012-11-20 00:55:43 UTC (rev 21055)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/friction/TestFrictionModel.cc 2012-11-20 01:52:16 UTC (rev 21056)
@@ -441,14 +441,12 @@
const PylithScalar* const propertiesE = &_data->properties[iLoc*propertiesSize];
const PylithScalar tolerance = 1.0e-06;
+
for (int i=0; i < propertiesSize; ++i) {
if (fabs(propertiesE[i]) > tolerance)
- CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0,
- properties[i]/propertiesE[i],
- tolerance);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, properties[i]/propertiesE[i], tolerance);
else
- CPPUNIT_ASSERT_DOUBLES_EQUAL(propertiesE[i], properties[i],
- tolerance);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(propertiesE[i], properties[i], tolerance);
} // for
} // for
} // testDBToProperties
Added: short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/friction/TestSlipWeakeningStress.cc
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/friction/TestSlipWeakeningStress.cc (rev 0)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/friction/TestSlipWeakeningStress.cc 2012-11-20 01:52:16 UTC (rev 21056)
@@ -0,0 +1,87 @@
+// -*- C++ -*-
+//
+// ----------------------------------------------------------------------
+//
+// Brad T. Aagaard, U.S. Geological Survey
+// Charles A. Williams, GNS Science
+// Matthew G. Knepley, University of Chicago
+//
+// This code was developed as part of the Computational Infrastructure
+// for Geodynamics (http://geodynamics.org).
+//
+// Copyright (c) 2010-2011 University of California, Davis
+//
+// See COPYING for license information.
+//
+// ----------------------------------------------------------------------
+//
+
+#include <portinfo>
+
+#include "TestSlipWeakeningStress.hh" // Implementation of class methods
+
+#include "data/SlipWeakeningStressData.hh" // USES SlipWeakeningStressData
+
+#include "pylith/friction/SlipWeakeningStress.hh" // USES SlipWeakeningStress
+
+// ----------------------------------------------------------------------
+CPPUNIT_TEST_SUITE_REGISTRATION( pylith::friction::TestSlipWeakeningStress );
+
+// ----------------------------------------------------------------------
+// Setup testing data.
+void
+pylith::friction::TestSlipWeakeningStress::setUp(void)
+{ // setUp
+ _friction = new SlipWeakeningStress();
+ _data = new SlipWeakeningStressData();
+ setupNormalizer();
+} // setUp
+
+// ----------------------------------------------------------------------
+// Test properties metadata.
+void
+pylith::friction::TestSlipWeakeningStress::testPropertiesMetadata(void)
+{ // testPropertiesMetadata
+ SlipWeakeningStress model;
+
+ CPPUNIT_ASSERT_EQUAL(4, model._metadata.numDBProperties());
+ const char* const* names = model._metadata.dbProperties();
+ CPPUNIT_ASSERT_EQUAL(std::string("static-stress"), std::string(names[0]));
+ CPPUNIT_ASSERT_EQUAL(std::string("dynamic-stress"), std::string(names[1]));
+ CPPUNIT_ASSERT_EQUAL(std::string("slip-weakening-parameter"), std::string(names[2]));
+ CPPUNIT_ASSERT_EQUAL(std::string("weakening-time"), std::string(names[3]));
+} // testPropertiesMetadata
+
+// ----------------------------------------------------------------------
+// Test state variable metadata.
+void
+pylith::friction::TestSlipWeakeningStress::testStateVarsMetadata(void)
+{ // testStateVarsMetadata
+ SlipWeakeningStress model;
+
+ CPPUNIT_ASSERT_EQUAL(2, model._metadata.numDBStateVars());
+ const char* const* names = model._metadata.dbStateVars();
+ CPPUNIT_ASSERT_EQUAL(std::string("cumulative-slip"),
+ std::string(names[0]));
+ CPPUNIT_ASSERT_EQUAL(std::string("previous-slip"),
+ std::string(names[1]));
+} // testStateVarsMetadata
+
+// ----------------------------------------------------------------------
+// Test hasPropStateVar().
+void
+pylith::friction::TestSlipWeakeningStress::testHasPropStateVar(void)
+{ // testHasPropStateVar
+ SlipWeakeningStress material;
+
+ CPPUNIT_ASSERT(material.hasPropStateVar("static_stress"));
+ CPPUNIT_ASSERT(material.hasPropStateVar("dynamic_stress"));
+ CPPUNIT_ASSERT(material.hasPropStateVar("slip_weakening_parameter"));
+ CPPUNIT_ASSERT(material.hasPropStateVar("weakening_time"));
+ CPPUNIT_ASSERT(!material.hasPropStateVar("aaa"));
+ CPPUNIT_ASSERT(material.hasPropStateVar("cumulative_slip"));
+ CPPUNIT_ASSERT(material.hasPropStateVar("previous_slip"));
+} // testHasPropStateVar
+
+
+// End of file
Added: short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/friction/TestSlipWeakeningStress.hh
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/friction/TestSlipWeakeningStress.hh (rev 0)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/friction/TestSlipWeakeningStress.hh 2012-11-20 01:52:16 UTC (rev 21056)
@@ -0,0 +1,80 @@
+// -*- C++ -*-
+//
+// ----------------------------------------------------------------------
+//
+// Brad T. Aagaard, U.S. Geological Survey
+// Charles A. Williams, GNS Science
+// Matthew G. Knepley, University of Chicago
+//
+// This code was developed as part of the Computational Infrastructure
+// for Geodynamics (http://geodynamics.org).
+//
+// Copyright (c) 2010-2011 University of California, Davis
+//
+// See COPYING for license information.
+//
+// ----------------------------------------------------------------------
+//
+
+/**
+ * @file unittests/libtests/friction/TestSlipWeakeningStress.hh
+ *
+ * @brief C++ TestSlipWeakeningStress object
+ *
+ * C++ unit testing for SlipWeakeningStress.
+ */
+
+#if !defined(pylith_friction_testslipweakeningstress_hh)
+#define pylith_friction_testslipweakeningstress_hh
+
+#include "TestFrictionModel.hh"
+
+/// Namespace for pylith package
+namespace pylith {
+ namespace friction {
+ class TestSlipWeakeningStress;
+ } // friction
+} // pylith
+
+/// C++ unit testing for SlipWeakeningStress
+class pylith::friction::TestSlipWeakeningStress : public TestFrictionModel
+{ // class TestSlipWeakeningStress
+
+ // CPPUNIT TEST SUITE /////////////////////////////////////////////////
+ CPPUNIT_TEST_SUITE( TestSlipWeakeningStress );
+
+ CPPUNIT_TEST( testPropertiesMetadata );
+ CPPUNIT_TEST( testStateVarsMetadata );
+ CPPUNIT_TEST( testDBToProperties );
+ CPPUNIT_TEST( testNonDimProperties );
+ CPPUNIT_TEST( testDimProperties );
+ CPPUNIT_TEST( testDBToStateVars );
+ CPPUNIT_TEST( testNonDimStateVars );
+ CPPUNIT_TEST( testDimStateVars );
+ CPPUNIT_TEST( testHasPropStateVar );
+ CPPUNIT_TEST( test_calcFriction );
+ CPPUNIT_TEST( test_updateStateVars );
+
+ CPPUNIT_TEST_SUITE_END();
+
+ // PUBLIC METHODS /////////////////////////////////////////////////////
+public :
+
+ /// Setup testing data.
+ void setUp(void);
+
+ /// Test properties metadata.
+ void testPropertiesMetadata(void);
+
+ /// Test state variable metadata.
+ void testStateVarsMetadata(void);
+
+ /// Test hasPropStateVar().
+ void testHasPropStateVar(void);
+
+}; // class TestSlipWeakeningStress
+
+#endif // pylith_friction_testslipweakeningstress_hh
+
+
+// End of file
Added: short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/friction/data/SlipWeakeningStressData.cc
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/friction/data/SlipWeakeningStressData.cc (rev 0)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/friction/data/SlipWeakeningStressData.cc 2012-11-20 01:52:16 UTC (rev 21056)
@@ -0,0 +1,185 @@
+// -*- C++ -*-
+//
+// ======================================================================
+//
+// Brad T. Aagaard, U.S. Geological Survey
+// Charles A. Williams, GNS Science
+// Matthew G. Knepley, University of Chicago
+//
+// This code was developed as part of the Computational Infrastructure
+// for Geodynamics (http://geodynamics.org).
+//
+// Copyright (c) 2010-2011 University of California, Davis
+//
+// See COPYING for license information.
+//
+// ======================================================================
+//
+
+#include "SlipWeakeningStressData.hh"
+
+const int pylith::friction::SlipWeakeningStressData::_numLocs = 2;
+
+const int pylith::friction::SlipWeakeningStressData::_numProperties = 4;
+
+const int pylith::friction::SlipWeakeningStressData::_numStateVars = 2;
+
+const int pylith::friction::SlipWeakeningStressData::_numDBProperties = 4;
+
+const int pylith::friction::SlipWeakeningStressData::_numDBStateVars = 2;
+
+const int pylith::friction::SlipWeakeningStressData::_numPropsVertex = 4;
+
+const int pylith::friction::SlipWeakeningStressData::_numVarsVertex = 2;
+
+const PylithScalar pylith::friction::SlipWeakeningStressData::_lengthScale = 1.00000000e+03;
+
+const PylithScalar pylith::friction::SlipWeakeningStressData::_timeScale = 1.00000000e+01;
+
+const PylithScalar pylith::friction::SlipWeakeningStressData::_pressureScale = 2.5000000e+10;
+
+const PylithScalar pylith::friction::SlipWeakeningStressData::_densityScale = 1.00000000e+03;
+
+const PylithScalar pylith::friction::SlipWeakeningStressData::_dt = 0.01;
+
+const int pylith::friction::SlipWeakeningStressData::_numPropertyValues[] = {
+ 1,
+ 1,
+ 1,
+ 1,
+};
+
+const int pylith::friction::SlipWeakeningStressData::_numStateVarValues[] = {
+ 1,
+ 1,
+};
+
+const char* pylith::friction::SlipWeakeningStressData::_dbPropertyValues[] = {
+ "static-stress",
+ "dynamic-stress",
+ "slip-weakening-parameter",
+ "weakening-time",
+};
+
+const char* pylith::friction::SlipWeakeningStressData::_dbStateVarValues[] = {
+ "cumulative-slip",
+ "previous-slip",
+};
+
+const PylithScalar pylith::friction::SlipWeakeningStressData::_dbProperties[] = {
+ 2.0e+6,
+ 1.0e+6,
+ 0.8,
+ 2.0,
+ 2.5e+6,
+ 1.25e+6,
+ 0.4,
+ 1.0,
+};
+
+const PylithScalar pylith::friction::SlipWeakeningStressData::_dbStateVars[] = {
+ 0.4,
+ 0.2,
+ 0.5,
+ 0.1,
+};
+
+const PylithScalar pylith::friction::SlipWeakeningStressData::_properties[] = {
+ 2.0e+6,
+ 1.0e+6,
+ 0.8,
+ 2.0,
+ 2.5e+6,
+ 1.25e+6,
+ 0.4,
+ 1.0,
+};
+
+const PylithScalar pylith::friction::SlipWeakeningStressData::_stateVars[] = {
+ 0.4,
+ 0.2,
+ 0.5,
+ 0.1,
+};
+
+const PylithScalar pylith::friction::SlipWeakeningStressData::_propertiesNondim[] = {
+ 2.0e+6/2.5e+10,
+ 1.0e+6/2.5e+10,
+ 0.0008,
+ 0.2,
+ 2.5e+6/2.5e+10,
+ 1.25e+6/2.5e+10,
+ 0.0004,
+ 0.1,
+};
+
+const PylithScalar pylith::friction::SlipWeakeningStressData::_stateVarsNondim[] = {
+ 0.0004,
+ 0.0002,
+ 0.0005,
+ 0.0001,
+};
+
+const PylithScalar pylith::friction::SlipWeakeningStressData::_friction[] = {
+ 1.5e+6,
+ 1.25e+6,
+};
+
+const PylithScalar pylith::friction::SlipWeakeningStressData::_slip[] = {
+ 0.12,
+ 0.25,
+};
+
+const PylithScalar pylith::friction::SlipWeakeningStressData::_slipRate[] = {
+ 0.74,
+ 0.64,
+};
+
+const PylithScalar pylith::friction::SlipWeakeningStressData::_normalTraction[] = {
+ -2.2,
+ -2.3,
+};
+
+const PylithScalar pylith::friction::SlipWeakeningStressData::_stateVarsUpdated[] = {
+ 0.48,
+ 0.12,
+ 0.65,
+ 0.25,
+};
+
+pylith::friction::SlipWeakeningStressData::SlipWeakeningStressData(void)
+{ // constructor
+ numLocs = _numLocs;
+ numProperties = _numProperties;
+ numStateVars = _numStateVars;
+ numDBProperties = _numDBProperties;
+ numDBStateVars = _numDBStateVars;
+ numPropsVertex = _numPropsVertex;
+ numVarsVertex = _numVarsVertex;
+ lengthScale = _lengthScale;
+ timeScale = _timeScale;
+ pressureScale = _pressureScale;
+ densityScale = _densityScale;
+ numPropertyValues = const_cast<int*>(_numPropertyValues);
+ numStateVarValues = const_cast<int*>(_numStateVarValues);
+ dbPropertyValues = const_cast<char**>(_dbPropertyValues);
+ dbStateVarValues = const_cast<char**>(_dbStateVarValues);
+ dbProperties = const_cast<PylithScalar*>(_dbProperties);
+ dbStateVars = const_cast<PylithScalar*>(_dbStateVars);
+ dt = _dt;
+ properties = const_cast<PylithScalar*>(_properties);
+ stateVars = const_cast<PylithScalar*>(_stateVars);
+ propertiesNondim = const_cast<PylithScalar*>(_propertiesNondim);
+ stateVarsNondim = const_cast<PylithScalar*>(_stateVarsNondim);
+ friction = const_cast<PylithScalar*>(_friction);
+ slip = const_cast<PylithScalar*>(_slip);
+ slipRate = const_cast<PylithScalar*>(_slipRate);
+ normalTraction = const_cast<PylithScalar*>(_normalTraction);
+ stateVarsUpdated = const_cast<PylithScalar*>(_stateVarsUpdated);
+} // constructor
+
+pylith::friction::SlipWeakeningStressData::~SlipWeakeningStressData(void)
+{}
+
+
+// End of file
Added: short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/friction/data/SlipWeakeningStressData.hh
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/friction/data/SlipWeakeningStressData.hh (rev 0)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/friction/data/SlipWeakeningStressData.hh 2012-11-20 01:52:16 UTC (rev 21056)
@@ -0,0 +1,101 @@
+// -*- C++ -*-
+//
+// ======================================================================
+//
+// Brad T. Aagaard, U.S. Geological Survey
+// Charles A. Williams, GNS Science
+// Matthew G. Knepley, University of Chicago
+//
+// This code was developed as part of the Computational Infrastructure
+// for Geodynamics (http://geodynamics.org).
+//
+// Copyright (c) 2010-2011 University of California, Davis
+//
+// See COPYING for license information.
+//
+// ======================================================================
+//
+
+#if !defined(pylith_friction_slipweakeningstressdata_hh)
+#define pylith_friction_slipweakeningstressdata_hh
+
+#include "FrictionModelData.hh"
+
+namespace pylith {
+ namespace friction {
+ class SlipWeakeningStressData;
+ } // pylith
+} // friction
+
+class pylith::friction::SlipWeakeningStressData : public FrictionModelData
+{
+
+public:
+
+ /// Constructor
+ SlipWeakeningStressData(void);
+
+ /// Destructor
+ ~SlipWeakeningStressData(void);
+
+private:
+
+ static const int _numLocs;
+
+ static const int _numProperties;
+
+ static const int _numStateVars;
+
+ static const int _numDBProperties;
+
+ static const int _numDBStateVars;
+
+ static const int _numPropsVertex;
+
+ static const int _numVarsVertex;
+
+ static const PylithScalar _lengthScale;
+
+ static const PylithScalar _timeScale;
+
+ static const PylithScalar _pressureScale;
+
+ static const PylithScalar _densityScale;
+
+ static const PylithScalar _dt;
+
+ static const int _numPropertyValues[];
+
+ static const int _numStateVarValues[];
+
+ static const char* _dbPropertyValues[];
+
+ static const char* _dbStateVarValues[];
+
+ static const PylithScalar _dbProperties[];
+
+ static const PylithScalar _dbStateVars[];
+
+ static const PylithScalar _properties[];
+
+ static const PylithScalar _stateVars[];
+
+ static const PylithScalar _propertiesNondim[];
+
+ static const PylithScalar _stateVarsNondim[];
+
+ static const PylithScalar _friction[];
+
+ static const PylithScalar _slip[];
+
+ static const PylithScalar _slipRate[];
+
+ static const PylithScalar _normalTraction[];
+
+ static const PylithScalar _stateVarsUpdated[];
+
+};
+
+#endif // pylith_friction_slipweakeningstressdata_hh
+
+// End of file
Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/friction/data/SlipWeakeningTimeData.hh
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/friction/data/SlipWeakeningTimeData.hh 2012-11-20 00:55:43 UTC (rev 21055)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/friction/data/SlipWeakeningTimeData.hh 2012-11-20 01:52:16 UTC (rev 21056)
@@ -16,8 +16,8 @@
// ======================================================================
//
-#if !defined(pylith_friction_slipweakeningdata_hh)
-#define pylith_friction_slipweakeningdata_hh
+#if !defined(pylith_friction_slipweakeningtimedata_hh)
+#define pylith_friction_slipweakeningtimedata_hh
#include "FrictionModelData.hh"
@@ -96,6 +96,6 @@
};
-#endif // pylith_friction_slipweakeningdata_hh
+#endif // pylith_friction_slipweakeningtimedata_hh
// End of file
Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/friction/Makefile.am
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/friction/Makefile.am 2012-11-20 00:55:43 UTC (rev 21055)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/friction/Makefile.am 2012-11-20 01:52:16 UTC (rev 21056)
@@ -31,6 +31,7 @@
TestStaticFriction.py \
TestSlipWeakening.py \
TestSlipWeakeningTime.py \
+ TestSlipWeakeningStress.py \
TestRateStateAgeing.py \
TestTimeWeakening.py
Added: short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/friction/TestSlipWeakeningStress.py
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/friction/TestSlipWeakeningStress.py (rev 0)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/friction/TestSlipWeakeningStress.py 2012-11-20 01:52:16 UTC (rev 21056)
@@ -0,0 +1,57 @@
+#!/usr/bin/env python
+#
+# ======================================================================
+#
+# Brad T. Aagaard, U.S. Geological Survey
+# Charles A. Williams, GNS Science
+# Matthew G. Knepley, University of Chicago
+#
+# This code was developed as part of the Computational Infrastructure
+# for Geodynamics (http://geodynamics.org).
+#
+# Copyright (c) 2010-2011 University of California, Davis
+#
+# See COPYING for license information.
+#
+# ======================================================================
+#
+
+## @file unittests/pytests/friction/TestSlipWeakeningStress.py
+
+## @brief Unit testing of SlipWeakeningStress object.
+
+import unittest
+
+from pylith.friction.SlipWeakeningStress import SlipWeakeningStress
+
+# ----------------------------------------------------------------------
+class TestSlipWeakeningStress(unittest.TestCase):
+ """
+ Unit testing of SlipWeakeningStress object.
+ """
+
+ def setUp(self):
+ """
+ Setup test subject.
+ """
+ self.friction = SlipWeakeningStress()
+ return
+
+
+ def test_constructor(self):
+ """
+ Test constructor.
+ """
+ return
+
+
+ def test_factory(self):
+ """
+ Test factory method.
+ """
+ from pylith.friction.SlipWeakeningStress import friction_model
+ m = friction_model()
+ return
+
+
+# End of file
Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/friction/testfriction.py
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/friction/testfriction.py 2012-11-20 00:55:43 UTC (rev 21055)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/friction/testfriction.py 2012-11-20 01:52:16 UTC (rev 21056)
@@ -71,6 +71,9 @@
from TestSlipWeakeningTime import TestSlipWeakeningTime
suite.addTest(unittest.makeSuite(TestSlipWeakeningTime))
+ from TestSlipWeakeningStress import TestSlipWeakeningStress
+ suite.addTest(unittest.makeSuite(TestSlipWeakeningStress))
+
from TestRateStateAgeing import TestRateStateAgeing
suite.addTest(unittest.makeSuite(TestRateStateAgeing))
More information about the CIG-COMMITS
mailing list