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

[willic3 at geodynamics.org]

Author: willic3
Date: 2007-06-05 09:50:24 -0700 (Tue, 05 Jun 2007)
New Revision: 7068

Modified:
   short/3D/PyLith/trunk/unittests/libtests/materials/TestMaterial.cc
   short/3D/PyLith/trunk/unittests/libtests/materials/TestMaxwellIsotropic3D.cc
Log:
Fixed a couple of unit test bugs.  There are still 2 bugs left.



Modified: short/3D/PyLith/trunk/unittests/libtests/materials/TestMaterial.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/TestMaterial.cc	2007-06-05 14:46:37 UTC (rev 7067)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/TestMaterial.cc	2007-06-05 16:50:24 UTC (rev 7068)
@@ -241,11 +241,16 @@
     const double tolerance = 1.0e-06;
     for (int iParam=0, i=0; iParam < numParameters; ++iParam) {
       const int numParamValues = data.numParamValues[iParam];
-      CPPUNIT_ASSERT_EQUAL(numParamValues, int(parameterData[i].size()));
+      CPPUNIT_ASSERT_EQUAL(numParamValues, int(parameterData[iParam].size()));
       for (int iValue=0; iValue < numParamValues; ++iValue)
-	CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, 
+	if(fabs(parameterDataE[i]) > tolerance)
+	  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, 
 				     parameterData[iParam][iValue]/parameterDataE[i++],
 				     tolerance);
+	else
+	  CPPUNIT_ASSERT_DOUBLES_EQUAL(parameterDataE[i++], parameterData[iParam][iValue],
+				     tolerance);
+	 
     } // for
   } // for
 } // _testDBToParameters

Modified: short/3D/PyLith/trunk/unittests/libtests/materials/TestMaxwellIsotropic3D.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/TestMaxwellIsotropic3D.cc	2007-06-05 14:46:37 UTC (rev 7067)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/TestMaxwellIsotropic3D.cc	2007-06-05 16:50:24 UTC (rev 7068)
@@ -165,6 +165,7 @@
   CPPUNIT_ASSERT_EQUAL(false, material.needNewJacobian());
 
   const double dt2 = 2.0;
+  material.timeStep(dt2);
   CPPUNIT_ASSERT_EQUAL(dt2, material.Material::timeStep());
   CPPUNIT_ASSERT_EQUAL(true, material.needNewJacobian());
 } // testTimeStep