[cig-commits] r14111 - in short/3D/PyLith/branches/pylith-swig: libsrc/materials unittests/libtests/materials unittests/libtests/materials/data
brad at geodynamics.org
brad at geodynamics.org
Fri Feb 20 16:55:53 PST 2009
Author: brad
Date: 2009-02-20 16:55:53 -0800 (Fri, 20 Feb 2009)
New Revision: 14111
Modified:
short/3D/PyLith/branches/pylith-swig/libsrc/materials/ElasticMaterial.cc
short/3D/PyLith/branches/pylith-swig/libsrc/materials/Material.hh
short/3D/PyLith/branches/pylith-swig/libsrc/materials/Metadata.cc
short/3D/PyLith/branches/pylith-swig/unittests/libtests/materials/Makefile.am
short/3D/PyLith/branches/pylith-swig/unittests/libtests/materials/TestMaterial.cc
short/3D/PyLith/branches/pylith-swig/unittests/libtests/materials/TestMaterial.hh
short/3D/PyLith/branches/pylith-swig/unittests/libtests/materials/data/MaterialData.cc
short/3D/PyLith/branches/pylith-swig/unittests/libtests/materials/data/MaterialData.hh
Log:
Started updating material unit tests. Fixed some bugs in materials.
Modified: short/3D/PyLith/branches/pylith-swig/libsrc/materials/ElasticMaterial.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/libsrc/materials/ElasticMaterial.cc 2009-02-20 23:29:29 UTC (rev 14110)
+++ short/3D/PyLith/branches/pylith-swig/libsrc/materials/ElasticMaterial.cc 2009-02-21 00:55:53 UTC (rev 14111)
@@ -310,6 +310,7 @@
case 1: {
const char* stressDBValues[] = { "stress" };
_dbInitialStress->queryVals(stressDBValues, tensorSize);
+ break;
} // case 1
case 2 : {
const char* stressDBValues[] = {
@@ -318,7 +319,8 @@
"stress-xy",
};
_dbInitialStress->queryVals(stressDBValues, tensorSize);
- } // case 3
+ break;
+ } // case 2
case 3 : {
const char* stressDBValues[] = {
"stress-xx",
@@ -329,6 +331,7 @@
"stress-xz",
};
_dbInitialStress->queryVals(stressDBValues, tensorSize);
+ break;
} // case 3
default :
assert(0);
@@ -432,6 +435,7 @@
case 1: {
const char* strainDBValues[] = { "strain" };
_dbInitialStrain->queryVals(strainDBValues, tensorSize);
+ break;
} // case 1
case 2 : {
const char* strainDBValues[] = {
@@ -440,7 +444,8 @@
"strain-xy",
};
_dbInitialStrain->queryVals(strainDBValues, tensorSize);
- } // case 3
+ break;
+ } // case 2
case 3 : {
const char* strainDBValues[] = {
"strain-xx",
@@ -451,6 +456,7 @@
"strain-xz",
};
_dbInitialStrain->queryVals(strainDBValues, tensorSize);
+ break;
} // case 3
default :
assert(0);
Modified: short/3D/PyLith/branches/pylith-swig/libsrc/materials/Material.hh
===================================================================
--- short/3D/PyLith/branches/pylith-swig/libsrc/materials/Material.hh 2009-02-20 23:29:29 UTC (rev 14110)
+++ short/3D/PyLith/branches/pylith-swig/libsrc/materials/Material.hh 2009-02-21 00:55:53 UTC (rev 14111)
@@ -62,18 +62,6 @@
*/
int dimension(void) const;
- /** Set database for physical property parameters.
- *
- * @param value Pointer to database.
- */
- void dbProperties(spatialdata::spatialdb::SpatialDB* value);
-
- /** Set database for initial state variables.
- *
- * @param value Pointer to database.
- */
- void dbInitialState(spatialdata::spatialdb::SpatialDB* value);
-
/** Set identifier of material.
*
* @param value Material identifier
@@ -111,6 +99,18 @@
*/
double timeStep(void) const;
+ /** Set database for physical property parameters.
+ *
+ * @param value Pointer to database.
+ */
+ void dbProperties(spatialdata::spatialdb::SpatialDB* value);
+
+ /** Set database for initial state variables.
+ *
+ * @param value Pointer to database.
+ */
+ void dbInitialState(spatialdata::spatialdb::SpatialDB* value);
+
/** Set scales used to nondimensionalize physical properties.
*
* @param dim Nondimensionalizer
Modified: short/3D/PyLith/branches/pylith-swig/libsrc/materials/Metadata.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/libsrc/materials/Metadata.cc 2009-02-20 23:29:29 UTC (rev 14110)
+++ short/3D/PyLith/branches/pylith-swig/libsrc/materials/Metadata.cc 2009-02-21 00:55:53 UTC (rev 14111)
@@ -82,6 +82,7 @@
throw std::runtime_error(msg.str());
} // if
fiberDim = iter->second.fiberDim;
+ break;
} // PROPERTY
case STATEVAR : {
@@ -93,6 +94,7 @@
throw std::runtime_error(msg.str());
} // if
fiberDim = iter->second.fiberDim;
+ break;
} // STATEVAR
default :
@@ -122,6 +124,7 @@
throw std::runtime_error(msg.str());
} // if
fieldType = iter->second.fieldType;
+ break;
} // PROPERTY
case STATEVAR : {
@@ -133,6 +136,7 @@
throw std::runtime_error(msg.str());
} // if
fieldType = iter->second.fieldType;
+ break;
} // STATEVAR
default :
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/materials/Makefile.am
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/materials/Makefile.am 2009-02-20 23:29:29 UTC (rev 14110)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/materials/Makefile.am 2009-02-21 00:55:53 UTC (rev 14111)
@@ -22,17 +22,19 @@
# Primary source files
testmaterials_SOURCES = \
TestMaterial.cc \
- TestElasticMaterial.cc \
- TestElasticIsotropic3D.cc \
- TestElasticPlaneStrain.cc \
- TestElasticPlaneStress.cc \
- TestElasticStrain1D.cc \
- TestElasticStress1D.cc \
- TestGenMaxwellIsotropic3D.cc \
- TestMaxwellIsotropic3D.cc \
test_materials.cc
+# TestElasticMaterial.cc \
+# TestElasticIsotropic3D.cc \
+# TestElasticPlaneStrain.cc \
+# TestElasticPlaneStress.cc \
+# TestElasticStrain1D.cc \
+# TestElasticStress1D.cc \
+# TestGenMaxwellIsotropic3D.cc \
+# TestMaxwellIsotropic3D.cc
+
+
noinst_HEADERS = \
TestMaterial.hh \
TestElasticMaterial.hh \
@@ -46,18 +48,19 @@
# Source files associated with testing data
testmaterials_SOURCES += \
- data/MaterialData.cc \
- data/ElasticMaterialData.cc \
- data/ElasticIsotropic3DData.cc \
- data/ElasticPlaneStrainData.cc \
- data/ElasticPlaneStressData.cc \
- data/ElasticStrain1DData.cc \
- data/ElasticStress1DData.cc \
- data/GenMaxwellIsotropic3DElasticData.cc \
- data/GenMaxwellIsotropic3DTimeDepData.cc \
- data/MaxwellIsotropic3DElasticData.cc \
- data/MaxwellIsotropic3DTimeDepData.cc
+ data/MaterialData.cc
+# data/ElasticMaterialData.cc \
+# data/ElasticIsotropic3DData.cc \
+# data/ElasticPlaneStrainData.cc \
+# data/ElasticPlaneStressData.cc \
+# data/ElasticStrain1DData.cc \
+# data/ElasticStress1DData.cc \
+# data/GenMaxwellIsotropic3DElasticData.cc \
+# data/GenMaxwellIsotropic3DTimeDepData.cc \
+# data/MaxwellIsotropic3DElasticData.cc \
+# data/MaxwellIsotropic3DTimeDepData.cc
+
noinst_HEADERS += \
data/MaterialData.hh \
data/ElasticMaterialData.hh \
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/materials/TestMaterial.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/materials/TestMaterial.cc 2009-02-20 23:29:29 UTC (rev 14110)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/materials/TestMaterial.cc 2009-02-21 00:55:53 UTC (rev 14111)
@@ -36,38 +36,6 @@
CPPUNIT_TEST_SUITE_REGISTRATION( pylith::materials::TestMaterial );
// ----------------------------------------------------------------------
-// Test db()
-void
-pylith::materials::TestMaterial::testDB(void)
-{ // testDB
- const char* label = "my_database";
- spatialdata::spatialdb::SimpleDB db;
- db.label(label);
-
- ElasticIsotropic3D material;
- material.db(&db);
-
- CPPUNIT_ASSERT(0 != material._db);
- CPPUNIT_ASSERT(0 == strcmp(label, material._db->label()));
-} // testDB
-
-// ----------------------------------------------------------------------
-// Test initialStateDB()
-void
-pylith::materials::TestMaterial::testInitialStateDB(void)
-{ // testInitialStateDB
- const char* label = "my_database";
- spatialdata::spatialdb::SimpleDB initialStateDB;
- initialStateDB.label(label);
-
- ElasticIsotropic3D material;
- material.initialStateDB(&initialStateDB);
-
- CPPUNIT_ASSERT(0 != material._initialStateDB);
- CPPUNIT_ASSERT(0 == strcmp(label, material._initialStateDB->label()));
-} // testInitialStateDB
-// ----------------------------------------------------------------------
-
// Test id()
void
pylith::materials::TestMaterial::testID(void)
@@ -84,11 +52,11 @@
void
pylith::materials::TestMaterial::testLabel(void)
{ // testLabel
- const char* label = "the_database";
+ const std::string& label = "the database";
ElasticIsotropic3D material;
- material.label(label);
+ material.label(label.c_str());
- CPPUNIT_ASSERT(0 == strcmp(label, material.label().c_str()));
+ CPPUNIT_ASSERT_EQUAL(label, material.label());
} // testLabel
// ----------------------------------------------------------------------
@@ -104,6 +72,54 @@
} // testTimeStep
// ----------------------------------------------------------------------
+// Test dbProperties()
+void
+pylith::materials::TestMaterial::testDBProperties(void)
+{ // testDBProperties
+ const std::string& label = "my_database";
+ spatialdata::spatialdb::SimpleDB db;
+ db.label(label.c_str());
+
+ ElasticIsotropic3D material;
+ material.dbProperties(&db);
+
+ CPPUNIT_ASSERT(0 != material._dbProperties);
+ CPPUNIT_ASSERT_EQUAL(label, std::string(material._dbProperties->label()));
+} // testDBProperties
+
+// ----------------------------------------------------------------------
+// Test dbStateVars()
+void
+pylith::materials::TestMaterial::testDBStateVars(void)
+{ // testDBStateVars
+ const std::string& label = "my_database";
+ spatialdata::spatialdb::SimpleDB db;
+ db.label(label.c_str());
+
+ ElasticIsotropic3D material;
+ material.dbInitialState(&db);
+
+ CPPUNIT_ASSERT(0 != material._dbInitialState);
+ CPPUNIT_ASSERT_EQUAL(label, std::string(material._dbInitialState->label()));
+} // testDBStateVars
+
+// ----------------------------------------------------------------------
+// Test normalizer()
+void
+pylith::materials::TestMaterial::testNormalizer(void)
+{ // testNormalizer
+ spatialdata::units::Nondimensional normalizer;
+ const double lengthScale = 2.0;
+ normalizer.lengthScale(lengthScale);
+
+ ElasticIsotropic3D material;
+ material.normalizer(normalizer);
+
+ CPPUNIT_ASSERT(0 != material._normalizer);
+ CPPUNIT_ASSERT_EQUAL(lengthScale, material._normalizer->lengthScale());
+} // testNormalizer
+
+// ----------------------------------------------------------------------
// Test needNewJacobian()
void
pylith::materials::TestMaterial::testNeedNewJacobian(void)
@@ -119,12 +135,13 @@
CPPUNIT_ASSERT_EQUAL(flag, material.needNewJacobian());
} // testNeedNewJacobian
+#if 0
// ----------------------------------------------------------------------
// Test initialize()
void
pylith::materials::TestMaterial::testInitialize(void)
{ // testInitialize
- ALE::Obj<Mesh> mesh;
+ topology::Mesh mesh;
const int materialID = 24;
{ // create mesh
const int cellDim = 1;
@@ -243,6 +260,7 @@
CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, paramsCell[index]/lambdaE[i], tolerance);
} // for
} // testInitialize
+#endif
// ----------------------------------------------------------------------
// Setup testing data.
@@ -263,71 +281,210 @@
} // tearDown
// ----------------------------------------------------------------------
-// Test DBToProperties
+// Test dimension()
void
+pylith::materials::TestMaterial::testDimension(void)
+{ // testDimension
+ CPPUNIT_ASSERT_EQUAL(_data->dimension, _material->dimension());
+} // testDimension
+
+// ----------------------------------------------------------------------
+// Test _dbToProperties().
+void
pylith::materials::TestMaterial::testDBToProperties(void)
{ // testDBToProperties
CPPUNIT_ASSERT(0 != _material);
CPPUNIT_ASSERT(0 != _data);
const int numLocs = _data->numLocs;
- const int numDBValues = _data->numDBValues;
- double_array dbData(numDBValues);
+ const int numDBProperties = _data->numDBProperties;
+ double_array dbValues(numDBProperties);
+ const int propertiesSize = _data->numPropsQuadPt;
+ double_array properties(propertiesSize);
+
for (int iLoc=0; iLoc < numLocs; ++iLoc) {
- for (int i=0; i < numDBValues; ++i)
- dbData[i] = _data->dbData[iLoc*numDBValues+i];
+ for (int i=0; i < numDBProperties; ++i)
+ dbValues[i] = _data->dbProperties[iLoc*numDBProperties+i];
- const int numProperties = _data->numParameters;
- int numParamEntries = 0;
- for (int iParam=0; iParam < numProperties; ++iParam)
- numParamEntries += _data->numParamValues[iParam];
+ _material->_dbToProperties(&properties[0], dbValues);
+
+ const double* const propertiesE = &_data->properties[iLoc*propertiesSize];
+ const double tolerance = 1.0e-06;
+ for (int i=0; i < propertiesSize; ++i) {
+ if (fabs(propertiesE[i]) > tolerance)
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0,
+ properties[i]/propertiesE[i],
+ tolerance);
+ else
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(propertiesE[i], properties[i],
+ tolerance);
+ } // for
+ } // for
+} // testDBToProperties
- double_array parameterData(numParamEntries);
+// ----------------------------------------------------------------------
+// Test _nondimProperties().
+void
+pylith::materials::TestMaterial::testNonDimProperties(void)
+{ // testNonDimProperties
+ CPPUNIT_ASSERT(0 != _material);
+ CPPUNIT_ASSERT(0 != _data);
+
+ const int numLocs = _data->numLocs;
+ const int propertiesSize = _data->numPropsQuadPt;
+ double_array propertiesNondim(propertiesSize);
- double* const parameterDataE = &_data->parameterData[iLoc*numParamEntries];
- _material->_dbToProperties(¶meterData[0], dbData);
+ for (int iLoc=0; iLoc < numLocs; ++iLoc) {
+ _material->_nondimProperties(&_data->properties[0], propertiesSize);
+
+ const double* const propertiesNondimE =
+ &_data->propertiesNondim[iLoc*propertiesSize];
+
const double tolerance = 1.0e-06;
- for (int i=0; i < numParamEntries; ++i) {
- if (fabs(parameterDataE[i]) > tolerance)
+ for (int i=0; i < propertiesSize; ++i) {
+ if (fabs(propertiesNondimE[i]) > tolerance)
CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0,
- parameterData[i]/parameterDataE[i],
+ propertiesNondim[i]/propertiesNondimE[i],
tolerance);
else
- CPPUNIT_ASSERT_DOUBLES_EQUAL(parameterDataE[i], parameterData[i],
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(propertiesNondimE[i], propertiesNondim[i],
tolerance);
} // for
} // for
-} // testDBToProperties
+} // testNonDimProperties
// ----------------------------------------------------------------------
-// Test _dbValues and _numDBValues.
+// Test _dimProperties().
void
-pylith::materials::TestMaterial::testDBValues(void)
-{ // testDBValues
+pylith::materials::TestMaterial::testDimProperties(void)
+{ // testDimProperties
CPPUNIT_ASSERT(0 != _material);
CPPUNIT_ASSERT(0 != _data);
+
+ const int numLocs = _data->numLocs;
+ const int propertiesSize = _data->numPropsQuadPt;
+ double_array properties(propertiesSize);
- const int numDBValues = _data->numDBValues;
- CPPUNIT_ASSERT_EQUAL(numDBValues, _material->_numDBValues);
+ for (int iLoc=0; iLoc < numLocs; ++iLoc) {
- char** const dbValuesE = _data->dbValues;
- for (int i=0; i < numDBValues; ++i)
- CPPUNIT_ASSERT(0 == strcmp(dbValuesE[i], _material->_dbValues[i]));
-} // testDBValues
+ _material->_dimProperties(&_data->propertiesNondim[0], propertiesSize);
+
+ const double* const propertiesE =
+ &_data->properties[iLoc*propertiesSize];
+ const double tolerance = 1.0e-06;
+ for (int i=0; i < propertiesSize; ++i) {
+ if (fabs(propertiesE[i]) > tolerance)
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0,
+ properties[i]/propertiesE[i],
+ tolerance);
+ else
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(propertiesE[i], properties[i],
+ tolerance);
+ } // for
+ } // for
+} // testDimProperties
+
// ----------------------------------------------------------------------
-// Test _numProperties.
+// Test _dbToStateVars().
void
-pylith::materials::TestMaterial::testProperties(void)
-{ // testProperties
+pylith::materials::TestMaterial::testDBToStateVars(void)
+{ // testDBToStateVars
CPPUNIT_ASSERT(0 != _material);
CPPUNIT_ASSERT(0 != _data);
+
+ const int numLocs = _data->numLocs;
+ const int numDBStateVars = _data->numDBStateVars;
+ double_array dbValues(numDBStateVars);
- const int numProperties = _data->numParameters;
- CPPUNIT_ASSERT_EQUAL(numProperties, _material->_numProperties);
-} // testProperties
+ const int stateVarsSize = _data->numPropsQuadPt;
+ double_array stateVars(stateVarsSize);
+ for (int iLoc=0; iLoc < numLocs; ++iLoc) {
+ for (int i=0; i < numDBStateVars; ++i)
+ dbValues[i] = _data->dbStateVars[iLoc*numDBStateVars+i];
+ _material->_dbToStateVars(&stateVars[0], dbValues);
+
+ const double* const stateVarsE = &_data->stateVars[iLoc*stateVarsSize];
+ const double tolerance = 1.0e-06;
+ for (int i=0; i < stateVarsSize; ++i) {
+ if (fabs(stateVarsE[i]) > tolerance)
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0,
+ stateVars[i]/stateVarsE[i],
+ tolerance);
+ else
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(stateVarsE[i], stateVars[i],
+ tolerance);
+ } // for
+ } // for
+} // testDBToStateVars
+
+// ----------------------------------------------------------------------
+// Test _nondimStateVars().
+void
+pylith::materials::TestMaterial::testNonDimStateVars(void)
+{ // testNonDimStateVars
+ CPPUNIT_ASSERT(0 != _material);
+ CPPUNIT_ASSERT(0 != _data);
+
+ const int numLocs = _data->numLocs;
+ const int stateVarsSize = _data->numPropsQuadPt;
+ double_array stateVarsNondim(stateVarsSize);
+
+ for (int iLoc=0; iLoc < numLocs; ++iLoc) {
+
+ _material->_nondimStateVars(&_data->stateVars[0], stateVarsSize);
+
+ const double* const stateVarsNondimE =
+ &_data->stateVarsNondim[iLoc*stateVarsSize];
+
+ const double tolerance = 1.0e-06;
+ for (int i=0; i < stateVarsSize; ++i) {
+ if (fabs(stateVarsNondimE[i]) > tolerance)
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0,
+ stateVarsNondim[i]/stateVarsNondimE[i],
+ tolerance);
+ else
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(stateVarsNondimE[i], stateVarsNondim[i],
+ tolerance);
+ } // for
+ } // for
+} // testNonDimStateVars
+
+// ----------------------------------------------------------------------
+// Test _dimStateVars().
+void
+pylith::materials::TestMaterial::testDimStateVars(void)
+{ // testDimStateVars
+ CPPUNIT_ASSERT(0 != _material);
+ CPPUNIT_ASSERT(0 != _data);
+
+ const int numLocs = _data->numLocs;
+ const int stateVarsSize = _data->numPropsQuadPt;
+ double_array stateVars(stateVarsSize);
+
+ for (int iLoc=0; iLoc < numLocs; ++iLoc) {
+
+ _material->_dimStateVars(&_data->stateVarsNondim[0], stateVarsSize);
+
+ const double* const stateVarsE =
+ &_data->stateVars[iLoc*stateVarsSize];
+
+ const double tolerance = 1.0e-06;
+ for (int i=0; i < stateVarsSize; ++i) {
+ if (fabs(stateVarsE[i]) > tolerance)
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0,
+ stateVars[i]/stateVarsE[i],
+ tolerance);
+ else
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(stateVarsE[i], stateVars[i],
+ tolerance);
+ } // for
+ } // for
+} // testDimStateVars
+
+
// End of file
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/materials/TestMaterial.hh
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/materials/TestMaterial.hh 2009-02-20 23:29:29 UTC (rev 14110)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/materials/TestMaterial.hh 2009-02-21 00:55:53 UTC (rev 14111)
@@ -39,26 +39,23 @@
// CPPUNIT TEST SUITE /////////////////////////////////////////////////
CPPUNIT_TEST_SUITE( TestMaterial );
- CPPUNIT_TEST( testDB );
- CPPUNIT_TEST( testInitialStateDB );
CPPUNIT_TEST( testID );
CPPUNIT_TEST( testLabel );
CPPUNIT_TEST( testTimeStep );
+ CPPUNIT_TEST( testDBProperties );
+ CPPUNIT_TEST( testDBStateVars );
+ CPPUNIT_TEST( testNormalizer );
CPPUNIT_TEST( testNeedNewJacobian );
+#if 0
CPPUNIT_TEST( testInitialize );
+#endif
CPPUNIT_TEST_SUITE_END();
// PUBLIC METHODS /////////////////////////////////////////////////////
public :
- /// Test db()
- void testDB(void);
-
- /// Test initialStateDB()
- void testInitialStateDB(void);
-
- /// Test id()
+ /// Test id().
void testID(void);
/// Test label()
@@ -67,11 +64,22 @@
/// Test timeStep()
void testTimeStep(void);
+ /// Test dbProperties()
+ void testDBProperties(void);
+
+ /// Test dbStateVars().
+ void testDBStateVars(void);
+
+ /// Test normalizer().
+ void testNormalizer(void);
+
/// Test needNewJacobian()
void testNeedNewJacobian(void);
+#if 0
/// Test initialize()
void testInitialize(void);
+#endif
// PUBLIC METHODS /////////////////////////////////////////////////////
public :
@@ -86,15 +94,27 @@
virtual
void tearDown(void);
- /// Test dbToProperties().
+ /// Test dimension().
+ void testDimension();
+
+ /// Test _dbToProperties().
void testDBToProperties(void);
- /// Test dbValues().
- void testDBValues(void);
+ /// Test _nondimProperties().
+ void testNonDimProperties(void);
- /// Test _numProperties.
- void testProperties(void);
+ /// Test _dimProperties().
+ void testDimProperties(void);
+ /// Test _dbToStateVars().
+ void testDBToStateVars(void);
+
+ /// Test _nondimStateVars().
+ void testNonDimStateVars(void);
+
+ /// Test _dimStateVars().
+ void testDimStateVars(void);
+
// PROTECTED MEMBERS //////////////////////////////////////////////////
protected :
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/materials/data/MaterialData.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/materials/data/MaterialData.cc 2009-02-20 23:29:29 UTC (rev 14110)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/materials/data/MaterialData.cc 2009-02-21 00:55:53 UTC (rev 14111)
@@ -17,11 +17,20 @@
pylith::materials::MaterialData::MaterialData(void) :
dimension(0),
numLocs(0),
- numDBValues(0),
- numParameters(0),
- numParamsQuadPt(0),
- numParamValues(0),
- dbValues(0)
+ numProperties(0),
+ numStateVars(0),
+ numDBProperties(0),
+ numDBStateVars(0),
+ numPropsQuadPt(0),
+ numVarsQuadPt(0),
+ numPropertyValues(0),
+ numStateVarValues(0),
+ dbPropertyValues(0),
+ dbStateVarValues(0),
+ dbProperties(0),
+ dbStateVars(0),
+ properties(0),
+ stateVars(0)
{ // constructor
} // constructor
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/materials/data/MaterialData.hh
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/materials/data/MaterialData.hh 2009-02-20 23:29:29 UTC (rev 14110)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/materials/data/MaterialData.hh 2009-02-21 00:55:53 UTC (rev 14111)
@@ -37,19 +37,27 @@
int dimension; ///< Number of dimensions
int numLocs; ///< Number of locations
- int numDBValues; ///< Number of database values
- int numParameters; ///< Number of parameters
- int numInitialStateValues; ///< Number of initial state values.
- int numParamsQuadPt; ///< Number of parameters per quadrature point.
- int* numParamValues; ///< Number of values for each parameter
+ int numProperties; ///< Number of parameters for physical properties.
+ int numStateVars; ///< Number of state variables.
+ int numDBProperties; ///< Number of db values for properties.
+ int numDBStateVars; ///< Number of db values for state variables.
- char** dbValues; ///< Aray of names of database values;
- char** initialStateDBValues; ///< Names of initial state database values;
+ int numPropsQuadPt; ///< Number of properties at each quadrature point
+ int numVarsQuadPt; ///< Number of state variables at each quadrature point
- double* dbData; ///< Array of database values at locations
- double* initialStateDBData; ///< Initial state database values at locations
- double* parameterData; ///< Array of parameter values at locations
- double* initialState; ///< Initial state values at locations
+ int* numPropertyValues; ///< Number of values for each property
+ int* numStateVarValues; ///< Number of values for each state variable
+
+ char** dbPropertyValues; ///< Names of db values for properties.
+ char** dbStateVarValues; ///< Names of db values for state variables.
+
+ double* dbProperties; ///< Database values for properties at locations.
+ double* dbStateVars; ///< Database values for state variables at locations.
+ double* properties; ///< Properties at locations.
+ double* stateVars; ///< State variables at locations.
+ double* propertiesNondim; ///< Nondimensional properties at locations.
+ double* stateVarsNondim; ///< Nondimensional state variables at locations.
+
};
#endif // pylith_materials_materialdata_hh
More information about the CIG-COMMITS
mailing list