[cig-commits] r6492 - short/3D/PyLith/trunk/unittests/libtests/materials

[brad at geodynamics.org]

Author: brad
Date: 2007-03-31 14:58:14 -0700 (Sat, 31 Mar 2007)
New Revision: 6492

Modified:
   short/3D/PyLith/trunk/unittests/libtests/materials/TestElasticMaterial.cc
Log:
Updated material tests.

Modified: short/3D/PyLith/trunk/unittests/libtests/materials/TestElasticMaterial.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/TestElasticMaterial.cc	2007-03-31 21:51:31 UTC (rev 6491)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/TestElasticMaterial.cc	2007-03-31 21:58:14 UTC (rev 6492)
@@ -116,7 +116,7 @@
   cellData[1] = data.parameterData[5];
   parameterLambda->updateAddPoint(*cellIter, cellData);
 
-  material._initCellData(numQuadPts);
+  material.initCellData(numQuadPts);
   const double* density = material.calcDensity(*cellIter, numQuadPts);
 
   const double tolerance = 1.0e-06;
@@ -202,7 +202,7 @@
   cellData[1] = data.parameterData[5];
   parameterLambda->updateAddPoint(*cellIter, cellData);
 
-  material._initCellData(numQuadPts);
+  material.initCellData(numQuadPts);
   const double* stress = material.calcStress(*cellIter, data.strain, 
 					     numQuadPts, data.dimension);
 
@@ -293,7 +293,7 @@
   cellData[1] = data.parameterData[5];
   parameterLambda->updateAddPoint(*cellIter, cellData);
 
-  material._initCellData(numQuadPts);
+  material.initCellData(numQuadPts);
   const double* elasticConsts = 
     material.calcDerivElastic(*cellIter, data.strain, 
 			      numQuadPts, data.dimension);
@@ -313,7 +313,7 @@
 } // testCalcDerivElastic
     
 // ----------------------------------------------------------------------
-// Test _initCellData()
+// Test initCellData()
 void
 pylith::materials::TestElasticMaterial::testInitCellData(void)
 { // testInitCellData
@@ -322,7 +322,7 @@
   CPPUNIT_ASSERT(0 == material._density);
   CPPUNIT_ASSERT(0 == material._elasticConsts);
   const int numQuadPts = 4;
-  material._initCellData(numQuadPts);
+  material.initCellData(numQuadPts);
   CPPUNIT_ASSERT(0 != material._density);
   CPPUNIT_ASSERT(0 != material._stress);
   CPPUNIT_ASSERT(0 != material._elasticConsts);
@@ -336,7 +336,7 @@
 					const ElasticMaterialData& data) const
 { // _testCalcDensity
   const int numQuadPts = data.numLocs;
-  material->_initCellData(numQuadPts);
+  material->initCellData(numQuadPts);
   material->_calcDensity(data.parameterData, data.numParameters, data.numLocs);
   const double* densityE = data.density;
   const double* density = material->_density;
@@ -358,7 +358,7 @@
 				       const ElasticMaterialData& data) const
 { // _testCalcElasticConsts
   const int numQuadPts = data.numLocs;
-  material->_initCellData(numQuadPts);
+  material->initCellData(numQuadPts);
   material->_calcStress(data.parameterData, data.numParameters, data.strain, 
 			data.numLocs, data.dimension);
   const double* stressE = data.stress;
@@ -386,7 +386,7 @@
 				       const ElasticMaterialData& data) const
 { // _testCalcElasticConsts
   const int numQuadPts = data.numLocs;
-  material->_initCellData(numQuadPts);
+  material->initCellData(numQuadPts);
   material->_calcElasticConsts(data.parameterData, data.numParameters, 
 			       data.strain, data.numLocs, data.dimension);
   const double* elasticConstsE = data.elasticConsts;