[cig-commits] r17042 - in short/3D/PyLith/trunk/unittests/libtests: friction friction/data materials materials/data
brad at geodynamics.org
brad at geodynamics.org
Tue Jul 13 12:15:11 PDT 2010
Author: brad
Date: 2010-07-13 12:15:11 -0700 (Tue, 13 Jul 2010)
New Revision: 17042
Modified:
short/3D/PyLith/trunk/unittests/libtests/friction/TestFrictionModel.cc
short/3D/PyLith/trunk/unittests/libtests/friction/data/SlipWeakeningData.cc
short/3D/PyLith/trunk/unittests/libtests/friction/data/TimeWeakeningData.cc
short/3D/PyLith/trunk/unittests/libtests/materials/TestMaterial.cc
short/3D/PyLith/trunk/unittests/libtests/materials/data/DruckerPrager3DElasticData.cc
short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellIsotropic3DElasticData.cc
short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLaw3DElasticData.cc
Log:
Merge from stable. Fixed exposed errors in names of friction properties and state variables.
Modified: short/3D/PyLith/trunk/unittests/libtests/friction/TestFrictionModel.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/friction/TestFrictionModel.cc 2010-07-13 19:06:46 UTC (rev 17041)
+++ short/3D/PyLith/trunk/unittests/libtests/friction/TestFrictionModel.cc 2010-07-13 19:15:11 UTC (rev 17042)
@@ -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/trunk/unittests/libtests/friction/data/SlipWeakeningData.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/friction/data/SlipWeakeningData.cc 2010-07-13 19:06:46 UTC (rev 17041)
+++ short/3D/PyLith/trunk/unittests/libtests/friction/data/SlipWeakeningData.cc 2010-07-13 19:15:11 UTC (rev 17042)
@@ -51,7 +51,7 @@
const char* pylith::friction::SlipWeakeningData::_dbPropertyValues[] = {
"static-coefficient",
"dynamic-coefficient",
- "slip-weakeneing-parameter",
+ "slip-weakening-parameter",
"cohesion",
};
Modified: short/3D/PyLith/trunk/unittests/libtests/friction/data/TimeWeakeningData.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/friction/data/TimeWeakeningData.cc 2010-07-13 19:06:46 UTC (rev 17041)
+++ short/3D/PyLith/trunk/unittests/libtests/friction/data/TimeWeakeningData.cc 2010-07-13 19:15:11 UTC (rev 17042)
@@ -50,12 +50,12 @@
const char* pylith::friction::TimeWeakeningData::_dbPropertyValues[] = {
"static-coefficient",
"dynamic-coefficient",
- "time-weakeneing-parameter",
+ "time-weakening-parameter",
"cohesion",
};
const char* pylith::friction::TimeWeakeningData::_dbStateVarValues[] = {
- "Elapsed-slip",
+ "elapsed-time",
};
const double pylith::friction::TimeWeakeningData::_dbProperties[] = {
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/TestMaterial.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/TestMaterial.cc 2010-07-13 19:06:46 UTC (rev 17041)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/TestMaterial.cc 2010-07-13 19:15:11 UTC (rev 17042)
@@ -337,8 +337,18 @@
CPPUNIT_ASSERT(0 != _material);
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, _material->_metadata.numDBProperties());
+ const char* const* dbPropertyLabels = _material->_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->numPropsQuadPt;
@@ -443,8 +453,18 @@
CPPUNIT_ASSERT(0 != _material);
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, _material->_metadata.numDBStateVars());
+ const char* const* dbStateVarsLabels = _material->_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->numVarsQuadPt;
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/DruckerPrager3DElasticData.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/DruckerPrager3DElasticData.cc 2010-07-13 19:06:46 UTC (rev 17041)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/DruckerPrager3DElasticData.cc 2010-07-13 19:15:11 UTC (rev 17042)
@@ -58,9 +58,9 @@
"density",
"vs",
"vp",
-"friction_angle",
+"friction-angle",
"cohesion",
-"dilatation_angle",
+"dilatation-angle",
};
const char* pylith::materials::DruckerPrager3DElasticData::_dbStateVarValues[] = {
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellIsotropic3DElasticData.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellIsotropic3DElasticData.cc 2010-07-13 19:06:46 UTC (rev 17041)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellIsotropic3DElasticData.cc 2010-07-13 19:15:11 UTC (rev 17042)
@@ -64,12 +64,12 @@
"density",
"vs",
"vp",
-"shear_ratio_1",
-"shear_ratio_2",
-"shear_ratio_3",
-"viscosity_1",
-"viscosity_2",
-"viscosity_3",
+"shear-ratio-1",
+"shear-ratio-2",
+"shear-ratio-3",
+"viscosity-1",
+"viscosity-2",
+"viscosity-3",
};
const char* pylith::materials::GenMaxwellIsotropic3DElasticData::_dbStateVarValues[] = {
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLaw3DElasticData.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLaw3DElasticData.cc 2010-07-13 19:06:46 UTC (rev 17041)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLaw3DElasticData.cc 2010-07-13 19:15:11 UTC (rev 17042)
@@ -59,9 +59,9 @@
"density",
"vs",
"vp",
-"reference_strain_rate",
-"reference_stress",
-"power_law_exponent",
+"reference-strain-rate",
+"reference-stress",
+"power-law-exponent",
};
const char* pylith::materials::PowerLaw3DElasticData::_dbStateVarValues[] = {
More information about the CIG-COMMITS
mailing list