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

[willic3 at geodynamics.org]

Author: willic3
Date: 2007-06-05 11:20:20 -0700 (Tue, 05 Jun 2007)
New Revision: 7070

Modified:
   short/3D/PyLith/trunk/unittests/libtests/materials/TestMaterial.cc
Log:
Fixed another bug related to parameters containing vectors.
One bug to go.



Modified: short/3D/PyLith/trunk/unittests/libtests/materials/TestMaterial.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/TestMaterial.cc	2007-06-05 18:18:37 UTC (rev 7069)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/TestMaterial.cc	2007-06-05 18:20:20 UTC (rev 7070)
@@ -231,11 +231,15 @@
       dbData[i] = data.dbData[iLoc*numDBValues+i];
 
     const int numParameters = data.numParameters;
-    double* const parameterDataE = &data.parameterData[iLoc*numParameters];
+    int numParamEntries = 0;
 
     std::vector<double_array> parameterData(numParameters);
-    for (int iParam=0; iParam < numParameters; ++iParam)
+    for (int iParam=0; iParam < numParameters; ++iParam) {
       parameterData[iParam].resize(data.numParamValues[iParam]);
+      numParamEntries += data.numParamValues[iParam];
+    } // for
+
+    double* const parameterDataE = &data.parameterData[iLoc*numParamEntries];
     material->_dbToParameters(&parameterData, dbData);
 
     const double tolerance = 1.0e-06;