[cig-commits] r15891 - short/3D/PyLith/branches/pylith-friction/unittests/libtests/feassemble/data
brad at geodynamics.org
brad at geodynamics.org
Wed Oct 28 16:06:22 PDT 2009
Author: brad
Date: 2009-10-28 16:06:21 -0700 (Wed, 28 Oct 2009)
New Revision: 15891
Modified:
short/3D/PyLith/branches/pylith-friction/unittests/libtests/feassemble/data/ElasticityExplicitData1DLinear.cc
short/3D/PyLith/branches/pylith-friction/unittests/libtests/feassemble/data/ElasticityExplicitData2DLinear.cc
short/3D/PyLith/branches/pylith-friction/unittests/libtests/feassemble/data/ElasticityExplicitData2DQuadratic.cc
short/3D/PyLith/branches/pylith-friction/unittests/libtests/feassemble/data/ElasticityExplicitData3DLinear.cc
short/3D/PyLith/branches/pylith-friction/unittests/libtests/feassemble/data/Quadrature2DLinear.py
short/3D/PyLith/branches/pylith-friction/unittests/libtests/feassemble/data/Quadrature3DLinear.py
Log:
Fixed some small errors in quadrature and shape functions (affects actual numbers but not validity of tests).
Modified: short/3D/PyLith/branches/pylith-friction/unittests/libtests/feassemble/data/ElasticityExplicitData1DLinear.cc
===================================================================
--- short/3D/PyLith/branches/pylith-friction/unittests/libtests/feassemble/data/ElasticityExplicitData1DLinear.cc 2009-10-28 22:27:36 UTC (rev 15890)
+++ short/3D/PyLith/branches/pylith-friction/unittests/libtests/feassemble/data/ElasticityExplicitData1DLinear.cc 2009-10-28 23:06:21 UTC (rev 15891)
@@ -89,7 +89,7 @@
};
const double pylith::feassemble::ElasticityExplicitData1DLinear::_valsResidual[] = {
- 1.60042188e+10,
+ 1.60042187e+10,
-1.59957812e+10,
};
Modified: short/3D/PyLith/branches/pylith-friction/unittests/libtests/feassemble/data/ElasticityExplicitData2DLinear.cc
===================================================================
--- short/3D/PyLith/branches/pylith-friction/unittests/libtests/feassemble/data/ElasticityExplicitData2DLinear.cc 2009-10-28 22:27:36 UTC (rev 15890)
+++ short/3D/PyLith/branches/pylith-friction/unittests/libtests/feassemble/data/ElasticityExplicitData2DLinear.cc 2009-10-28 23:06:21 UTC (rev 15891)
@@ -58,7 +58,7 @@
};
const double pylith::feassemble::ElasticityExplicitData2DLinear::_quadPts[] = {
- 3.33333333e-01, 3.33333333e-01,
+ -3.33333333e-01, -3.33333333e-01,
};
const double pylith::feassemble::ElasticityExplicitData2DLinear::_quadWts[] = {
@@ -66,8 +66,8 @@
};
const double pylith::feassemble::ElasticityExplicitData2DLinear::_basis[] = {
- -3.33333333e-01, 6.66666667e-01,
- 6.66666667e-01,};
+ 3.33333333e-01, 3.33333333e-01,
+ 3.33333333e-01,};
const double pylith::feassemble::ElasticityExplicitData2DLinear::_basisDerivRef[] = {
-5.00000000e-01, -5.00000000e-01,
@@ -94,30 +94,30 @@
};
const double pylith::feassemble::ElasticityExplicitData2DLinear::_valsResidual[] = {
- -1.66791140e+10, 3.09147184e+10,
- -2.30469823e+09, -2.72112551e+10,
- 1.89835830e+10, -3.70266130e+09,
+ -1.66787702e+10, 3.09146039e+10,
+ -2.30412532e+09, -2.72121717e+10,
+ 1.89841559e+10, -3.70357797e+09,
};
const double pylith::feassemble::ElasticityExplicitData2DLinear::_valsJacobian[] = {
3.81944444e+05, 0.00000000e+00,
- -7.63888889e+05, 0.00000000e+00,
- -7.63888889e+05, 0.00000000e+00,
+ 3.81944444e+05, 0.00000000e+00,
+ 3.81944444e+05, 0.00000000e+00,
0.00000000e+00, 3.81944444e+05,
- 0.00000000e+00, -7.63888889e+05,
- 0.00000000e+00, -7.63888889e+05,
- -7.63888889e+05, 0.00000000e+00,
- 1.52777778e+06, 0.00000000e+00,
- 1.52777778e+06, 0.00000000e+00,
- 0.00000000e+00, -7.63888889e+05,
- 0.00000000e+00, 1.52777778e+06,
- 0.00000000e+00, 1.52777778e+06,
- -7.63888889e+05, 0.00000000e+00,
- 1.52777778e+06, 0.00000000e+00,
- 1.52777778e+06, 0.00000000e+00,
- 0.00000000e+00, -7.63888889e+05,
- 0.00000000e+00, 1.52777778e+06,
- 0.00000000e+00, 1.52777778e+06,
+ 0.00000000e+00, 3.81944444e+05,
+ 0.00000000e+00, 3.81944444e+05,
+ 3.81944444e+05, 0.00000000e+00,
+ 3.81944444e+05, 0.00000000e+00,
+ 3.81944444e+05, 0.00000000e+00,
+ 0.00000000e+00, 3.81944444e+05,
+ 0.00000000e+00, 3.81944444e+05,
+ 0.00000000e+00, 3.81944444e+05,
+ 3.81944444e+05, 0.00000000e+00,
+ 3.81944444e+05, 0.00000000e+00,
+ 3.81944444e+05, 0.00000000e+00,
+ 0.00000000e+00, 3.81944444e+05,
+ 0.00000000e+00, 3.81944444e+05,
+ 0.00000000e+00, 3.81944444e+05,
};
pylith::feassemble::ElasticityExplicitData2DLinear::ElasticityExplicitData2DLinear(void)
Modified: short/3D/PyLith/branches/pylith-friction/unittests/libtests/feassemble/data/ElasticityExplicitData2DQuadratic.cc
===================================================================
--- short/3D/PyLith/branches/pylith-friction/unittests/libtests/feassemble/data/ElasticityExplicitData2DQuadratic.cc 2009-10-28 22:27:36 UTC (rev 15890)
+++ short/3D/PyLith/branches/pylith-friction/unittests/libtests/feassemble/data/ElasticityExplicitData2DQuadratic.cc 2009-10-28 23:06:21 UTC (rev 15891)
@@ -143,13 +143,13 @@
};
const double pylith::feassemble::ElasticityExplicitData2DQuadratic::_valsJacobian[] = {
- 2.37304687e+06, 0.00000000e+00,
+ 2.37304688e+06, 0.00000000e+00,
-3.95507812e+05, 0.00000000e+00,
-3.95507812e+05, 0.00000000e+00,
-3.51562500e+05, 0.00000000e+00,
7.91015625e+05, 0.00000000e+00,
7.91015625e+05, 0.00000000e+00,
- 0.00000000e+00, 2.37304687e+06,
+ 0.00000000e+00, 2.37304688e+06,
0.00000000e+00, -3.95507812e+05,
0.00000000e+00, -3.95507812e+05,
0.00000000e+00, -3.51562500e+05,
@@ -157,24 +157,24 @@
0.00000000e+00, 7.91015625e+05,
-3.95507812e+05, 0.00000000e+00,
2.63671875e+05, 0.00000000e+00,
- 1.31835937e+05, 0.00000000e+00,
+ 1.31835938e+05, 0.00000000e+00,
-4.39453125e+05, 0.00000000e+00,
-1.58203125e+06, 0.00000000e+00,
-7.91015625e+05, 0.00000000e+00,
0.00000000e+00, -3.95507812e+05,
0.00000000e+00, 2.63671875e+05,
- 0.00000000e+00, 1.31835937e+05,
+ 0.00000000e+00, 1.31835938e+05,
0.00000000e+00, -4.39453125e+05,
0.00000000e+00, -1.58203125e+06,
0.00000000e+00, -7.91015625e+05,
-3.95507812e+05, 0.00000000e+00,
- 1.31835937e+05, 0.00000000e+00,
+ 1.31835938e+05, 0.00000000e+00,
2.63671875e+05, 0.00000000e+00,
-4.39453125e+05, 0.00000000e+00,
-7.91015625e+05, 0.00000000e+00,
-1.58203125e+06, 0.00000000e+00,
0.00000000e+00, -3.95507812e+05,
- 0.00000000e+00, 1.31835937e+05,
+ 0.00000000e+00, 1.31835938e+05,
0.00000000e+00, 2.63671875e+05,
0.00000000e+00, -4.39453125e+05,
0.00000000e+00, -7.91015625e+05,
Modified: short/3D/PyLith/branches/pylith-friction/unittests/libtests/feassemble/data/ElasticityExplicitData3DLinear.cc
===================================================================
--- short/3D/PyLith/branches/pylith-friction/unittests/libtests/feassemble/data/ElasticityExplicitData3DLinear.cc 2009-10-28 22:27:36 UTC (rev 15890)
+++ short/3D/PyLith/branches/pylith-friction/unittests/libtests/feassemble/data/ElasticityExplicitData3DLinear.cc 2009-10-28 23:06:21 UTC (rev 15891)
@@ -68,7 +68,7 @@
};
const double pylith::feassemble::ElasticityExplicitData3DLinear::_basis[] = {
- -2.50000000e-01, 2.50000000e-01, 2.50000000e-01,
+ 2.50000000e-01, 2.50000000e-01, 2.50000000e-01,
2.50000000e-01,};
const double pylith::feassemble::ElasticityExplicitData3DLinear::_basisDerivRef[] = {
@@ -100,61 +100,61 @@
};
const double pylith::feassemble::ElasticityExplicitData3DLinear::_valsResidual[] = {
- -6.07565959e+09, 3.62534033e+10, 3.19640209e+09,
- -4.01015205e+09, 6.66855682e+10, 2.19200477e+10,
- 6.67262366e+09, -1.05592747e+11, -3.14993761e+10,
- 3.41184299e+09, 2.65427945e+09, 6.38343063e+09,
+ -6.07582772e+09, 3.62539077e+10, 3.19640209e+09,
+ -4.00897518e+09, 6.66855682e+10, 2.19195434e+10,
+ 6.67380053e+09, -1.05592747e+11, -3.14998804e+10,
+ 3.41301986e+09, 2.65427945e+09, 6.38292625e+09,
};
const double pylith::feassemble::ElasticityExplicitData3DLinear::_valsJacobian[] = {
8.40625000e+05, 0.00000000e+00, 0.00000000e+00,
- -8.40625000e+05, 0.00000000e+00, 0.00000000e+00,
- -8.40625000e+05, 0.00000000e+00, 0.00000000e+00,
- -8.40625000e+05, 0.00000000e+00, 0.00000000e+00,
+ 8.40625000e+05, 0.00000000e+00, 0.00000000e+00,
+ 8.40625000e+05, 0.00000000e+00, 0.00000000e+00,
+ 8.40625000e+05, 0.00000000e+00, 0.00000000e+00,
0.00000000e+00, 8.40625000e+05, 0.00000000e+00,
- 0.00000000e+00, -8.40625000e+05, 0.00000000e+00,
- 0.00000000e+00, -8.40625000e+05, 0.00000000e+00,
- 0.00000000e+00, -8.40625000e+05, 0.00000000e+00,
+ 0.00000000e+00, 8.40625000e+05, 0.00000000e+00,
+ 0.00000000e+00, 8.40625000e+05, 0.00000000e+00,
+ 0.00000000e+00, 8.40625000e+05, 0.00000000e+00,
0.00000000e+00, 0.00000000e+00, 8.40625000e+05,
- 0.00000000e+00, 0.00000000e+00, -8.40625000e+05,
- 0.00000000e+00, 0.00000000e+00, -8.40625000e+05,
- 0.00000000e+00, 0.00000000e+00, -8.40625000e+05,
- -8.40625000e+05, 0.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00, 8.40625000e+05,
+ 0.00000000e+00, 0.00000000e+00, 8.40625000e+05,
+ 0.00000000e+00, 0.00000000e+00, 8.40625000e+05,
8.40625000e+05, 0.00000000e+00, 0.00000000e+00,
8.40625000e+05, 0.00000000e+00, 0.00000000e+00,
8.40625000e+05, 0.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, -8.40625000e+05, 0.00000000e+00,
+ 8.40625000e+05, 0.00000000e+00, 0.00000000e+00,
0.00000000e+00, 8.40625000e+05, 0.00000000e+00,
0.00000000e+00, 8.40625000e+05, 0.00000000e+00,
0.00000000e+00, 8.40625000e+05, 0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00, -8.40625000e+05,
+ 0.00000000e+00, 8.40625000e+05, 0.00000000e+00,
0.00000000e+00, 0.00000000e+00, 8.40625000e+05,
0.00000000e+00, 0.00000000e+00, 8.40625000e+05,
0.00000000e+00, 0.00000000e+00, 8.40625000e+05,
- -8.40625000e+05, 0.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00, 8.40625000e+05,
8.40625000e+05, 0.00000000e+00, 0.00000000e+00,
8.40625000e+05, 0.00000000e+00, 0.00000000e+00,
8.40625000e+05, 0.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, -8.40625000e+05, 0.00000000e+00,
+ 8.40625000e+05, 0.00000000e+00, 0.00000000e+00,
0.00000000e+00, 8.40625000e+05, 0.00000000e+00,
0.00000000e+00, 8.40625000e+05, 0.00000000e+00,
0.00000000e+00, 8.40625000e+05, 0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00, -8.40625000e+05,
+ 0.00000000e+00, 8.40625000e+05, 0.00000000e+00,
0.00000000e+00, 0.00000000e+00, 8.40625000e+05,
0.00000000e+00, 0.00000000e+00, 8.40625000e+05,
0.00000000e+00, 0.00000000e+00, 8.40625000e+05,
- -8.40625000e+05, 0.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00, 8.40625000e+05,
8.40625000e+05, 0.00000000e+00, 0.00000000e+00,
8.40625000e+05, 0.00000000e+00, 0.00000000e+00,
8.40625000e+05, 0.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, -8.40625000e+05, 0.00000000e+00,
+ 8.40625000e+05, 0.00000000e+00, 0.00000000e+00,
0.00000000e+00, 8.40625000e+05, 0.00000000e+00,
0.00000000e+00, 8.40625000e+05, 0.00000000e+00,
0.00000000e+00, 8.40625000e+05, 0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00, -8.40625000e+05,
+ 0.00000000e+00, 8.40625000e+05, 0.00000000e+00,
0.00000000e+00, 0.00000000e+00, 8.40625000e+05,
0.00000000e+00, 0.00000000e+00, 8.40625000e+05,
0.00000000e+00, 0.00000000e+00, 8.40625000e+05,
+ 0.00000000e+00, 0.00000000e+00, 8.40625000e+05,
};
pylith::feassemble::ElasticityExplicitData3DLinear::ElasticityExplicitData3DLinear(void)
Modified: short/3D/PyLith/branches/pylith-friction/unittests/libtests/feassemble/data/Quadrature2DLinear.py
===================================================================
--- short/3D/PyLith/branches/pylith-friction/unittests/libtests/feassemble/data/Quadrature2DLinear.py 2009-10-28 22:27:36 UTC (rev 15890)
+++ short/3D/PyLith/branches/pylith-friction/unittests/libtests/feassemble/data/Quadrature2DLinear.py 2009-10-28 23:06:21 UTC (rev 15891)
@@ -65,7 +65,8 @@
"""
Component.__init__(self, name, facility="quadrature")
- self.quadPtsRef = numpy.array( [[1.0/3.0, 1.0/3.0]], dtype=numpy.float64)
+ self.quadPtsRef = numpy.array( [[-1.0/3.0, -1.0/3.0]], dtype=numpy.float64)
+ #self.quadPtsRef = numpy.array( [[1.0/3.0, 1.0/3.0]], dtype=numpy.float64)
self.quadWts = numpy.array([0.5], dtype=numpy.float64)
self.numBasis = 3
self.numQuadPts = 1
Modified: short/3D/PyLith/branches/pylith-friction/unittests/libtests/feassemble/data/Quadrature3DLinear.py
===================================================================
--- short/3D/PyLith/branches/pylith-friction/unittests/libtests/feassemble/data/Quadrature3DLinear.py 2009-10-28 22:27:36 UTC (rev 15890)
+++ short/3D/PyLith/branches/pylith-friction/unittests/libtests/feassemble/data/Quadrature3DLinear.py 2009-10-28 23:06:21 UTC (rev 15891)
@@ -22,7 +22,7 @@
# ----------------------------------------------------------------------
def N0(p):
- return 0.5*(1.0 + p[0] + p[1] + p[2])
+ return -0.5*(1.0 + p[0] + p[1] + p[2])
def N0p(p):
return -0.5
More information about the CIG-COMMITS
mailing list