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

[willic3 at geodynamics.org]

Author: willic3
Date: 2012-05-15 15:49:08 -0700 (Tue, 15 May 2012)
New Revision: 20141

Modified:
   short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/data/PowerLawPlaneStrainTimeDep.py
   short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/data/PowerLawPlaneStrainTimeDepData.cc
Log:
Made a couple more changes to PowerLawPlaneStrain unit tests.
They all pass now.



Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/data/PowerLawPlaneStrainTimeDep.py
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/data/PowerLawPlaneStrainTimeDep.py	2012-05-15 22:48:32 UTC (rev 20140)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/data/PowerLawPlaneStrainTimeDep.py	2012-05-15 22:49:08 UTC (rev 20141)
@@ -170,10 +170,8 @@
                              dtype=numpy.float64)
     visStrainB = numpy.array([1.1e-5, 1.2e-5, 1.3e-5, 1.4e-5],
                              dtype=numpy.float64)
-    stress4A = numpy.array([3.1e4, 3.2e4, stressZZInitialA, 3.4e4],
-                           dtype=numpy.float64)
-    stress4B = numpy.array([5.1e4, 5.2e4, stressZZInitialB, 5.4e4],
-                           dtype=numpy.float64)
+    stress4A = numpy.array([3.1e4, 3.2e4, 3.3e4, 3.4e4], dtype=numpy.float64)
+    stress4B = numpy.array([5.1e4, 5.2e4, 5.3e4, 5.4e4], dtype=numpy.float64)
     stressNondimA = stress4A/mu0
     stressNondimB = stress4B/mu0
     stressZZInitialANondim = stressZZInitialA/mu0
@@ -377,8 +375,8 @@
     initialStress4 = numpy.array([initialStress[0], initialStress[1],
                                   stateVars[0], initialStress[2]],
                                  dtype=numpy.float64)
-    meanStressInitial = (initialStress[0] + initialStress[1] +
-                         stateVars[0])/3.0
+    meanStressInitial = (initialStress4[0] + initialStress4[1] +
+                         initialStress4[3])/3.0
     devStressInitial = initialStress4 - meanStressInitial * diag
     stressInvar2Initial = 0.5 * self._scalarProduct(devStressInitial,
                                                     devStressInitial)

Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/data/PowerLawPlaneStrainTimeDepData.cc
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/data/PowerLawPlaneStrainTimeDepData.cc	2012-05-15 22:48:32 UTC (rev 20140)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/data/PowerLawPlaneStrainTimeDepData.cc	2012-05-15 22:49:08 UTC (rev 20141)
@@ -130,7 +130,7 @@
   4.40000000e-05,
   3.10000000e+04,
   3.20000000e+04,
-  2.30000000e+04,
+  3.30000000e+04,
   3.40000000e+04,
   5.30000000e+04,
   1.10000000e-05,
@@ -166,7 +166,7 @@
   4.40000000e-05,
   1.37777778e-06,
   1.42222222e-06,
-  1.02222222e-06,
+  1.46666667e-06,
   1.51111111e-06,
   2.35555556e-06,
   1.10000000e-05,
@@ -194,8 +194,8 @@
 };
 
 const PylithScalar pylith::materials::PowerLawPlaneStrainTimeDepData::_stress[] = {
-  5.08551746e+06,
-  5.53550274e+06,
+  5.08552569e+06,
+  5.53551098e+06,
   2.85250536e+06,
   4.03404000e+06,
   4.08112000e+06,
@@ -212,11 +212,11 @@
   0.00000000e+00,
   0.00000000e+00,
   4.48989770e+10,
-  8.63999990e+09,
+  8.64000013e+09,
   2.88000004e+09,
   0.00000000e+00,
   2.88000004e+09,
-  8.64000013e+09,
+  8.63999990e+09,
   0.00000000e+00,
   0.00000000e+00,
   0.00000000e+00,
@@ -243,13 +243,13 @@
 
 const PylithScalar pylith::materials::PowerLawPlaneStrainTimeDepData::_stateVarsUpdated[] = {
   2.30000000e+04,
-  4.09551675e-05,
-  4.19777168e-05,
-  4.27842521e-05,
+  4.09549846e-05,
+  4.19775339e-05,
+  4.27845681e-05,
   4.41443253e-05,
-  5.08551746e+06,
-  5.53550274e+06,
-  1.67520866e+06,
+  5.08552569e+06,
+  5.53551098e+06,
+  1.67519444e+06,
   2.85250536e+06,
   5.30000000e+04,
   1.10000000e-05,