[cig-commits] r16489 - short/3D/PyLith/trunk/unittests/libtests/feassemble/data
brad at geodynamics.org
brad at geodynamics.org
Fri Apr 2 09:02:00 PDT 2010
Author: brad
Date: 2010-04-02 09:01:59 -0700 (Fri, 02 Apr 2010)
New Revision: 16489
Modified:
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/ElasticityExplicitLgDeform.py
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/ElasticityExplicitLgDeformData1DLinear.cc
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/ElasticityExplicitLgDeformData1DQuadratic.cc
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/ElasticityExplicitLgDeformData2DLinear.cc
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/ElasticityExplicitLgDeformData2DQuadratic.cc
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/ElasticityExplicitLgDeformData3DLinear.cc
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/ElasticityExplicitLgDeformData3DQuadratic.cc
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/ElasticityExplicitLgDeformGravData1DLinear.cc
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/ElasticityExplicitLgDeformGravData1DQuadratic.cc
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/ElasticityExplicitLgDeformGravData2DLinear.cc
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/ElasticityExplicitLgDeformGravData2DQuadratic.cc
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/ElasticityExplicitLgDeformGravData3DLinear.cc
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/ElasticityExplicitLgDeformGravData3DQuadratic.cc
Log:
Updated test data (missing term in residual that affected nonlinear solution).
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/ElasticityExplicitLgDeform.py
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/ElasticityExplicitLgDeform.py 2010-04-02 15:30:56 UTC (rev 16488)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/ElasticityExplicitLgDeform.py 2010-04-02 16:01:59 UTC (rev 16489)
@@ -51,8 +51,8 @@
# Calculate action for inertia
M = integrator._calculateMassMat()
- dispResult = integrator.fieldT - integrator.fieldTmdt
- residual = 1.0/integrator.dt**2 * numpy.dot(M, dispResult)
+ acc = (integrator.fieldTIncr - integrator.fieldT + integrator.fieldTmdt) / (integrator.dt**2)
+ residual = -numpy.dot(M, acc)
residual = residual.flatten()
# Calculate action for elasticity
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/ElasticityExplicitLgDeformData1DLinear.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/ElasticityExplicitLgDeformData1DLinear.cc 2010-04-02 15:30:56 UTC (rev 16488)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/ElasticityExplicitLgDeformData1DLinear.cc 2010-04-02 16:01:59 UTC (rev 16489)
@@ -89,8 +89,8 @@
};
const double pylith::feassemble::ElasticityExplicitLgDeformData1DLinear::_valsResidual[] = {
- 2.05237249e+10,
- -2.05152874e+10,
+ 2.04829437e+10,
+ -2.05560687e+10,
};
const double pylith::feassemble::ElasticityExplicitLgDeformData1DLinear::_valsJacobian[] = {
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/ElasticityExplicitLgDeformData1DQuadratic.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/ElasticityExplicitLgDeformData1DQuadratic.cc 2010-04-02 15:30:56 UTC (rev 16488)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/ElasticityExplicitLgDeformData1DQuadratic.cc 2010-04-02 16:01:59 UTC (rev 16489)
@@ -103,9 +103,9 @@
};
const double pylith::feassemble::ElasticityExplicitLgDeformData1DQuadratic::_valsResidual[] = {
- 8.41223688e+10,
- -9.31066744e+09,
- -7.48032639e+10,
+ 8.41042438e+10,
+ -9.31754244e+09,
+ -7.48532639e+10,
};
const double pylith::feassemble::ElasticityExplicitLgDeformData1DQuadratic::_valsJacobian[] = {
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/ElasticityExplicitLgDeformData2DLinear.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/ElasticityExplicitLgDeformData2DLinear.cc 2010-04-02 15:30:56 UTC (rev 16488)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/ElasticityExplicitLgDeformData2DLinear.cc 2010-04-02 16:01:59 UTC (rev 16489)
@@ -94,9 +94,9 @@
};
const double pylith::feassemble::ElasticityExplicitLgDeformData2DLinear::_valsResidual[] = {
- -1.30906935e+11, 1.45826347e+11,
- 4.13444081e+10, -1.44671612e+11,
- 8.95637877e+10, -1.15588068e+09,
+ -1.30908158e+11, 1.45826462e+11,
+ 4.13431858e+10, -1.44671497e+11,
+ 8.95625655e+10, -1.15576609e+09,
};
const double pylith::feassemble::ElasticityExplicitLgDeformData2DLinear::_valsJacobian[] = {
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/ElasticityExplicitLgDeformData2DQuadratic.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/ElasticityExplicitLgDeformData2DQuadratic.cc 2010-04-02 15:30:56 UTC (rev 16488)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/ElasticityExplicitLgDeformData2DQuadratic.cc 2010-04-02 16:01:59 UTC (rev 16489)
@@ -164,12 +164,12 @@
};
const double pylith::feassemble::ElasticityExplicitLgDeformData2DQuadratic::_valsResidual[] = {
- 3.35158253e+10, 8.10161927e+10,
- -7.94924298e+10, -4.37818288e+10,
- 2.10014068e+10, 2.15146983e+10,
- 7.31028066e+10, -6.35763747e+09,
- -5.42559207e+10, -9.94886446e+10,
- 6.13196816e+09, 4.70976886e+10,
+ 3.35186619e+10, 8.10189832e+10,
+ -7.94930135e+10, -4.37826989e+10,
+ 2.10035850e+10, 2.15156871e+10,
+ 7.31131484e+10, -6.34970387e+09,
+ -5.42588065e+10, -9.94923096e+10,
+ 6.13022939e+09, 4.70980577e+10,
};
const double pylith::feassemble::ElasticityExplicitLgDeformData2DQuadratic::_valsJacobian[] = {
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/ElasticityExplicitLgDeformData3DLinear.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/ElasticityExplicitLgDeformData3DLinear.cc 2010-04-02 15:30:56 UTC (rev 16488)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/ElasticityExplicitLgDeformData3DLinear.cc 2010-04-02 16:01:59 UTC (rev 16489)
@@ -100,10 +100,10 @@
};
const double pylith::feassemble::ElasticityExplicitLgDeformData3DLinear::_valsResidual[] = {
- -1.33662714e+10, 3.00655673e+11, 1.48220308e+11,
- -5.48903846e+10, 6.55599973e+11, 3.04460040e+11,
- 6.45906661e+10, -1.06342926e+12, -4.86427795e+11,
- 3.66800744e+09, 1.07174625e+11, 3.37464384e+10,
+ -1.33659352e+10, 3.00655421e+11, 1.48221233e+11,
+ -5.48900483e+10, 6.55599721e+11, 3.04460965e+11,
+ 6.45910023e+10, -1.06342951e+12, -4.86426871e+11,
+ 3.66834369e+09, 1.07174373e+11, 3.37473630e+10,
};
const double pylith::feassemble::ElasticityExplicitLgDeformData3DLinear::_valsJacobian[] = {
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/ElasticityExplicitLgDeformData3DQuadratic.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/ElasticityExplicitLgDeformData3DQuadratic.cc 2010-04-02 15:30:56 UTC (rev 16488)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/ElasticityExplicitLgDeformData3DQuadratic.cc 2010-04-02 16:01:59 UTC (rev 16489)
@@ -181,16 +181,16 @@
};
const double pylith::feassemble::ElasticityExplicitLgDeformData3DQuadratic::_valsResidual[] = {
- 3.68914019e+10, 2.89140041e+10, -8.37349483e+08,
- 1.31656837e+11, -3.38172944e+10, 5.13325670e+10,
- -3.92908518e+11, -2.10628710e+11, -2.01772556e+11,
- -1.14271876e+11, 1.30714284e+11, -1.07976362e+11,
- -2.64261066e+11, -2.85532868e+10, -4.02044235e+10,
- 4.59398298e+11, 2.32374884e+11, 2.74961419e+11,
- -2.46995439e+11, -7.38540882e+10, -4.79777811e+10,
- 5.25207525e+10, -8.35311020e+10, -1.48217553e+10,
- -1.20397414e+11, 3.07705881e+11, -2.63722698e+11,
- 4.58366027e+11, -2.69314282e+11, 3.51027060e+11,
+ 3.68904302e+10, 2.89154635e+10, -8.34303196e+08,
+ 1.31658958e+11, -3.38188176e+10, 5.13285187e+10,
+ -3.92909711e+11, -2.10630391e+11, -2.01774869e+11,
+ -1.14269176e+11, 1.30717232e+11, -1.07973309e+11,
+ -2.64258575e+11, -2.85535726e+10, -4.02072308e+10,
+ 4.59398355e+11, 2.32376498e+11, 2.74963691e+11,
+ -2.46994434e+11, -7.38524287e+10, -4.79760043e+10,
+ 5.25219225e+10, -8.35281650e+10, -1.48179494e+10,
+ -1.20392699e+11, 3.07708241e+11, -2.63722439e+11,
+ 4.58368848e+11, -2.69312012e+11, 3.51028310e+11,
};
const double pylith::feassemble::ElasticityExplicitLgDeformData3DQuadratic::_valsJacobian[] = {
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/ElasticityExplicitLgDeformGravData1DLinear.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/ElasticityExplicitLgDeformGravData1DLinear.cc 2010-04-02 15:30:56 UTC (rev 16488)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/ElasticityExplicitLgDeformGravData1DLinear.cc 2010-04-02 16:01:59 UTC (rev 16489)
@@ -89,8 +89,8 @@
};
const double pylith::feassemble::ElasticityExplicitLgDeformGravData1DLinear::_valsResidual[] = {
- -2.60726275e+11,
- -3.01765287e+11,
+ -2.60767056e+11,
+ -3.01806069e+11,
};
const double pylith::feassemble::ElasticityExplicitLgDeformGravData1DLinear::_valsJacobian[] = {
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/ElasticityExplicitLgDeformGravData1DQuadratic.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/ElasticityExplicitLgDeformGravData1DQuadratic.cc 2010-04-02 15:30:56 UTC (rev 16488)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/ElasticityExplicitLgDeformGravData1DQuadratic.cc 2010-04-02 16:01:59 UTC (rev 16489)
@@ -103,9 +103,9 @@
};
const double pylith::feassemble::ElasticityExplicitLgDeformGravData1DQuadratic::_valsResidual[] = {
- -9.62763117e+09,
- -1.03060667e+11,
- -4.49803264e+11,
+ -9.64575617e+09,
+ -1.03067542e+11,
+ -4.49853264e+11,
};
const double pylith::feassemble::ElasticityExplicitLgDeformGravData1DQuadratic::_valsJacobian[] = {
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/ElasticityExplicitLgDeformGravData2DLinear.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/ElasticityExplicitLgDeformGravData2DLinear.cc 2010-04-02 15:30:56 UTC (rev 16488)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/ElasticityExplicitLgDeformGravData2DLinear.cc 2010-04-02 16:01:59 UTC (rev 16489)
@@ -94,9 +94,9 @@
};
const double pylith::feassemble::ElasticityExplicitLgDeformGravData2DLinear::_valsResidual[] = {
- -1.30906935e+11, 1.34368014e+11,
- 4.13444081e+10, -1.56129945e+11,
- 8.95637877e+10, -1.26142140e+10,
+ -1.30908158e+11, 1.34368128e+11,
+ 4.13431858e+10, -1.56129831e+11,
+ 8.95625655e+10, -1.26140994e+10,
};
const double pylith::feassemble::ElasticityExplicitLgDeformGravData2DLinear::_valsJacobian[] = {
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/ElasticityExplicitLgDeformGravData2DQuadratic.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/ElasticityExplicitLgDeformGravData2DQuadratic.cc 2010-04-02 15:30:56 UTC (rev 16488)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/ElasticityExplicitLgDeformGravData2DQuadratic.cc 2010-04-02 16:01:59 UTC (rev 16489)
@@ -164,12 +164,12 @@
};
const double pylith::feassemble::ElasticityExplicitLgDeformGravData2DQuadratic::_valsResidual[] = {
- 3.35158253e+10, 3.88286927e+10,
- -7.94924298e+10, -8.36255788e+10,
- 2.10014068e+10, -1.83290517e+10,
- 7.31028066e+10, -2.31357637e+11,
- -5.42559207e+10, -1.51051145e+11,
- 6.13196816e+09, -4.46481142e+09,
+ 3.35186619e+10, 3.88314832e+10,
+ -7.94930135e+10, -8.36264489e+10,
+ 2.10035850e+10, -1.83280629e+10,
+ 7.31131484e+10, -2.31349704e+11,
+ -5.42588065e+10, -1.51054810e+11,
+ 6.13022939e+09, -4.46444228e+09,
};
const double pylith::feassemble::ElasticityExplicitLgDeformGravData2DQuadratic::_valsJacobian[] = {
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/ElasticityExplicitLgDeformGravData3DLinear.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/ElasticityExplicitLgDeformGravData3DLinear.cc 2010-04-02 15:30:56 UTC (rev 16488)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/ElasticityExplicitLgDeformGravData3DLinear.cc 2010-04-02 16:01:59 UTC (rev 16489)
@@ -100,10 +100,10 @@
};
const double pylith::feassemble::ElasticityExplicitLgDeformGravData3DLinear::_valsResidual[] = {
- -1.33662714e+10, 3.00655673e+11, 1.14595308e+11,
- -5.48903846e+10, 6.55599973e+11, 2.70835040e+11,
- 6.45906661e+10, -1.06342926e+12, -5.20052795e+11,
- 3.66800744e+09, 1.07174625e+11, 1.21438352e+08,
+ -1.33659352e+10, 3.00655421e+11, 1.14596233e+11,
+ -5.48900483e+10, 6.55599721e+11, 2.70835965e+11,
+ 6.45910023e+10, -1.06342951e+12, -5.20051871e+11,
+ 3.66834369e+09, 1.07174373e+11, 1.22363040e+08,
};
const double pylith::feassemble::ElasticityExplicitLgDeformGravData3DLinear::_valsJacobian[] = {
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/ElasticityExplicitLgDeformGravData3DQuadratic.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/ElasticityExplicitLgDeformGravData3DQuadratic.cc 2010-04-02 15:30:56 UTC (rev 16488)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/ElasticityExplicitLgDeformGravData3DQuadratic.cc 2010-04-02 16:01:59 UTC (rev 16489)
@@ -181,16 +181,16 @@
};
const double pylith::feassemble::ElasticityExplicitLgDeformGravData3DQuadratic::_valsResidual[] = {
- 3.68914019e+10, 2.89140041e+10, -2.66277141e+10,
- 1.31656837e+11, -3.38172944e+10, 2.73208483e+10,
- -3.92908518e+11, -2.10628710e+11, -2.25784275e+11,
- -1.14271876e+11, 1.30714284e+11, -1.31988081e+11,
- -2.64261066e+11, -2.85532868e+10, -1.61152340e+11,
- 4.59398298e+11, 2.32374884e+11, 1.91365064e+11,
- -2.46995439e+11, -7.38540882e+10, -1.31574135e+11,
- 5.25207525e+10, -8.35311020e+10, -9.84181095e+10,
- -1.20397414e+11, 3.07705881e+11, -3.84670615e+11,
- 4.58366027e+11, -2.69314282e+11, 2.30079143e+11,
+ 3.68904302e+10, 2.89154635e+10, -2.66246678e+10,
+ 1.31658958e+11, -3.38188176e+10, 2.73167999e+10,
+ -3.92909711e+11, -2.10630391e+11, -2.25786587e+11,
+ -1.14269176e+11, 1.30717232e+11, -1.31985028e+11,
+ -2.64258575e+11, -2.85535726e+10, -1.61155147e+11,
+ 4.59398355e+11, 2.32376498e+11, 1.91367337e+11,
+ -2.46994434e+11, -7.38524287e+10, -1.31572358e+11,
+ 5.25219225e+10, -8.35281650e+10, -9.84143036e+10,
+ -1.20392699e+11, 3.07708241e+11, -3.84670356e+11,
+ 4.58368848e+11, -2.69312012e+11, 2.30080394e+11,
};
const double pylith::feassemble::ElasticityExplicitLgDeformGravData3DQuadratic::_valsJacobian[] = {
More information about the CIG-COMMITS
mailing list