[cig-commits] r17041 - in short/3D/PyLith/branches/v1.5-stable/unittests/libtests/friction: . data

[brad at geodynamics.org]

Author: brad
Date: 2010-07-13 12:06:46 -0700 (Tue, 13 Jul 2010)
New Revision: 17041

Modified:
   short/3D/PyLith/branches/v1.5-stable/unittests/libtests/friction/TestFrictionModel.cc
   short/3D/PyLith/branches/v1.5-stable/unittests/libtests/friction/data/SlipWeakeningData.cc
Log:
Added testing of db property and state variable names in data files (consistency check only).

Modified: short/3D/PyLith/branches/v1.5-stable/unittests/libtests/friction/TestFrictionModel.cc
===================================================================
--- short/3D/PyLith/branches/v1.5-stable/unittests/libtests/friction/TestFrictionModel.cc	2010-07-13 19:02:45 UTC (rev 17040)
+++ short/3D/PyLith/branches/v1.5-stable/unittests/libtests/friction/TestFrictionModel.cc	2010-07-13 19:06:46 UTC (rev 17041)
@@ -401,8 +401,18 @@
   CPPUNIT_ASSERT(0 != _friction);
   CPPUNIT_ASSERT(0 != _data);
   
+  // Check to make sure names of Metadata values match names of test
+  // data values (consistency check).
+  const int numDBProperties = _data->numDBProperties;
+  char** dbPropertyLabelsE = _data->dbPropertyValues;
+  CPPUNIT_ASSERT_EQUAL(numDBProperties, _friction->_metadata.numDBProperties());
+  const char* const* dbPropertyLabels = _friction->_metadata.dbProperties();
+  for (int i=0; i < numDBProperties; ++i) 
+    CPPUNIT_ASSERT_EQUAL(std::string(dbPropertyLabelsE[i]),
+			 std::string(dbPropertyLabels[i]));
+
+  // Test _dbToProperties()
   const int numLocs = _data->numLocs;
-  const int numDBProperties = _data->numDBProperties;
   double_array dbValues(numDBProperties);
 
   const int propertiesSize = _data->numPropsVertex;
@@ -505,8 +515,18 @@
   CPPUNIT_ASSERT(0 != _friction);
   CPPUNIT_ASSERT(0 != _data);
   
+  // Check to make sure names of Metadata values match names of test
+  // data values (consistency check).
+  const int numDBStateVars = _data->numDBStateVars;
+  char** dbStateVarsLabelsE = _data->dbStateVarValues;
+  CPPUNIT_ASSERT_EQUAL(numDBStateVars, _friction->_metadata.numDBStateVars());
+  const char* const* dbStateVarsLabels = _friction->_metadata.dbStateVars();
+  for (int i=0; i < numDBStateVars; ++i) 
+    CPPUNIT_ASSERT_EQUAL(std::string(dbStateVarsLabelsE[i]),
+			 std::string(dbStateVarsLabels[i]));
+
+  // Test _dbToStateVars()
   const int numLocs = _data->numLocs;
-  const int numDBStateVars = _data->numDBStateVars;
   double_array dbValues(numDBStateVars);
 
   const int stateVarsSize = _data->numVarsVertex;
@@ -684,7 +704,7 @@
 
     const double tolerance = 1.0e-06;
     for (int i=0; i < numVarsVertex; ++i) {
-#if 1 // DEBUGGING
+#if 0 // DEBUGGING
       std::cout << "valE: " << stateVarsE[i] 
 		<< ", val: " << stateVars[i]
 		<< std::endl;

Modified: short/3D/PyLith/branches/v1.5-stable/unittests/libtests/friction/data/SlipWeakeningData.cc
===================================================================
--- short/3D/PyLith/branches/v1.5-stable/unittests/libtests/friction/data/SlipWeakeningData.cc	2010-07-13 19:02:45 UTC (rev 17040)
+++ short/3D/PyLith/branches/v1.5-stable/unittests/libtests/friction/data/SlipWeakeningData.cc	2010-07-13 19:06:46 UTC (rev 17041)
@@ -51,7 +51,7 @@
 const char* pylith::friction::SlipWeakeningData::_dbPropertyValues[] = {
   "static-coefficient",
   "dynamic-coefficient",
-  "slip-weakeneing-parameter",
+  "slip-weakening-parameter",
   "cohesion",
 };