[cig-commits] r16183 - in short/3D/PyLith/trunk: libsrc/friction unittests/libtests/friction unittests/libtests/friction/data

[surendra at geodynamics.org]

Author: surendra
Date: 2010-01-26 11:55:25 -0800 (Tue, 26 Jan 2010)
New Revision: 16183

Modified:
   short/3D/PyLith/trunk/libsrc/friction/SlipWeakening.cc
   short/3D/PyLith/trunk/unittests/libtests/friction/Makefile.am
   short/3D/PyLith/trunk/unittests/libtests/friction/TestSlipWeakening.cc
   short/3D/PyLith/trunk/unittests/libtests/friction/data/SlipWeakeningData.cc
   short/3D/PyLith/trunk/unittests/libtests/friction/data/SlipWeakeningData.hh
Log:
More work on SlipWeakening

Modified: short/3D/PyLith/trunk/libsrc/friction/SlipWeakening.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/friction/SlipWeakening.cc	2010-01-26 16:01:12 UTC (rev 16182)
+++ short/3D/PyLith/trunk/libsrc/friction/SlipWeakening.cc	2010-01-26 19:55:25 UTC (rev 16183)
@@ -178,7 +178,7 @@
 { // _dbToStateVars
   assert(0 != stateValues);
   const int numDBValues = dbValues.size();
-  assert(_SlipWeakening::numDBProperties == numDBValues);
+  assert(_SlipWeakening::numDBStateVars == numDBValues);
 
   const double cumulativeSlip = dbValues[db_coef+3];
   const double previousSlip = dbValues[db_coef+4];

Modified: short/3D/PyLith/trunk/unittests/libtests/friction/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/friction/Makefile.am	2010-01-26 16:01:12 UTC (rev 16182)
+++ short/3D/PyLith/trunk/unittests/libtests/friction/Makefile.am	2010-01-26 19:55:25 UTC (rev 16183)
@@ -23,8 +23,8 @@
 testfriction_SOURCES = \
 	test_friction.cc \
 	TestFrictionModel.cc \
-	TestStaticFriction.cc
-#	TestSlipWeakening.cc
+	TestStaticFriction.cc \
+	TestSlipWeakening.cc
 
 
 noinst_HEADERS = 

Modified: short/3D/PyLith/trunk/unittests/libtests/friction/TestSlipWeakening.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/friction/TestSlipWeakening.cc	2010-01-26 16:01:12 UTC (rev 16182)
+++ short/3D/PyLith/trunk/unittests/libtests/friction/TestSlipWeakening.cc	2010-01-26 19:55:25 UTC (rev 16183)
@@ -51,6 +51,8 @@
 { // testHasStateVar
   SlipWeakening material;
 
+  CPPUNIT_ASSERT(material.hasStateVar("cumulative-slip"));
+  CPPUNIT_ASSERT(material.hasStateVar("previous-slip"));
   CPPUNIT_ASSERT(!material.hasStateVar("aaa"));
 } // testHasStateVar
 

Modified: short/3D/PyLith/trunk/unittests/libtests/friction/data/SlipWeakeningData.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/friction/data/SlipWeakeningData.cc	2010-01-26 16:01:12 UTC (rev 16182)
+++ short/3D/PyLith/trunk/unittests/libtests/friction/data/SlipWeakeningData.cc	2010-01-26 19:55:25 UTC (rev 16183)
@@ -16,15 +16,15 @@
 
 const int pylith::friction::SlipWeakeningData::_numProperties = 3;
 
-const int pylith::friction::SlipWeakeningData::_numStateVars = 0;
+const int pylith::friction::SlipWeakeningData::_numStateVars = 2;
 
 const int pylith::friction::SlipWeakeningData::_numDBProperties = 3;
 
-const int pylith::friction::SlipWeakeningData::_numDBStateVars = 0;
+const int pylith::friction::SlipWeakeningData::_numDBStateVars = 2;
 
 const int pylith::friction::SlipWeakeningData::_numPropsVertex = 3;
 
-const int pylith::friction::SlipWeakeningData::_numVarsVertex = 0;
+const int pylith::friction::SlipWeakeningData::_numVarsVertex = 2;
 
 const double pylith::friction::SlipWeakeningData::_lengthScale =   1.00000000e+03;
 
@@ -35,10 +35,12 @@
 const double pylith::friction::SlipWeakeningData::_densityScale =   1.00000000e+03;
 
 const int pylith::friction::SlipWeakeningData::_numPropertyValues[] = {
-1,
+3,
 };
 
-const int* pylith::friction::SlipWeakeningData::_numStateVarValues = 0;
+const int pylith::friction::SlipWeakeningData::_numStateVarValues[] = {
+2,
+};
 
 const char* pylith::friction::SlipWeakeningData::_dbPropertyValues[] = {
 "static-coefficient",
@@ -46,7 +48,10 @@
 "slip-weakeneing-parameter",
 };
 
-const char** pylith::friction::SlipWeakeningData::_dbStateVarValues = 0;
+const char* pylith::friction::SlipWeakeningData::_dbStateVarValues[] = {
+  "cumulative-slip",
+  "previous-slip",
+};
 
 const double pylith::friction::SlipWeakeningData::_dbProperties[] = {
   0.6,
@@ -57,22 +62,34 @@
   0.7,
 };
 
-const double* pylith::friction::SlipWeakeningData::_dbStateVars = 0;
+const double pylith::friction::SlipWeakeningData::_dbStateVars[] = {
+  0.4,
+  0.5,
+  0.2,
+  0.1,
+};
 
 const double pylith::friction::SlipWeakeningData::_properties[] = {
   0.6,
   0.6,
-  0.6,
-  0.6,
-  0.6,
-  0.6,
+  0.8,
+  0.8,
+  0.7,
+  0.7,
 };
 
-const double* pylith::friction::SlipWeakeningData::_stateVars = 0;
+const double pylith::friction::SlipWeakeningData::_stateVars[] = {
+  0.4,
+  0.5,
+  0.2,
+  0.1,
+};
 
 const double pylith::friction::SlipWeakeningData::_propertiesNondim[] = {
-   0.6,
-   0.6,
+  0.6,
+  0.6,
+  0.8,
+  0.8,
 };
 
 const double* pylith::friction::SlipWeakeningData::_stateVarsNondim = 0;

Modified: short/3D/PyLith/trunk/unittests/libtests/friction/data/SlipWeakeningData.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/friction/data/SlipWeakeningData.hh	2010-01-26 16:01:12 UTC (rev 16182)
+++ short/3D/PyLith/trunk/unittests/libtests/friction/data/SlipWeakeningData.hh	2010-01-26 19:55:25 UTC (rev 16183)
@@ -58,19 +58,19 @@
 
   static const int _numPropertyValues[];
 
-  static const int* _numStateVarValues;
+  static const int _numStateVarValues[];
 
   static const char* _dbPropertyValues[];
 
-  static const char** _dbStateVarValues;
+  static const char* _dbStateVarValues[];
 
   static const double _dbProperties[];
 
-  static const double* _dbStateVars;
+  static const double _dbStateVars[];
 
   static const double _properties[];
 
-  static const double* _stateVars;
+  static const double _stateVars[];
 
   static const double _propertiesNondim[];