[cig-commits] r16430 - in short/3D/PyLith/trunk/unittests/libtests: feassemble/data materials materials/data
willic3 at geodynamics.org
willic3 at geodynamics.org
Tue Mar 16 18:05:33 PDT 2010
Author: willic3
Date: 2010-03-16 18:05:32 -0700 (Tue, 16 Mar 2010)
New Revision: 16430
Modified:
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/IntegratorElasticity.py
short/3D/PyLith/trunk/unittests/libtests/materials/TestElasticMaterial.cc
short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticIsotropic3D.py
short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticIsotropic3DData.cc
short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticPlaneStrain.py
short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticPlaneStrainData.cc
short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticPlaneStress.py
short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticPlaneStressData.cc
short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellIsotropic3DElastic.py
short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellIsotropic3DElasticData.cc
short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellIsotropic3DTimeDep.py
short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellIsotropic3DTimeDepData.cc
short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellIsotropic3DElastic.py
short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellIsotropic3DElasticData.cc
short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellIsotropic3DTimeDep.py
short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellIsotropic3DTimeDepData.cc
short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellPlaneStrainElastic.py
short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellPlaneStrainElasticData.cc
short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellPlaneStrainTimeDep.py
short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellPlaneStrainTimeDepData.cc
short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLaw3DElastic.py
short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLaw3DElasticData.cc
short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLaw3DTimeDep.py
short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLaw3DTimeDepData.cc
Log:
Fixed unit tests to deal with full (and possibly nonsymmetric) elasticity
matrix.
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/IntegratorElasticity.py
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/IntegratorElasticity.py 2010-03-17 01:03:36 UTC (rev 16429)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/IntegratorElasticity.py 2010-03-17 01:05:32 UTC (rev 16430)
@@ -189,12 +189,15 @@
C1111 = lambda2mu
C1122 = self.lameLambda
C1112 = 0.0
+ C2211 = self.lameLambda
C2222 = lambda2mu
C2212 = 0.0
+ C1211 = 0.0
+ C1222 = 0.0
C1212 = 2.0*self.lameMu
D = numpy.array([ [C1111, C1122, 0.5*C1112],
- [C1122, C2222, 0.5*C2212],
- [0.5*C1112, 0.5*C2212, 0.5*C1212] ],
+ [C2211, C2222, 0.5*C2212],
+ [0.5*C1211, 0.5*C1222, 0.5*C1212] ],
dtype=numpy.float64)
elif 3 == self.cellDim:
lambda2mu = self.lameLambda + 2.0*self.lameMu
@@ -204,27 +207,42 @@
C1112 = 0.0
C1123 = 0.0
C1113 = 0.0
+ C2211 = self.lameLambda
C2222 = lambda2mu
C2233 = self.lameLambda
C2212 = 0.0
C2223 = 0.0
C2213 = 0.0
+ C3311 = self.lameLambda
+ C3322 = self.lameLambda
C3333 = lambda2mu
C3312 = 0.0
C3323 = 0.0
C3313 = 0.0
+ C1211 = 0.0
+ C1222 = 0.0
+ C1233 = 0.0
C1212 = 2.0*self.lameMu
C1223 = 0.0
C1213 = 0.0
+ C2311 = 0.0
+ C2322 = 0.0
+ C2333 = 0.0
+ C2312 = 0.0
C2323 = 2.0*self.lameMu
C2313 = 0.0
+ C1311 = 0.0
+ C1322 = 0.0
+ C1333 = 0.0
+ C1312 = 0.0
+ C1323 = 0.0
C1313 = 2.0*self.lameMu
D = numpy.array([ [C1111, C1122, C1133, 0.5*C1112, 0.5*C1123, 0.5*C1113],
- [C1122, C2222, C2233, 0.5*C2212, 0.5*C2223, 0.5*C2213],
- [C1133, C2233, C3333, 0.5*C3312, 0.5*C3323, 0.5*C3313],
- [0.5*C1112, 0.5*C2212, 0.5*C3312, 0.5*C1212, 0.5*C1223, 0.5*C1213],
- [0.5*C1123, 0.5*C2223, 0.5*C3323, 0.5*C1223, 0.5*C2323, 0.5*C2313],
- [0.5*C1113, 0.5*C2213, 0.5*C3313, 0.5*C1213, 0.5*C2313, 0.5*C1313] ],
+ [C2211, C2222, C2233, 0.5*C2212, 0.5*C2223, 0.5*C2213],
+ [C3311, C3322, C3333, 0.5*C3312, 0.5*C3323, 0.5*C3313],
+ [0.5*C1211, 0.5*C1222, 0.5*C1233, 0.5*C1212, 0.5*C1223, 0.5*C1213],
+ [0.5*C2311, 0.5*C2322, 0.5*C2333, 0.5*C2312, 0.5*C2323, 0.5*C2313],
+ [0.5*C1311, 0.5*C1322, 0.5*C1333, 0.5*C1312, 0.5*C1323, 0.5*C1313] ],
dtype=numpy.float64)
return D
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/TestElasticMaterial.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/TestElasticMaterial.cc 2010-03-17 01:03:36 UTC (rev 16429)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/TestElasticMaterial.cc 2010-03-17 01:05:32 UTC (rev 16430)
@@ -332,10 +332,10 @@
numElasticConsts = 1;
break;
case 2 :
- numElasticConsts = 6;
+ numElasticConsts = 9;
break;
case 3 :
- numElasticConsts = 21;
+ numElasticConsts = 36;
break;
default :
assert(0);
@@ -515,11 +515,11 @@
tensorSize = 1;
break;
case 2 :
- numConsts = 6;
+ numConsts = 9;
tensorSize = 3;
break;
case 3 :
- numConsts = 21;
+ numConsts = 36;
tensorSize = 6;
break;
} // switch
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticIsotropic3D.py
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticIsotropic3D.py 2010-03-17 01:03:36 UTC (rev 16429)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticIsotropic3D.py 2010-03-17 01:05:32 UTC (rev 16430)
@@ -21,7 +21,7 @@
# ----------------------------------------------------------------------
dimension = 3
-numElasticConsts = 21
+numElasticConsts = 36
tensorSize = 6
# ElasticIsotropic3D class
@@ -127,37 +127,53 @@
C1112 = 0.0
C1123 = 0.0
C1113 = 0.0
+ C2211 = lambdaV
C2222 = lambdaV + 2.0*muV
C2233 = lambdaV
C2212 = 0.0
C2223 = 0.0
C2213 = 0.0
+ C3311 = lambdaV
+ C3322 = lambdaV
C3333 = lambdaV + 2.0*muV
C3312 = 0.0
C3323 = 0.0
C3313 = 0.0
+ C1211 = 0.0
+ C1222 = 0.0
+ C1233 = 0.0
C1212 = 2.0*muV
C1223 = 0.0
C1213 = 0.0
+ C2311 = 0.0
+ C2322 = 0.0
+ C2333 = 0.0
+ C2312 = 0.0
C2323 = 2.0*muV
C2313 = 0.0
+ C1311 = 0.0
+ C1322 = 0.0
+ C1333 = 0.0
+ C1312 = 0.0
+ C1323 = 0.0
C1313 = 2.0*muV
elasticConsts = numpy.array([C1111, C1122, C1133, C1112, C1123, C1113,
- C2222, C2233, C2212, C2223, C2213,
- C3333, C3312, C3323, C3313,
- C1212, C1223, C1213,
- C2323, C2313,
- C1313], dtype=numpy.float64)
+ C2211, C2222, C2233, C2212, C2223, C2213,
+ C3311, C3322, C3333, C3312, C3323, C3313,
+ C1211, C1222, C1233, C1212, C1223, C1213,
+ C2311, C2322, C2333, C2312, C2323, C2313,
+ C1311, C1322, C1333, C1312, C1323, C1313],
+ dtype=numpy.float64)
strain = numpy.reshape(strainV, (tensorSize,1))
initialStress = numpy.reshape(initialStressV, (tensorSize,1))
initialStrain = numpy.reshape(initialStrainV, (tensorSize,1))
elastic = numpy.array([ [C1111, C1122, C1133, C1112, C1123, C1113],
- [C1122, C2222, C2233, C2212, C2223, C2213],
- [C1133, C2233, C3333, C3312, C3323, C3313],
- [C1112, C2212, C3312, C1212, C1223, C1213],
- [C1123, C2223, C3323, C1223, C2323, C2313],
- [C1113, C2213, C3313, C1213, C2313, C1313] ],
+ [C2211, C2222, C2233, C2212, C2223, C2213],
+ [C3311, C3322, C3333, C3312, C3323, C3313],
+ [C1211, C1222, C1233, C1212, C1223, C1213],
+ [C2311, C2322, C2333, C2312, C2323, C2313],
+ [C1311, C1322, C1333, C1312, C1323, C1313] ],
dtype=numpy.float64)
stress = numpy.dot(elastic,strain-initialStrain) + initialStress
return (elasticConsts, numpy.ravel(stress))
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticIsotropic3DData.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticIsotropic3DData.cc 2010-03-17 01:03:36 UTC (rev 16429)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticIsotropic3DData.cc 2010-03-17 01:05:32 UTC (rev 16430)
@@ -132,20 +132,35 @@
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
+ 2.25000000e+10,
6.75000000e+10,
2.25000000e+10,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
+ 2.25000000e+10,
+ 2.25000000e+10,
6.75000000e+10,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
4.50000000e+10,
0.00000000e+00,
0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
4.50000000e+10,
0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
4.50000000e+10,
8.64000000e+09,
2.88000000e+09,
@@ -153,20 +168,35 @@
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
+ 2.88000000e+09,
8.64000000e+09,
2.88000000e+09,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
+ 2.88000000e+09,
+ 2.88000000e+09,
8.64000000e+09,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
5.76000000e+09,
0.00000000e+00,
0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
5.76000000e+09,
0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
5.76000000e+09,
};
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticPlaneStrain.py
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticPlaneStrain.py 2010-03-17 01:03:36 UTC (rev 16429)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticPlaneStrain.py 2010-03-17 01:05:32 UTC (rev 16430)
@@ -21,7 +21,7 @@
# ----------------------------------------------------------------------
dimension = 2
-numElasticConsts = 6
+numElasticConsts = 9
tensorSize = 3
# ElasticPlaneStrain class
@@ -123,17 +123,20 @@
C1111 = lambdaV + 2.0*muV
C1122 = lambdaV
C1112 = 0.0
+ C2211 = lambdaV
C2222 = lambdaV + 2.0*muV
C2212 = 0.0
+ C1211 = 0.0
+ C1222 = 0.0
C1212 = 2.0*muV
elasticConsts = numpy.array([C1111, C1122, C1112,
- C2222, C2212,
- C1212], dtype=numpy.float64)
+ C2211, C2222, C2212,
+ C1211, C1222, C1212], dtype=numpy.float64)
strain = numpy.reshape(strainV, (tensorSize,1))
elastic = numpy.array([ [C1111, C1122, C1112],
- [C1122, C2222, C2212],
- [C1112, C2212, C1212] ],
+ [C2211, C2222, C2212],
+ [C1211, C2212, C1212] ],
dtype=numpy.float64)
initialStress = numpy.reshape(initialStressV, (tensorSize,1))
initialStrain = numpy.reshape(initialStrainV, (tensorSize,1))
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticPlaneStrainData.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticPlaneStrainData.cc 2010-03-17 01:03:36 UTC (rev 16429)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticPlaneStrainData.cc 2010-03-17 01:05:32 UTC (rev 16430)
@@ -117,14 +117,20 @@
6.75000000e+10,
2.25000000e+10,
0.00000000e+00,
+ 2.25000000e+10,
6.75000000e+10,
0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
4.50000000e+10,
8.64000000e+09,
2.88000000e+09,
0.00000000e+00,
+ 2.88000000e+09,
8.64000000e+09,
0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
5.76000000e+09,
};
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticPlaneStress.py
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticPlaneStress.py 2010-03-17 01:03:36 UTC (rev 16429)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticPlaneStress.py 2010-03-17 01:05:32 UTC (rev 16430)
@@ -21,7 +21,7 @@
# ----------------------------------------------------------------------
dimension = 2
-numElasticConsts = 6
+numElasticConsts = 9
tensorSize = 3
# ElasticPlaneStrain class
@@ -123,19 +123,22 @@
C1111 = 4*muV * (lambdaV + muV) / (lambdaV + 2*muV)
C1122 = 2*muV*lambdaV / (lambdaV + 2*muV)
C1112 = 0.0
+ C2211 = 2*muV*lambdaV / (lambdaV + 2*muV)
C2222 = 4*muV * (lambdaV + muV) / (lambdaV + 2*muV)
C2212 = 0.0
+ C1211 = 0.0
+ C1222 = 0.0
C1212 = 2.0*muV
elasticConsts = numpy.array([C1111, C1122, C1112,
- C2222, C2212,
- C1212], dtype=numpy.float64)
+ C2211, C2222, C2212,
+ C1211, C1222, C1212], dtype=numpy.float64)
strain = numpy.reshape(strainV, (tensorSize,1))
initialStress = numpy.reshape(initialStressV, (tensorSize,1))
initialStrain = numpy.reshape(initialStrainV, (tensorSize,1))
elastic = numpy.array([ [C1111, C1122, C1112],
- [C1122, C2222, C2212],
- [C1112, C2212, C1212] ],
+ [C2211, C2222, C2212],
+ [C1211, C1222, C1212] ],
dtype=numpy.float64)
stress = numpy.dot(elastic,strain-initialStrain) + initialStress
return (elasticConsts, numpy.ravel(stress))
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticPlaneStressData.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticPlaneStressData.cc 2010-03-17 01:03:36 UTC (rev 16429)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticPlaneStressData.cc 2010-03-17 01:05:32 UTC (rev 16430)
@@ -117,14 +117,20 @@
6.00000000e+10,
1.50000000e+10,
0.00000000e+00,
+ 1.50000000e+10,
6.00000000e+10,
0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
4.50000000e+10,
7.68000000e+09,
1.92000000e+09,
0.00000000e+00,
+ 1.92000000e+09,
7.68000000e+09,
0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
5.76000000e+09,
};
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellIsotropic3DElastic.py
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellIsotropic3DElastic.py 2010-03-17 01:03:36 UTC (rev 16429)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellIsotropic3DElastic.py 2010-03-17 01:05:32 UTC (rev 16430)
@@ -21,7 +21,7 @@
# ----------------------------------------------------------------------
dimension = 3
-numElasticConsts = 21
+numElasticConsts = 36
tensorSize = 6
numMaxwellModels = 3
@@ -180,37 +180,53 @@
C1112 = 0.0
C1123 = 0.0
C1113 = 0.0
+ C2211 = lambdaV
C2222 = lambdaV + 2.0*muV
C2233 = lambdaV
C2212 = 0.0
C2223 = 0.0
C2213 = 0.0
+ C3311 = lambdaV
+ C3322 = lambdaV
C3333 = lambdaV + 2.0*muV
C3312 = 0.0
C3323 = 0.0
C3313 = 0.0
+ C1211 = 0.0
+ C1222 = 0.0
+ C1233 = 0.0
C1212 = 2.0*muV
C1223 = 0.0
C1213 = 0.0
+ C2311 = 0.0
+ C2322 = 0.0
+ C2333 = 0.0
+ C2312 = 0.0
C2323 = 2.0*muV
C2313 = 0.0
+ C1311 = 0.0
+ C1322 = 0.0
+ C1333 = 0.0
+ C1312 = 0.0
+ C1323 = 0.0
C1313 = 2.0*muV
elasticConsts = numpy.array([C1111, C1122, C1133, C1112, C1123, C1113,
- C2222, C2233, C2212, C2223, C2213,
- C3333, C3312, C3323, C3313,
- C1212, C1223, C1213,
- C2323, C2313,
- C1313], dtype=numpy.float64)
+ C2211, C2222, C2233, C2212, C2223, C2213,
+ C3311, C3322, C3333, C3312, C3323, C3313,
+ C1211, C1222, C1233, C1212, C1223, C1213,
+ C2311, C2322, C2333, C2312, C2323, C2313,
+ C1311, C1322, C1333, C1312, C1323, C1313],
+ dtype=numpy.float64)
strain = numpy.reshape(strainV, (6,1))
initialStress = numpy.reshape(initialStressV, (tensorSize,1))
initialStrain = numpy.reshape(initialStrainV, (tensorSize,1))
elastic = numpy.array([ [C1111, C1122, C1133, C1112, C1123, C1113],
- [C1122, C2222, C2233, C2212, C2223, C2213],
- [C1133, C2233, C3333, C3312, C3323, C3313],
- [C1112, C2212, C3312, C1212, C1223, C1213],
- [C1123, C2223, C3323, C1223, C2323, C2313],
- [C1113, C2213, C3313, C1213, C2313, C1313] ],
+ [C2211, C2222, C2233, C2212, C2223, C2213],
+ [C3311, C3322, C3333, C3312, C3323, C3313],
+ [C1211, C1222, C1233, C1212, C1223, C1213],
+ [C2311, C2322, C2333, C2312, C2323, C2313],
+ [C1311, C1322, C1333, C1312, C1323, C1313] ],
dtype=numpy.float64)
stress = numpy.dot(elastic, strain-initialStrain) + initialStress
return (elasticConsts, numpy.ravel(stress))
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellIsotropic3DElasticData.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellIsotropic3DElasticData.cc 2010-03-17 01:03:36 UTC (rev 16429)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellIsotropic3DElasticData.cc 2010-03-17 01:05:32 UTC (rev 16430)
@@ -357,20 +357,35 @@
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
+ 2.25000000e+10,
6.75000000e+10,
2.25000000e+10,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
+ 2.25000000e+10,
+ 2.25000000e+10,
6.75000000e+10,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
4.50000000e+10,
0.00000000e+00,
0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
4.50000000e+10,
0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
4.50000000e+10,
8.64000000e+09,
2.88000000e+09,
@@ -378,20 +393,35 @@
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
+ 2.88000000e+09,
8.64000000e+09,
2.88000000e+09,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
+ 2.88000000e+09,
+ 2.88000000e+09,
8.64000000e+09,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
5.76000000e+09,
0.00000000e+00,
0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
5.76000000e+09,
0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
5.76000000e+09,
};
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellIsotropic3DTimeDep.py
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellIsotropic3DTimeDep.py 2010-03-17 01:03:36 UTC (rev 16429)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellIsotropic3DTimeDep.py 2010-03-17 01:05:32 UTC (rev 16430)
@@ -21,7 +21,7 @@
# ----------------------------------------------------------------------
dimension = 3
-numElasticConsts = 21
+numElasticConsts = 36
tensorSize = 6
numMaxwellModels = 3
@@ -247,27 +247,42 @@
C1112 = 0.0
C1123 = 0.0
C1113 = 0.0
+ C2211 = C1122
C2222 = C1111
C2233 = C1122
C2212 = 0.0
C2223 = 0.0
C2213 = 0.0
+ C3311 = C1133
+ C3322 = C2233
C3333 = C1111
C3312 = 0.0
C3323 = 0.0
C3313 = 0.0
+ C1211 = 0.0
+ C1222 = 0.0
+ C1233 = 0.0
C1212 = 6.0*shearFac
C1223 = 0.0
C1213 = 0.0
+ C2311 = 0.0
+ C2322 = 0.0
+ C2333 = 0.0
+ C2312 = 0.0
C2323 = C1212
C2313 = 0.0
+ C1311 = 0.0
+ C1322 = 0.0
+ C1333 = 0.0
+ C1312 = 0.0
+ C1323 = 0.0
C1313 = C1212
elasticConsts = numpy.array([C1111, C1122, C1133, C1112, C1123, C1113,
- C2222, C2233, C2212, C2223, C2213,
- C3333, C3312, C3323, C3313,
- C1212, C1223, C1213,
- C2323, C2313,
- C1313], dtype=numpy.float64)
+ C2211, C2222, C2233, C2212, C2223, C2213,
+ C3311, C3322, C3333, C3312, C3323, C3313,
+ C1211, C1222, C1233, C1212, C1223, C1213,
+ C2311, C2322, C2333, C2312, C2323, C2313,
+ C1311, C1322, C1333, C1312, C1323, C1313], dtype=numpy.float64)
stressV = [0.0, 0.0, 0.0, 0.0, 0.0, 0.0]
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellIsotropic3DTimeDepData.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellIsotropic3DTimeDepData.cc 2010-03-17 01:03:36 UTC (rev 16429)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellIsotropic3DTimeDepData.cc 2010-03-17 01:05:32 UTC (rev 16430)
@@ -357,20 +357,35 @@
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
+ 2.25119361e+10,
6.74761278e+10,
2.25119361e+10,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
+ 2.25119361e+10,
+ 2.25119361e+10,
6.74761278e+10,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
4.49641917e+10,
0.00000000e+00,
0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
4.49641917e+10,
0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
4.49641917e+10,
8.63995090e+09,
2.88002455e+09,
@@ -378,20 +393,35 @@
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
+ 2.88002455e+09,
8.63995090e+09,
2.88002455e+09,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
+ 2.88002455e+09,
+ 2.88002455e+09,
8.63995090e+09,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
5.75992635e+09,
0.00000000e+00,
0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
5.75992635e+09,
0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
5.75992635e+09,
};
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellIsotropic3DElastic.py
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellIsotropic3DElastic.py 2010-03-17 01:03:36 UTC (rev 16429)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellIsotropic3DElastic.py 2010-03-17 01:05:32 UTC (rev 16430)
@@ -21,7 +21,7 @@
# ----------------------------------------------------------------------
dimension = 3
-numElasticConsts = 21
+numElasticConsts = 36
tensorSize = 6
# MaxwellIsotropic3DElastic class
@@ -153,37 +153,53 @@
C1112 = 0.0
C1123 = 0.0
C1113 = 0.0
+ C2211 = lambdaV
C2222 = lambdaV + 2.0*muV
C2233 = lambdaV
C2212 = 0.0
C2223 = 0.0
C2213 = 0.0
+ C3311 = lambdaV
+ C3322 = lambdaV
C3333 = lambdaV + 2.0*muV
C3312 = 0.0
C3323 = 0.0
C3313 = 0.0
+ C1211 = 0.0
+ C1222 = 0.0
+ C1233 = 0.0
C1212 = 2.0*muV
C1223 = 0.0
C1213 = 0.0
+ C2311 = 0.0
+ C2322 = 0.0
+ C2333 = 0.0
+ C2312 = 0.0
C2323 = 2.0*muV
C2313 = 0.0
+ C1311 = 0.0
+ C1322 = 0.0
+ C1333 = 0.0
+ C1312 = 0.0
+ C1323 = 0.0
C1313 = 2.0*muV
elasticConsts = numpy.array([C1111, C1122, C1133, C1112, C1123, C1113,
- C2222, C2233, C2212, C2223, C2213,
- C3333, C3312, C3323, C3313,
- C1212, C1223, C1213,
- C2323, C2313,
- C1313], dtype=numpy.float64)
+ C2211, C2222, C2233, C2212, C2223, C2213,
+ C3311, C3322, C3333, C3312, C3323, C3313,
+ C1211, C1222, C1233, C1212, C1223, C1213,
+ C2311, C2322, C2333, C2312, C2323, C2313,
+ C1311, C1322, C1333, C1312, C1323, C1313],
+ dtype=numpy.float64)
strain = numpy.reshape(strainV, (6,1))
initialStress = numpy.reshape(initialStressV, (tensorSize,1))
initialStrain = numpy.reshape(initialStrainV, (tensorSize,1))
elastic = numpy.array([ [C1111, C1122, C1133, C1112, C1123, C1113],
- [C1122, C2222, C2233, C2212, C2223, C2213],
- [C1133, C2233, C3333, C3312, C3323, C3313],
- [C1112, C2212, C3312, C1212, C1223, C1213],
- [C1123, C2223, C3323, C1223, C2323, C2313],
- [C1113, C2213, C3313, C1213, C2313, C1313] ],
+ [C2211, C2222, C2233, C2212, C2223, C2213],
+ [C3311, C3322, C3333, C3312, C3323, C3313],
+ [C1211, C1222, C1233, C1212, C1223, C1213],
+ [C2311, C2322, C2333, C2312, C2323, C2313],
+ [C1311, C1322, C1333, C1312, C1323, C1313] ],
dtype=numpy.float64)
stress = numpy.dot(elastic, strain-initialStrain) + initialStress
meanStrain = (strain[0] + strain[1] + strain[2])/3.0
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellIsotropic3DElasticData.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellIsotropic3DElasticData.cc 2010-03-17 01:03:36 UTC (rev 16429)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellIsotropic3DElasticData.cc 2010-03-17 01:05:32 UTC (rev 16430)
@@ -231,20 +231,35 @@
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
+ 2.25000000e+10,
6.75000000e+10,
2.25000000e+10,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
+ 2.25000000e+10,
+ 2.25000000e+10,
6.75000000e+10,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
4.50000000e+10,
0.00000000e+00,
0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
4.50000000e+10,
0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
4.50000000e+10,
8.64000000e+09,
2.88000000e+09,
@@ -252,20 +267,35 @@
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
+ 2.88000000e+09,
8.64000000e+09,
2.88000000e+09,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
+ 2.88000000e+09,
+ 2.88000000e+09,
8.64000000e+09,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
5.76000000e+09,
0.00000000e+00,
0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
5.76000000e+09,
0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
5.76000000e+09,
};
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellIsotropic3DTimeDep.py
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellIsotropic3DTimeDep.py 2010-03-17 01:03:36 UTC (rev 16429)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellIsotropic3DTimeDep.py 2010-03-17 01:05:32 UTC (rev 16430)
@@ -21,7 +21,7 @@
# ----------------------------------------------------------------------
dimension = 3
-numElasticConsts = 21
+numElasticConsts = 36
tensorSize = 6
# MaxwellIsotropic3DTimeDep class
@@ -312,7 +312,7 @@
elasticConstsList = []
for stressComp in range(tensorSize):
- for strainComp in range(stressComp, tensorSize):
+ for strainComp in range(tensorSize):
dStressDStrain = stressComp + strainComp
dStressDStrain = scipy.misc.derivative(self._calcStressComponent,
strainTpdt[strainComp],
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellIsotropic3DTimeDepData.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellIsotropic3DTimeDepData.cc 2010-03-17 01:03:36 UTC (rev 16429)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellIsotropic3DTimeDepData.cc 2010-03-17 01:05:32 UTC (rev 16430)
@@ -219,20 +219,35 @@
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
+ 2.25336999e+10,
6.74326010e+10,
2.25336999e+10,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
+ 2.25336999e+10,
+ 2.25336999e+10,
6.74326010e+10,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
4.48989011e+10,
0.00000000e+00,
0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
4.48989016e+10,
0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
4.48989016e+10,
8.63988977e+09,
2.88005546e+09,
@@ -240,20 +255,35 @@
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
+ 2.88005546e+09,
8.63988977e+09,
2.88005546e+09,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
+ 2.88005499e+09,
+ 2.88005499e+09,
8.63988930e+09,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
5.75983408e+09,
0.00000000e+00,
0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
5.75983408e+09,
0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
5.75983408e+09,
};
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellPlaneStrainElastic.py
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellPlaneStrainElastic.py 2010-03-17 01:03:36 UTC (rev 16429)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellPlaneStrainElastic.py 2010-03-17 01:05:32 UTC (rev 16430)
@@ -21,7 +21,7 @@
# ----------------------------------------------------------------------
dimension = 2
-numElasticConsts = 6
+numElasticConsts = 9
tensorSize = 3
# MaxwellPlaneStrainElastic class
@@ -148,19 +148,22 @@
C1111 = lambdaV + 2.0*muV
C1122 = lambdaV
C1112 = 0.0
+ C2211 = lambdaV
C2222 = lambdaV + 2.0*muV
C2212 = 0.0
+ C1211 = 0.0
+ C1222 = 0.0
C1212 = 2.0*muV
elasticConsts = numpy.array([C1111, C1122, C1112,
- C2222, C2212,
- C1212], dtype=numpy.float64)
+ C2211, C2222, C2212,
+ C1211, C1222, C1212], dtype=numpy.float64)
strain = numpy.reshape(strainV, (tensorSize,1))
initialStress = numpy.reshape(initialStressV, (tensorSize,1))
initialStrain = numpy.reshape(initialStrainV, (tensorSize,1))
elastic = numpy.array([ [C1111, C1122, C1112],
- [C1122, C2222, C2212],
- [C1112, C2212, C1212] ], dtype=numpy.float64)
+ [C2211, C2222, C2212],
+ [C1211, C1222, C1212] ], dtype=numpy.float64)
stress = numpy.dot(elastic, strain-initialStrain) + initialStress
meanStrain = (strain[0,0] + strain[1,0])/3.0
viscousStrain = numpy.array([strain[0,0] - meanStrain,
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellPlaneStrainElasticData.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellPlaneStrainElasticData.cc 2010-03-17 01:03:36 UTC (rev 16429)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellPlaneStrainElasticData.cc 2010-03-17 01:05:32 UTC (rev 16430)
@@ -181,14 +181,20 @@
6.75000000e+10,
2.25000000e+10,
0.00000000e+00,
+ 2.25000000e+10,
6.75000000e+10,
0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
4.50000000e+10,
8.64000000e+09,
2.88000000e+09,
0.00000000e+00,
+ 2.88000000e+09,
8.64000000e+09,
0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
5.76000000e+09,
};
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellPlaneStrainTimeDep.py
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellPlaneStrainTimeDep.py 2010-03-17 01:03:36 UTC (rev 16429)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellPlaneStrainTimeDep.py 2010-03-17 01:05:32 UTC (rev 16430)
@@ -21,7 +21,7 @@
# ----------------------------------------------------------------------
dimension = 2
-numElasticConsts = 6
+numElasticConsts = 9
tensorSize = 3
# MaxwellPlaneStrainTimeDep class
@@ -335,7 +335,7 @@
elasticConstsList = []
for stressComp in range(tensorSize):
- for strainComp in range(stressComp, tensorSize):
+ for strainComp in range(tensorSize):
dStressDStrain = stressComp + strainComp
dStressDStrain = scipy.misc.derivative(self._calcStressComponent,
strainTpdt[strainComp],
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellPlaneStrainTimeDepData.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellPlaneStrainTimeDepData.cc 2010-03-17 01:03:36 UTC (rev 16429)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellPlaneStrainTimeDepData.cc 2010-03-17 01:05:32 UTC (rev 16430)
@@ -181,14 +181,20 @@
6.74326010e+10,
2.25336989e+10,
0.00000000e+00,
+ 2.25336994e+10,
6.74326005e+10,
0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
4.48989011e+10,
8.63988977e+09,
2.88005546e+09,
0.00000000e+00,
+ 2.88005546e+09,
8.63988977e+09,
0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
5.75983408e+09,
};
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLaw3DElastic.py
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLaw3DElastic.py 2010-03-17 01:03:36 UTC (rev 16429)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLaw3DElastic.py 2010-03-17 01:05:32 UTC (rev 16430)
@@ -21,7 +21,7 @@
# ----------------------------------------------------------------------
dimension = 3
-numElasticConsts = 21
+numElasticConsts = 36
tensorSize = 6
# PowerLaw3DElastic class
@@ -235,37 +235,53 @@
C1112 = 0.0
C1123 = 0.0
C1113 = 0.0
+ C2211 = lambdaV
C2222 = lambdaV + 2.0*muV
C2233 = lambdaV
C2212 = 0.0
C2223 = 0.0
C2213 = 0.0
+ C3311 = lambdaV
+ C3322 = lambdaV
C3333 = lambdaV + 2.0*muV
C3312 = 0.0
C3323 = 0.0
C3313 = 0.0
+ C1211 = 0.0
+ C1222 = 0.0
+ C1233 = 0.0
C1212 = 2.0*muV
C1223 = 0.0
C1213 = 0.0
+ C2311 = 0.0
+ C2322 = 0.0
+ C2333 = 0.0
+ C2312 = 0.0
C2323 = 2.0*muV
C2313 = 0.0
+ C1311 = 0.0
+ C1322 = 0.0
+ C1333 = 0.0
+ C1312 = 0.0
+ C1323 = 0.0
C1313 = 2.0*muV
elasticConsts = numpy.array([C1111, C1122, C1133, C1112, C1123, C1113,
- C2222, C2233, C2212, C2223, C2213,
- C3333, C3312, C3323, C3313,
- C1212, C1223, C1213,
- C2323, C2313,
- C1313], dtype=numpy.float64)
+ C2211, C2222, C2233, C2212, C2223, C2213,
+ C3311, C3322, C3333, C3312, C3323, C3313,
+ C1211, C1222, C1233, C1212, C1223, C1213,
+ C2311, C2322, C2333, C2312, C2323, C2313,
+ C1311, C1322, C1333, C1312, C1323, C1313],
+ dtype=numpy.float64)
strain = numpy.reshape(strainV, (6,1))
initialStress = numpy.reshape(initialStressV, (tensorSize,1))
initialStrain = numpy.reshape(initialStrainV, (tensorSize,1))
elastic = numpy.array([ [C1111, C1122, C1133, C1112, C1123, C1113],
- [C1122, C2222, C2233, C2212, C2223, C2213],
- [C1133, C2233, C3333, C3312, C3323, C3313],
- [C1112, C2212, C3312, C1212, C1223, C1213],
- [C1123, C2223, C3323, C1223, C2323, C2313],
- [C1113, C2213, C3313, C1213, C2313, C1313] ],
+ [C2211, C2222, C2233, C2212, C2223, C2213],
+ [C3311, C3322, C3333, C3312, C3323, C3313],
+ [C1211, C1222, C1233, C1212, C1223, C1213],
+ [C2311, C2322, C2333, C2312, C2323, C2313],
+ [C1311, C1322, C1333, C1312, C1323, C1313] ],
dtype=numpy.float64)
stress = numpy.dot(elastic, strain-initialStrain) + initialStress
return (elasticConsts, numpy.ravel(stress))
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLaw3DElasticData.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLaw3DElasticData.cc 2010-03-17 01:03:36 UTC (rev 16429)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLaw3DElasticData.cc 2010-03-17 01:05:32 UTC (rev 16430)
@@ -247,20 +247,35 @@
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
+ 2.25000000e+10,
6.75000000e+10,
2.25000000e+10,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
+ 2.25000000e+10,
+ 2.25000000e+10,
6.75000000e+10,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
4.50000000e+10,
0.00000000e+00,
0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
4.50000000e+10,
0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
4.50000000e+10,
8.64000000e+09,
2.88000000e+09,
@@ -268,20 +283,35 @@
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
+ 2.88000000e+09,
8.64000000e+09,
2.88000000e+09,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
+ 2.88000000e+09,
+ 2.88000000e+09,
8.64000000e+09,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
5.76000000e+09,
0.00000000e+00,
0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
5.76000000e+09,
0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
5.76000000e+09,
};
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLaw3DTimeDep.py
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLaw3DTimeDep.py 2010-03-17 01:03:36 UTC (rev 16429)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLaw3DTimeDep.py 2010-03-17 01:05:32 UTC (rev 16430)
@@ -21,7 +21,7 @@
# ----------------------------------------------------------------------
dimension = 3
-numElasticConsts = 21
+numElasticConsts = 36
tensorSize = 6
# PowerLaw3DTimeDep class
@@ -462,7 +462,7 @@
elasticConstsList = []
for stressComp in range(tensorSize):
- for strainComp in range(stressComp, tensorSize):
+ for strainComp in range(tensorSize):
dStressDStrain = scipy.misc.derivative(self._calcStressComponent,
strainTpdt[strainComp],
dx=derivDx,
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLaw3DTimeDepData.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLaw3DTimeDepData.cc 2010-03-17 01:03:36 UTC (rev 16429)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLaw3DTimeDepData.cc 2010-03-17 01:05:32 UTC (rev 16430)
@@ -235,20 +235,35 @@
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
+ 2.25336747e+10,
6.74326518e+10,
2.25336747e+10,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
+ 2.25336743e+10,
+ 2.25336743e+10,
6.74326518e+10,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
4.48989770e+10,
0.00000000e+00,
0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
4.48989770e+10,
0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
4.48989770e+10,
8.64000013e+09,
2.88000004e+09,
@@ -256,20 +271,35 @@
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
+ 2.88000004e+09,
8.64000013e+09,
2.88000004e+09,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
+ 2.88000051e+09,
+ 2.88000051e+09,
8.64000013e+09,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
5.76000009e+09,
0.00000000e+00,
0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
5.75999985e+09,
0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
5.75999985e+09,
};
More information about the CIG-COMMITS
mailing list