[cig-commits] r20121 - short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/data

[willic3 at geodynamics.org]

Author: willic3
Date: 2012-05-15 11:34:16 -0700 (Tue, 15 May 2012)
New Revision: 20121

Modified:
   short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/data/PowerLawPlaneStrainElastic.py
   short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/data/PowerLawPlaneStrainElasticData.cc
Log:
Fixed some unit test failures.  There are still 2 to be fixed.



Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/data/PowerLawPlaneStrainElastic.py
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/data/PowerLawPlaneStrainElastic.py	2012-05-15 16:03:04 UTC (rev 20120)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/data/PowerLawPlaneStrainElastic.py	2012-05-15 18:34:16 UTC (rev 20121)
@@ -135,8 +135,7 @@
     self.dbStateVars[0,0] = stressZZInitialA
     self.dbStateVars[1,0] = stressZZInitialB
 
-    self.stateVars = numpy.zeros( (numLocs, 1 + 4 + 4),
-                                  dtype=numpy.float64)
+    self.stateVars = numpy.zeros( (numLocs, 1 + 4 + 4), dtype=numpy.float64)
     self.stateVars[0,0] = stressZZInitialA
     self.stateVars[1,0] = stressZZInitialB
 
@@ -156,8 +155,8 @@
     stressZZInitialANondim = stressZZInitialA/mu0
     stressZZInitialBNondim = stressZZInitialB/mu0
     
-    self.stateVarsNondim = self.stateVars # no scaling
-
+    self.stateVarsNondim = numpy.zeros( (numLocs, 1 + 4 + 4),
+                                        dtype=numpy.float64)
     self.stateVarsNondim[0, 0] = stressZZInitialANondim
     self.stateVarsNondim[1, 0] = stressZZInitialBNondim
 

Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/data/PowerLawPlaneStrainElasticData.cc
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/data/PowerLawPlaneStrainElasticData.cc	2012-05-15 16:03:04 UTC (rev 20120)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/data/PowerLawPlaneStrainElasticData.cc	2012-05-15 18:34:16 UTC (rev 20121)
@@ -135,7 +135,7 @@
 };
 
 const PylithScalar pylith::materials::PowerLawPlaneStrainElasticData::_stateVars[] = {
-  4.77955556e-07,
+  1.07540000e+04,
   0.00000000e+00,
   0.00000000e+00,
   0.00000000e+00,
@@ -144,7 +144,7 @@
   0.00000000e+00,
   0.00000000e+00,
   0.00000000e+00,
-  1.14444444e-06,
+  2.57500000e+04,
   0.00000000e+00,
   0.00000000e+00,
   0.00000000e+00,