[cig-commits] r16501 - short/3D/PyLith/trunk/unittests/libtests/friction
surendra at geodynamics.org
surendra at geodynamics.org
Tue Apr 6 18:38:16 PDT 2010
Author: surendra
Date: 2010-04-06 18:38:16 -0700 (Tue, 06 Apr 2010)
New Revision: 16501
Modified:
short/3D/PyLith/trunk/unittests/libtests/friction/TestRateStateAgeing.cc
short/3D/PyLith/trunk/unittests/libtests/friction/TestRateStateAgeing.hh
short/3D/PyLith/trunk/unittests/libtests/friction/TestSlipWeakening.cc
short/3D/PyLith/trunk/unittests/libtests/friction/TestSlipWeakening.hh
Log:
Added unit test to check metadata of slip-weakening and Rate-state friction
Modified: short/3D/PyLith/trunk/unittests/libtests/friction/TestRateStateAgeing.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/friction/TestRateStateAgeing.cc 2010-04-07 01:09:12 UTC (rev 16500)
+++ short/3D/PyLith/trunk/unittests/libtests/friction/TestRateStateAgeing.cc 2010-04-07 01:38:16 UTC (rev 16501)
@@ -32,6 +32,42 @@
} // setUp
// ----------------------------------------------------------------------
+// Test properties metadata.
+void
+pylith::friction::TestRateStateAgeing::testPropertiesMetadata(void)
+{ // testPropertiesMetadata
+ RateStateAgeing model;
+
+ CPPUNIT_ASSERT_EQUAL(6, model._metadata.numDBProperties());
+ const char* const* names = model._metadata.dbProperties();
+ CPPUNIT_ASSERT_EQUAL(std::string("reference-friction-coefficient"),
+ std::string(names[0]));
+ CPPUNIT_ASSERT_EQUAL(std::string("reference-slip-rate"),
+ std::string(names[1]));
+ CPPUNIT_ASSERT_EQUAL(std::string("characteristic-slip-distance"),
+ std::string(names[2]));
+ CPPUNIT_ASSERT_EQUAL(std::string("constitutive-parameter-a"),
+ std::string(names[3]));
+ CPPUNIT_ASSERT_EQUAL(std::string("constitutive-parameter-b"),
+ std::string(names[4]));
+ CPPUNIT_ASSERT_EQUAL(std::string("cohesion"),
+ std::string(names[5]));
+} // testPropertiesMetadata
+
+// ----------------------------------------------------------------------
+// Test state variable metadata.
+void
+pylith::friction::TestRateStateAgeing::testStateVarsMetadata(void)
+{ // testStateVarsMetadata
+ RateStateAgeing model;
+
+ CPPUNIT_ASSERT_EQUAL(1, model._metadata.numDBStateVars());
+ const char* const* names = model._metadata.dbStateVars();
+ CPPUNIT_ASSERT_EQUAL(std::string("state-variable"),
+ std::string(names[0]));
+} // testStateVarsMetadata
+
+// ----------------------------------------------------------------------
// Test hasProperty().
void
pylith::friction::TestRateStateAgeing::testHasProperty(void)
Modified: short/3D/PyLith/trunk/unittests/libtests/friction/TestRateStateAgeing.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/friction/TestRateStateAgeing.hh 2010-04-07 01:09:12 UTC (rev 16500)
+++ short/3D/PyLith/trunk/unittests/libtests/friction/TestRateStateAgeing.hh 2010-04-07 01:38:16 UTC (rev 16501)
@@ -37,6 +37,8 @@
// CPPUNIT TEST SUITE /////////////////////////////////////////////////
CPPUNIT_TEST_SUITE( TestRateStateAgeing );
+ CPPUNIT_TEST( testPropertiesMetadata );
+ CPPUNIT_TEST( testStateVarsMetadata );
CPPUNIT_TEST( testDBToProperties );
CPPUNIT_TEST( testNonDimProperties );
CPPUNIT_TEST( testDimProperties );
@@ -56,6 +58,12 @@
/// Setup testing data.
void setUp(void);
+ /// Test properties metadata.
+ void testPropertiesMetadata(void);
+
+ /// Test state variable metadata.
+ void testStateVarsMetadata(void);
+
/// Test hasProperty().
void testHasProperty(void);
Modified: short/3D/PyLith/trunk/unittests/libtests/friction/TestSlipWeakening.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/friction/TestSlipWeakening.cc 2010-04-07 01:09:12 UTC (rev 16500)
+++ short/3D/PyLith/trunk/unittests/libtests/friction/TestSlipWeakening.cc 2010-04-07 01:38:16 UTC (rev 16501)
@@ -32,6 +32,40 @@
} // setUp
// ----------------------------------------------------------------------
+// Test properties metadata.
+void
+pylith::friction::TestSlipWeakening::testPropertiesMetadata(void)
+{ // testPropertiesMetadata
+ SlipWeakening model;
+
+ CPPUNIT_ASSERT_EQUAL(4, model._metadata.numDBProperties());
+ const char* const* names = model._metadata.dbProperties();
+ CPPUNIT_ASSERT_EQUAL(std::string("static-coefficient"),
+ std::string(names[0]));
+ CPPUNIT_ASSERT_EQUAL(std::string("dynamic-coefficient"),
+ std::string(names[1]));
+ CPPUNIT_ASSERT_EQUAL(std::string("slip-weakening-parameter"),
+ std::string(names[2]));
+ CPPUNIT_ASSERT_EQUAL(std::string("cohesion"),
+ std::string(names[3]));
+} // testPropertiesMetadata
+
+// ----------------------------------------------------------------------
+// Test state variable metadata.
+void
+pylith::friction::TestSlipWeakening::testStateVarsMetadata(void)
+{ // testStateVarsMetadata
+ SlipWeakening 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 hasProperty().
void
pylith::friction::TestSlipWeakening::testHasProperty(void)
Modified: short/3D/PyLith/trunk/unittests/libtests/friction/TestSlipWeakening.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/friction/TestSlipWeakening.hh 2010-04-07 01:09:12 UTC (rev 16500)
+++ short/3D/PyLith/trunk/unittests/libtests/friction/TestSlipWeakening.hh 2010-04-07 01:38:16 UTC (rev 16501)
@@ -37,6 +37,8 @@
// CPPUNIT TEST SUITE /////////////////////////////////////////////////
CPPUNIT_TEST_SUITE( TestSlipWeakening );
+ CPPUNIT_TEST( testPropertiesMetadata );
+ CPPUNIT_TEST( testStateVarsMetadata );
CPPUNIT_TEST( testDBToProperties );
CPPUNIT_TEST( testNonDimProperties );
CPPUNIT_TEST( testDimProperties );
@@ -56,6 +58,12 @@
/// Setup testing data.
void setUp(void);
+ /// Test properties metadata.
+ void testPropertiesMetadata(void);
+
+ /// Test state variable metadata.
+ void testStateVarsMetadata(void);
+
/// Test hasProperty().
void testHasProperty(void);
More information about the CIG-COMMITS
mailing list