[cig-commits] r15893 - short/3D/PyLith/branches/pylith-friction/unittests/libtests/feassemble/data
brad at geodynamics.org
brad at geodynamics.org
Wed Oct 28 17:30:50 PDT 2009
Author: brad
Date: 2009-10-28 17:30:49 -0700 (Wed, 28 Oct 2009)
New Revision: 15893
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:24:31 UTC (rev 15892)
+++ short/3D/PyLith/branches/pylith-friction/unittests/libtests/feassemble/data/ElasticityExplicitData2DQuadratic.cc 2009-10-29 00:30:49 UTC (rev 15893)
@@ -25,7 +25,7 @@
const int pylith::feassemble::ElasticityExplicitData2DQuadratic::_numBasis = 6;
-const int pylith::feassemble::ElasticityExplicitData2DQuadratic::_numQuadPts = 3;
+const int pylith::feassemble::ElasticityExplicitData2DQuadratic::_numQuadPts = 6;
const char* pylith::feassemble::ElasticityExplicitData2DQuadratic::_matType = "ElasticPlaneStrain";
@@ -64,46 +64,76 @@
};
const double pylith::feassemble::ElasticityExplicitData2DQuadratic::_quadPts[] = {
- 0.00000000e+00, -1.00000000e+00,
- -1.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00,
+ -7.50000000e-01, -7.50000000e-01,
+ 7.50000000e-01, -7.50000000e-01,
+ -7.50000000e-01, 7.50000000e-01,
+ 0.00000000e+00, -7.50000000e-01,
+ -7.50000000e-01, 0.00000000e+00,
+ 2.50000000e-01, 2.50000000e-01,
};
const double pylith::feassemble::ElasticityExplicitData2DQuadratic::_quadWts[] = {
- 6.66666667e-01, 6.66666667e-01, 6.66666667e-01,
+ 3.33333333e-01, 3.33333333e-01, 3.33333333e-01, 3.33333333e-01, 3.33333333e-01, 3.33333333e-01,
};
const double pylith::feassemble::ElasticityExplicitData2DQuadratic::_basis[] = {
- -0.00000000e+00, 0.00000000e+00,
- -0.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 1.00000000e+00,
+ 3.75000000e-01, -9.37500000e-02,
+ -9.37500000e-02, 6.25000000e-02,
+ 3.75000000e-01, 3.75000000e-01,
+ 0.00000000e+00, 6.56250000e-01,
+ -9.37500000e-02, 4.37500000e-01,
-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, -9.37500000e-02,
+ 6.56250000e-01, 4.37500000e-01,
-0.00000000e+00, -0.00000000e+00,
+ -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, 1.56250000e-01,
+ 1.56250000e-01, 1.56250000e+00,
+ -6.25000000e-01, -6.25000000e-01,
};
const double pylith::feassemble::ElasticityExplicitData2DQuadratic::_basisDerivRef[] = {
- -5.00000000e-01, -5.00000000e-01,
- 5.00000000e-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, 0.00000000e+00,
- -1.00000000e+00, 0.00000000e+00,
- 1.00000000e+00, -0.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,
5.00000000e-01, 5.00000000e-01,
+ 1.25000000e+00, 0.00000000e+00,
+ 0.00000000e+00, -2.50000000e-01,
+ 2.50000000e-01, 1.75000000e+00,
+ -2.50000000e-01, -2.50000000e-01,
+ -1.75000000e+00, -1.75000000e+00,
+ 5.00000000e-01, 5.00000000e-01,
+ -2.50000000e-01, 0.00000000e+00,
+ 0.00000000e+00, 1.25000000e+00,
+ 1.75000000e+00, 2.50000000e-01,
+ -1.75000000e+00, -1.75000000e+00,
+ -2.50000000e-01, -2.50000000e-01,
+ -2.50000000e-01, -2.50000000e-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,
+ 1.00000000e+00, 2.50000000e-01,
+ -1.00000000e+00, -2.50000000e-01,
+ 5.00000000e-01, -2.50000000e-01,
1.00000000e+00, 1.00000000e+00,
- -1.00000000e+00, -1.00000000e+00,
- -1.00000000e+00, -1.00000000e+00,
+ 7.50000000e-01, 0.00000000e+00,
+ 0.00000000e+00, 7.50000000e-01,
+ 1.25000000e+00, 1.25000000e+00,
+ -1.25000000e+00, -1.75000000e+00,
+ -1.75000000e+00, -1.25000000e+00,
};
const double pylith::feassemble::ElasticityExplicitData2DQuadratic::_fieldTIncr[] = {
@@ -134,87 +164,87 @@
};
const double pylith::feassemble::ElasticityExplicitData2DQuadratic::_valsResidual[] = {
- 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,
+ 1.06595078e+10, 9.01579396e+10,
+ -2.93254295e+10, -4.67249883e+09,
+ 4.90758945e+09, 6.17199466e+10,
+ 6.30081264e+10, 1.02122281e+11,
+ -6.40775573e+10, -1.84807617e+11,
+ 1.48314194e+10, -6.45195820e+10,
};
const double pylith::feassemble::ElasticityExplicitData2DQuadratic::_valsJacobian[] = {
- 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,
+ 2.24121094e+06, 0.00000000e+00,
+ 2.41699219e+05, 0.00000000e+00,
+ 2.41699219e+05, 0.00000000e+00,
+ 4.21875000e+06, 0.00000000e+00,
+ -1.36230469e+06, 0.00000000e+00,
+ -1.36230469e+06, 0.00000000e+00,
+ 0.00000000e+00, 2.24121094e+06,
+ 0.00000000e+00, 2.41699219e+05,
+ 0.00000000e+00, 2.41699219e+05,
+ 0.00000000e+00, 4.21875000e+06,
+ 0.00000000e+00, -1.36230469e+06,
+ 0.00000000e+00, -1.36230469e+06,
+ 2.41699219e+05, 0.00000000e+00,
+ 3.61083984e+06, 0.00000000e+00,
+ -6.73828125e+05, 0.00000000e+00,
+ 3.45703125e+06, 0.00000000e+00,
+ -1.52343750e+06, 0.00000000e+00,
+ -1.12792969e+06, 0.00000000e+00,
+ 0.00000000e+00, 2.41699219e+05,
+ 0.00000000e+00, 3.61083984e+06,
+ 0.00000000e+00, -6.73828125e+05,
+ 0.00000000e+00, 3.45703125e+06,
+ 0.00000000e+00, -1.52343750e+06,
+ 0.00000000e+00, -1.12792969e+06,
+ 2.41699219e+05, 0.00000000e+00,
+ -6.73828125e+05, 0.00000000e+00,
+ 3.61083984e+06, 0.00000000e+00,
+ 3.45703125e+06, 0.00000000e+00,
+ -1.12792969e+06, 0.00000000e+00,
+ -1.52343750e+06, 0.00000000e+00,
+ 0.00000000e+00, 2.41699219e+05,
+ 0.00000000e+00, -6.73828125e+05,
+ 0.00000000e+00, 3.61083984e+06,
+ 0.00000000e+00, 3.45703125e+06,
+ 0.00000000e+00, -1.12792969e+06,
+ 0.00000000e+00, -1.52343750e+06,
+ 4.21875000e+06, 0.00000000e+00,
+ 3.45703125e+06, 0.00000000e+00,
+ 3.45703125e+06, 0.00000000e+00,
+ 2.21484375e+07, 0.00000000e+00,
+ -5.39062500e+06, 0.00000000e+00,
+ -5.39062500e+06, 0.00000000e+00,
+ 0.00000000e+00, 4.21875000e+06,
+ 0.00000000e+00, 3.45703125e+06,
+ 0.00000000e+00, 3.45703125e+06,
+ 0.00000000e+00, 2.21484375e+07,
+ 0.00000000e+00, -5.39062500e+06,
+ 0.00000000e+00, -5.39062500e+06,
+ -1.36230469e+06, 0.00000000e+00,
+ -1.52343750e+06, 0.00000000e+00,
+ -1.12792969e+06, 0.00000000e+00,
+ -5.39062500e+06, 0.00000000e+00,
+ 8.46679688e+06, 0.00000000e+00,
+ 6.09375000e+06, 0.00000000e+00,
+ 0.00000000e+00, -1.36230469e+06,
+ 0.00000000e+00, -1.52343750e+06,
+ 0.00000000e+00, -1.12792969e+06,
+ 0.00000000e+00, -5.39062500e+06,
+ 0.00000000e+00, 8.46679688e+06,
+ 0.00000000e+00, 6.09375000e+06,
+ -1.36230469e+06, 0.00000000e+00,
+ -1.12792969e+06, 0.00000000e+00,
+ -1.52343750e+06, 0.00000000e+00,
+ -5.39062500e+06, 0.00000000e+00,
+ 6.09375000e+06, 0.00000000e+00,
+ 8.46679688e+06, 0.00000000e+00,
+ 0.00000000e+00, -1.36230469e+06,
+ 0.00000000e+00, -1.12792969e+06,
+ 0.00000000e+00, -1.52343750e+06,
+ 0.00000000e+00, -5.39062500e+06,
+ 0.00000000e+00, 6.09375000e+06,
+ 0.00000000e+00, 8.46679688e+06,
};
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:24:31 UTC (rev 15892)
+++ short/3D/PyLith/branches/pylith-friction/unittests/libtests/feassemble/data/Quadrature2DQuadratic.py 2009-10-29 00:30:49 UTC (rev 15893)
@@ -93,14 +93,24 @@
Component.__init__(self, name, facility="quadrature")
# These are just approximate points used to test the quadrature routine
- self.quadPtsRef = numpy.array( [[0.0, -1.0],
- [-1.0, 0.0],
- [0.0, 0.0]],
+ self.quadPtsRef = numpy.array( [[-0.75,-0.75],
+ [0.75,-0.75],
+ [-0.75,0.75],
+ [0,-0.75],
+ [-0.75,0],
+ [0.25,0.25]],
dtype=numpy.float64)
- self.quadWts = numpy.array([2.0/3.0, 2.0/3.0, 2.0/3.0],
+ self.quadWts = numpy.array([1.0/3.0, 1.0/3.0, 1.0/3.0, 1.0/3.0, 1.0/3.0, 1.0/3.0],
dtype=numpy.float64)
+ #self.quadPtsRef = numpy.array( [[-0.64288254347276719, -0.68989794855663567],
+ # [-0.84993777955478378, 0.28989794855663559],
+ # [0.33278049202940285, -0.68989794855663567],
+ # [-0.43996016900185175, 0.28989794855663559]],
+ # dtype=numpy.float64)
+ #self.quadWts = numpy.array([0.63608276, 0.36391724, 0.63608276, 0.36391724],
+ # dtype=numpy.float64)
self.numBasis = 6
- self.numQuadPts = 3
+ self.numQuadPts = 6
self.spaceDim = 2
self.cellDim = 2
return
More information about the CIG-COMMITS
mailing list