[cig-commits] r16327 - in short/3D/PyLith/trunk/unittests/libtests/friction: . data
brad at geodynamics.org
brad at geodynamics.org
Tue Feb 23 13:00:27 PST 2010
Author: brad
Date: 2010-02-23 13:00:26 -0800 (Tue, 23 Feb 2010)
New Revision: 16327
Modified:
short/3D/PyLith/trunk/unittests/libtests/friction/TestFrictionModel.cc
short/3D/PyLith/trunk/unittests/libtests/friction/data/FrictionModelData.cc
short/3D/PyLith/trunk/unittests/libtests/friction/data/FrictionModelData.hh
short/3D/PyLith/trunk/unittests/libtests/friction/data/RateStateAgeingData.cc
short/3D/PyLith/trunk/unittests/libtests/friction/data/RateStateAgeingData.hh
short/3D/PyLith/trunk/unittests/libtests/friction/data/SlipWeakeningData.cc
short/3D/PyLith/trunk/unittests/libtests/friction/data/SlipWeakeningData.hh
short/3D/PyLith/trunk/unittests/libtests/friction/data/StaticFrictionData.cc
short/3D/PyLith/trunk/unittests/libtests/friction/data/StaticFrictionData.hh
Log:
Added setting of time step for friction model unit tests.
Modified: short/3D/PyLith/trunk/unittests/libtests/friction/TestFrictionModel.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/friction/TestFrictionModel.cc 2010-02-23 20:12:41 UTC (rev 16326)
+++ short/3D/PyLith/trunk/unittests/libtests/friction/TestFrictionModel.cc 2010-02-23 21:00:26 UTC (rev 16327)
@@ -282,6 +282,7 @@
StaticFrictionData data;
_initialize(&mesh, &fault, &friction, &data);
+ friction.timeStep(data.dt);
friction.retrievePropsAndVars(vertex);
const double frictionV = friction.calcFriction(slip, slipRate, normalTraction);
@@ -309,6 +310,7 @@
const double normalTraction = -2.4;
const int vertex = 2;
+ friction.timeStep(data.dt);
friction.retrievePropsAndVars(vertex);
friction.updateStateVars(slip, slipRate, normalTraction);
@@ -321,7 +323,8 @@
const double slip = 0.25;
const double slipRate = 0.64;
const double normalTraction = -2.3;
-
+ const double dt = 0.01;
+
const size_t numProperties = 3;
const double properties[3] = { 0.6, 0.5, 0.004 };
const size_t numStateVars = 2;
@@ -337,6 +340,7 @@
for (size_t i=0; i < numStateVars; ++i)
friction._stateVarsVertex[i] = stateVars[i];
+ friction.timeStep(dt);
friction.updateStateVars(slip, slipRate, normalTraction);
CPPUNIT_ASSERT_EQUAL(numStateVars, friction._stateVarsVertex.size());
@@ -604,6 +608,7 @@
const double slipRate = _data->slipRate[iLoc];
const double normalTraction = _data->normalTraction[iLoc];
+ _friction->timeStep(_data->dt);
const double friction = _friction->_calcFriction(
slip, slipRate, normalTraction,
&properties[0], properties.size(),
@@ -646,6 +651,7 @@
for (int i=0; i < numVarsVertex; ++i)
stateVars[i] = _data->stateVars[iLoc*numVarsVertex+i];
+ _friction->timeStep(_data->dt);
_friction->_updateStateVars(slip, slipRate, normalTraction,
&stateVars[0], stateVars.size(),
&properties[0], properties.size());
@@ -690,7 +696,7 @@
void
pylith::friction::TestFrictionModel::_initialize(
topology::Mesh* mesh,
- faults::FaultCohesiveDyn* fault,
+ faults::FaultCohesiveDyn* fault,
StaticFriction* friction,
const StaticFrictionData* data)
{ // _initialize
Modified: short/3D/PyLith/trunk/unittests/libtests/friction/data/FrictionModelData.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/friction/data/FrictionModelData.cc 2010-02-23 20:12:41 UTC (rev 16326)
+++ short/3D/PyLith/trunk/unittests/libtests/friction/data/FrictionModelData.cc 2010-02-23 21:00:26 UTC (rev 16327)
@@ -26,6 +26,7 @@
numStateVarValues(0),
dbPropertyValues(0),
dbStateVarValues(0),
+ dt(0.0),
dbProperties(0),
dbStateVars(0),
properties(0),
Modified: short/3D/PyLith/trunk/unittests/libtests/friction/data/FrictionModelData.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/friction/data/FrictionModelData.hh 2010-02-23 20:12:41 UTC (rev 16326)
+++ short/3D/PyLith/trunk/unittests/libtests/friction/data/FrictionModelData.hh 2010-02-23 21:00:26 UTC (rev 16327)
@@ -49,6 +49,7 @@
char** dbPropertyValues; ///< Names of db values for properties.
char** dbStateVarValues; ///< Names of db values for state variables.
+ double dt; ///< Time step
double* dbProperties; ///< Database values for properties at locations.
double* dbStateVars; ///< Database values for state variables at locations.
double* properties; ///< Properties at locations.
Modified: short/3D/PyLith/trunk/unittests/libtests/friction/data/RateStateAgeingData.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/friction/data/RateStateAgeingData.cc 2010-02-23 20:12:41 UTC (rev 16326)
+++ short/3D/PyLith/trunk/unittests/libtests/friction/data/RateStateAgeingData.cc 2010-02-23 21:00:26 UTC (rev 16327)
@@ -34,6 +34,8 @@
const double pylith::friction::RateStateAgeingData::_densityScale = 1.00000000e+03;
+const double pylith::friction::RateStateAgeingData::_dt = 0.01;
+
const int pylith::friction::RateStateAgeingData::_numPropertyValues[] = {
1,
1,
@@ -156,6 +158,7 @@
dbStateVarValues = const_cast<char**>(_dbStateVarValues);
dbProperties = const_cast<double*>(_dbProperties);
dbStateVars = const_cast<double*>(_dbStateVars);
+ dt = _dt;
properties = const_cast<double*>(_properties);
stateVars = const_cast<double*>(_stateVars);
propertiesNondim = const_cast<double*>(_propertiesNondim);
Modified: short/3D/PyLith/trunk/unittests/libtests/friction/data/RateStateAgeingData.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/friction/data/RateStateAgeingData.hh 2010-02-23 20:12:41 UTC (rev 16326)
+++ short/3D/PyLith/trunk/unittests/libtests/friction/data/RateStateAgeingData.hh 2010-02-23 21:00:26 UTC (rev 16327)
@@ -56,6 +56,8 @@
static const double _densityScale;
+ static const double _dt;
+
static const int _numPropertyValues[];
static const int _numStateVarValues[];
Modified: short/3D/PyLith/trunk/unittests/libtests/friction/data/SlipWeakeningData.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/friction/data/SlipWeakeningData.cc 2010-02-23 20:12:41 UTC (rev 16326)
+++ short/3D/PyLith/trunk/unittests/libtests/friction/data/SlipWeakeningData.cc 2010-02-23 21:00:26 UTC (rev 16327)
@@ -34,6 +34,8 @@
const double pylith::friction::SlipWeakeningData::_densityScale = 1.00000000e+03;
+const double pylith::friction::SlipWeakeningData::_dt = 0.01;
+
const int pylith::friction::SlipWeakeningData::_numPropertyValues[] = {
1,
1,
@@ -150,6 +152,7 @@
dbStateVarValues = const_cast<char**>(_dbStateVarValues);
dbProperties = const_cast<double*>(_dbProperties);
dbStateVars = const_cast<double*>(_dbStateVars);
+ dt = _dt;
properties = const_cast<double*>(_properties);
stateVars = const_cast<double*>(_stateVars);
propertiesNondim = const_cast<double*>(_propertiesNondim);
Modified: short/3D/PyLith/trunk/unittests/libtests/friction/data/SlipWeakeningData.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/friction/data/SlipWeakeningData.hh 2010-02-23 20:12:41 UTC (rev 16326)
+++ short/3D/PyLith/trunk/unittests/libtests/friction/data/SlipWeakeningData.hh 2010-02-23 21:00:26 UTC (rev 16327)
@@ -56,6 +56,8 @@
static const double _densityScale;
+ static const double _dt;
+
static const int _numPropertyValues[];
static const int _numStateVarValues[];
Modified: short/3D/PyLith/trunk/unittests/libtests/friction/data/StaticFrictionData.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/friction/data/StaticFrictionData.cc 2010-02-23 20:12:41 UTC (rev 16326)
+++ short/3D/PyLith/trunk/unittests/libtests/friction/data/StaticFrictionData.cc 2010-02-23 21:00:26 UTC (rev 16327)
@@ -34,6 +34,8 @@
const double pylith::friction::StaticFrictionData::_densityScale = 1.00000000e+03;
+const double pylith::friction::StaticFrictionData::_dt = 0.01;
+
const int pylith::friction::StaticFrictionData::_numPropertyValues[] = {
1,
};
@@ -108,6 +110,7 @@
dbStateVarValues = const_cast<char**>(_dbStateVarValues);
dbProperties = const_cast<double*>(_dbProperties);
dbStateVars = const_cast<double*>(_dbStateVars);
+ dt = _dt;
properties = const_cast<double*>(_properties);
stateVars = const_cast<double*>(_stateVars);
propertiesNondim = const_cast<double*>(_propertiesNondim);
Modified: short/3D/PyLith/trunk/unittests/libtests/friction/data/StaticFrictionData.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/friction/data/StaticFrictionData.hh 2010-02-23 20:12:41 UTC (rev 16326)
+++ short/3D/PyLith/trunk/unittests/libtests/friction/data/StaticFrictionData.hh 2010-02-23 21:00:26 UTC (rev 16327)
@@ -56,6 +56,8 @@
static const double _densityScale;
+ static const double _dt;
+
static const int _numPropertyValues[];
static const int* _numStateVarValues;
More information about the CIG-COMMITS
mailing list