[cig-commits] r15892 - short/3D/PyLith/branches/pylith-friction/unittests/libtests/feassemble/data
brad at geodynamics.org
brad at geodynamics.org
Wed Oct 28 16:24:31 PDT 2009
Author: brad
Date: 2009-10-28 16:24:31 -0700 (Wed, 28 Oct 2009)
New Revision: 15892
Modified:
short/3D/PyLith/branches/pylith-friction/unittests/libtests/feassemble/data/ElasticityExplicitData2DQuadratic.cc
short/3D/PyLith/branches/pylith-friction/unittests/libtests/feassemble/data/Quadrature2DQuadratic.py
Log:
Fixed small error in quadrature points (affects actual numbers but not validity of tests).
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 23:06:21 UTC (rev 15891)
+++ short/3D/PyLith/branches/pylith-friction/unittests/libtests/feassemble/data/ElasticityExplicitData2DQuadratic.cc 2009-10-28 23:24:31 UTC (rev 15892)
@@ -64,9 +64,9 @@
};
const double pylith::feassemble::ElasticityExplicitData2DQuadratic::_quadPts[] = {
- 0.00000000e+00, -7.50000000e-01,
- -7.50000000e-01, 0.00000000e+00,
- -7.50000000e-01, -7.50000000e-01,
+ 0.00000000e+00, -1.00000000e+00,
+ -1.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00,
};
const double pylith::feassemble::ElasticityExplicitData2DQuadratic::_quadWts[] = {
@@ -74,36 +74,36 @@
};
const double pylith::feassemble::ElasticityExplicitData2DQuadratic::_basis[] = {
- -9.37500000e-02, 0.00000000e+00,
- -9.37500000e-02, 2.50000000e-01,
- 1.87500000e-01, 7.50000000e-01,
- -9.37500000e-02, -9.37500000e-02,
- 0.00000000e+00, 2.50000000e-01,
- 7.50000000e-01, 1.87500000e-01,
- 3.75000000e-01, -9.37500000e-02,
- -9.37500000e-02, 6.25000000e-02,
- 3.75000000e-01, 3.75000000e-01,
+ -0.00000000e+00, 0.00000000e+00,
+ -0.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 1.00000000e+00,
+ -0.00000000e+00, -0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00,
+ 1.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 1.00000000e+00,
+ -0.00000000e+00, -0.00000000e+00,
};
const double pylith::feassemble::ElasticityExplicitData2DQuadratic::_basisDerivRef[] = {
- -2.50000000e-01, -2.50000000e-01,
+ -5.00000000e-01, -5.00000000e-01,
5.00000000e-01, 0.00000000e+00,
- 0.00000000e+00, -2.50000000e-01,
- 2.50000000e-01, 1.00000000e+00,
- -2.50000000e-01, 5.00000000e-01,
- -2.50000000e-01, -1.00000000e+00,
- -2.50000000e-01, -2.50000000e-01,
- -2.50000000e-01, 0.00000000e+00,
+ 0.00000000e+00, -5.00000000e-01,
+ 0.00000000e+00, 1.00000000e+00,
+ -0.00000000e+00, 1.00000000e+00,
+ 0.00000000e+00, -1.00000000e+00,
+ -5.00000000e-01, -5.00000000e-01,
+ -5.00000000e-01, 0.00000000e+00,
0.00000000e+00, 5.00000000e-01,
- 1.00000000e+00, 2.50000000e-01,
- -1.00000000e+00, -2.50000000e-01,
- 5.00000000e-01, -2.50000000e-01,
+ 1.00000000e+00, 0.00000000e+00,
+ -1.00000000e+00, 0.00000000e+00,
+ 1.00000000e+00, -0.00000000e+00,
+ 5.00000000e-01, 5.00000000e-01,
+ 5.00000000e-01, 0.00000000e+00,
+ 0.00000000e+00, 5.00000000e-01,
+ 1.00000000e+00, 1.00000000e+00,
-1.00000000e+00, -1.00000000e+00,
- -2.50000000e-01, 0.00000000e+00,
- 0.00000000e+00, -2.50000000e-01,
- 2.50000000e-01, 2.50000000e-01,
- -2.50000000e-01, 1.25000000e+00,
- 1.25000000e+00, -2.50000000e-01,
+ -1.00000000e+00, -1.00000000e+00,
};
const double pylith::feassemble::ElasticityExplicitData2DQuadratic::_fieldTIncr[] = {
@@ -134,87 +134,87 @@
};
const double pylith::feassemble::ElasticityExplicitData2DQuadratic::_valsResidual[] = {
- -5.90114822e+09, 4.71777415e+10,
- -1.39396421e+10, -6.36913623e+09,
- 4.56555501e+08, 1.65074214e+10,
- 2.42225720e+10, -8.30477279e+09,
- -2.84015238e+10, -6.85803760e+10,
- 2.35671240e+10, 1.95727783e+10,
+ 4.52025463e+08, 4.02314236e+10,
+ -2.15321181e+10, -8.73697917e+09,
+ 1.41134259e+09, 3.00951389e+10,
+ 4.36649259e+10, 3.88748889e+10,
+ -4.28887778e+10, -9.45806667e+10,
+ 1.88971019e+10, -5.88080556e+09,
};
const double pylith::feassemble::ElasticityExplicitData2DQuadratic::_valsJacobian[] = {
- 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.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,
- -3.95507812e+05, 0.00000000e+00,
- 2.63671875e+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.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.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.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,
- -3.51562500e+05, 0.00000000e+00,
- -4.39453125e+05, 0.00000000e+00,
- -4.39453125e+05, 0.00000000e+00,
- 1.93359375e+06, 0.00000000e+00,
- 3.86718750e+06, 0.00000000e+00,
- 3.86718750e+06, 0.00000000e+00,
- 0.00000000e+00, -3.51562500e+05,
- 0.00000000e+00, -4.39453125e+05,
- 0.00000000e+00, -4.39453125e+05,
- 0.00000000e+00, 1.93359375e+06,
- 0.00000000e+00, 3.86718750e+06,
- 0.00000000e+00, 3.86718750e+06,
- 7.91015625e+05, 0.00000000e+00,
- -1.58203125e+06, 0.00000000e+00,
- -7.91015625e+05, 0.00000000e+00,
- 3.86718750e+06, 0.00000000e+00,
- 1.10742188e+07, 0.00000000e+00,
- 6.32812500e+06, 0.00000000e+00,
- 0.00000000e+00, 7.91015625e+05,
- 0.00000000e+00, -1.58203125e+06,
- 0.00000000e+00, -7.91015625e+05,
- 0.00000000e+00, 3.86718750e+06,
- 0.00000000e+00, 1.10742188e+07,
- 0.00000000e+00, 6.32812500e+06,
- 7.91015625e+05, 0.00000000e+00,
- -7.91015625e+05, 0.00000000e+00,
- -1.58203125e+06, 0.00000000e+00,
- 3.86718750e+06, 0.00000000e+00,
- 6.32812500e+06, 0.00000000e+00,
- 1.10742188e+07, 0.00000000e+00,
- 0.00000000e+00, 7.91015625e+05,
- 0.00000000e+00, -7.91015625e+05,
- 0.00000000e+00, -1.58203125e+06,
- 0.00000000e+00, 3.86718750e+06,
- 0.00000000e+00, 6.32812500e+06,
- 0.00000000e+00, 1.10742188e+07,
+ 0.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00,
+ 1.50000000e+07, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 1.50000000e+07,
+ 0.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00,
+ 1.50000000e+07, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 1.50000000e+07,
+ 0.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00,
+ 1.50000000e+07, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 0.00000000e+00,
+ 0.00000000e+00, 1.50000000e+07,
};
pylith::feassemble::ElasticityExplicitData2DQuadratic::ElasticityExplicitData2DQuadratic(void)
Modified: short/3D/PyLith/branches/pylith-friction/unittests/libtests/feassemble/data/Quadrature2DQuadratic.py
===================================================================
--- short/3D/PyLith/branches/pylith-friction/unittests/libtests/feassemble/data/Quadrature2DQuadratic.py 2009-10-28 23:06:21 UTC (rev 15891)
+++ short/3D/PyLith/branches/pylith-friction/unittests/libtests/feassemble/data/Quadrature2DQuadratic.py 2009-10-28 23:24:31 UTC (rev 15892)
@@ -93,9 +93,9 @@
Component.__init__(self, name, facility="quadrature")
# These are just approximate points used to test the quadrature routine
- self.quadPtsRef = numpy.array( [[-1.0+4.0/4.0, -1.0+1.0/4.0],
- [-1.0+1.0/4.0, -1.0+4.0/4.0],
- [-1.0+1.0/4.0, -1.0+1.0/4.0]],
+ self.quadPtsRef = numpy.array( [[0.0, -1.0],
+ [-1.0, 0.0],
+ [0.0, 0.0]],
dtype=numpy.float64)
self.quadWts = numpy.array([2.0/3.0, 2.0/3.0, 2.0/3.0],
dtype=numpy.float64)
More information about the CIG-COMMITS
mailing list