[cig-commits] r15210 - in short/3D/PyLith/trunk/unittests/libtests/materials: . data
brad at geodynamics.org
brad at geodynamics.org
Fri Jun 12 08:54:47 PDT 2009
Author: brad
Date: 2009-06-12 08:54:47 -0700 (Fri, 12 Jun 2009)
New Revision: 15210
Modified:
short/3D/PyLith/trunk/unittests/libtests/materials/TestPowerLaw3D.hh
short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLaw3DTimeDep.py
short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLaw3DTimeDepData.cc
Log:
Adjusted test case values to values that permit more accurate computation of elastic constants.
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/TestPowerLaw3D.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/TestPowerLaw3D.hh 2009-06-12 15:51:31 UTC (rev 15209)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/TestPowerLaw3D.hh 2009-06-12 15:54:47 UTC (rev 15210)
@@ -58,8 +58,7 @@
CPPUNIT_TEST( test_calcStressElastic );
CPPUNIT_TEST( test_calcStressTimeDep );
CPPUNIT_TEST( test_calcElasticConstsElastic );
- // This doesn't quite pass yet.
- // CPPUNIT_TEST( test_calcElasticConstsTimeDep );
+ CPPUNIT_TEST( test_calcElasticConstsTimeDep );
CPPUNIT_TEST( test_updateStateVarsElastic );
CPPUNIT_TEST( test_updateStateVarsTimeDep );
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLaw3DTimeDep.py
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLaw3DTimeDep.py 2009-06-12 15:51:31 UTC (rev 15209)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLaw3DTimeDep.py 2009-06-12 15:54:47 UTC (rev 15210)
@@ -86,7 +86,7 @@
densityB = 2000.0
vsB = 1200.0
vpB = vsB*3**0.5
- viscosityCoeffB = 1.0e10
+ viscosityCoeffB = 1.0e12
powerLawExpB = 3.0
strainB = [4.1e-4, 4.2e-4, 4.3e-4, 4.4e-4, 4.5e-4, 4.6e-4]
initialStressB = [5.1e4, 5.2e4, 5.3e4, 5.4e4, 5.5e4, 5.6e4]
@@ -185,10 +185,7 @@
visStrainB, stressB,
initialStressB, initialStrainB)
- # I need to make sure that the correct stresses are being used to compute
- # Maxwell times (and stable time step size).
- # I am assuming right now that we use the state variable values rather than
- # the current computed stress values.
+ # Use state variables to compute Maxwell times (and stable time step size).
maxwellTimeA = self._getMaxwellTime(muA, viscosityCoeffA, \
powerLawExpA, stressA)
@@ -440,7 +437,7 @@
# Compute components of tangent constitutive matrix using numerical
# derivatives.
- derivDx = 1.0e-8
+ derivDx = 1.0e-12
derivOrder = 3
elasticConstsList = []
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLaw3DTimeDepData.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLaw3DTimeDepData.cc 2009-06-12 15:51:31 UTC (rev 15209)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLaw3DTimeDepData.cc 2009-06-12 15:54:47 UTC (rev 15210)
@@ -86,7 +86,7 @@
2.00000000e+03,
1.20000000e+03,
2.07846097e+03,
- 1.00000000e+10,
+ 1.00000000e+12,
3.00000000e+00,
};
@@ -114,7 +114,7 @@
2.00000000e+03,
2.88000000e+09,
2.88000000e+09,
- 1.00000000e+10,
+ 1.00000000e+12,
3.00000000e+00,
};
@@ -154,7 +154,7 @@
2.00000000e+00,
1.28000000e-01,
1.28000000e-01,
- 3.54219523e+06,
+ 3.54219523e+08,
3.00000000e+00,
};
@@ -212,57 +212,57 @@
4.33417161e+06,
4.73925792e+06,
5.14434423e+06,
- 5.97822104e+06,
- 6.03098177e+06,
- 6.08374250e+06,
- 2.50398815e+06,
- 2.55674888e+06,
- 2.60950961e+06,
+ 5.97804000e+06,
+ 6.03088000e+06,
+ 6.08372000e+06,
+ 2.50776000e+06,
+ 2.56060000e+06,
+ 2.61344000e+06,
};
const double pylith::materials::PowerLaw3DTimeDepData::_elasticConsts[] = {
- 6.74326515e+10,
- 2.25336742e+10,
- 2.25336742e+10,
+ 6.74326513e+10,
+ 2.25336738e+10,
+ 2.25336747e+10,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
- 6.74326515e+10,
- 2.25336742e+10,
+ 6.74326513e+10,
+ 2.25336747e+10,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
- 6.74326515e+10,
+ 6.74326513e+10,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
- 4.48989773e+10,
+ 4.48989770e+10,
0.00000000e+00,
0.00000000e+00,
- 4.48989773e+10,
+ 4.48989775e+10,
0.00000000e+00,
- 4.48989773e+10,
- 8.63434339e+09,
- 2.88282694e+09,
- 2.88282967e+09,
- 2.58955779e+05,
- 2.64412072e+05,
- 2.69868365e+05,
- 8.63434587e+09,
- 2.88282860e+09,
- 1.45530654e+05,
- 1.48596941e+05,
- 1.51663274e+05,
- 8.63434596e+09,
- 3.20600346e+04,
- 3.27355228e+04,
- 3.34110111e+04,
- 5.74612223e+09,
- -5.50963872e+06,
- -5.62332564e+06,
- 5.74589214e+09,
- -5.74174896e+06,
- 5.74565739e+09,
+ 4.48989770e+10,
+ 8.64000013e+09,
+ 2.88000004e+09,
+ 2.87999958e+09,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 8.64000013e+09,
+ 2.88000004e+09,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 8.64000013e+09,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 5.75999985e+09,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 5.75999985e+09,
+ 0.00000000e+00,
+ 5.76000009e+09,
};
const double pylith::materials::PowerLaw3DTimeDepData::_initialStress[] = {
@@ -308,18 +308,18 @@
4.33417161e+06,
4.73925792e+06,
5.14434423e+06,
- 1.09685691e-05,
- 1.19823316e-05,
- 1.29960941e-05,
- 1.46548344e-05,
- 1.56685969e-05,
- 1.66823594e-05,
- 5.97822104e+06,
- 6.03098177e+06,
- 6.08374250e+06,
- 2.50398815e+06,
- 2.55674888e+06,
- 2.60950961e+06,
+ 1.10000000e-05,
+ 1.20000000e-05,
+ 1.30000000e-05,
+ 1.40000007e-05,
+ 1.50000007e-05,
+ 1.60000007e-05,
+ 5.97804000e+06,
+ 6.03088000e+06,
+ 6.08372000e+06,
+ 2.50776000e+06,
+ 2.56060000e+06,
+ 2.61344000e+06,
};
pylith::materials::PowerLaw3DTimeDepData::PowerLaw3DTimeDepData(void)
More information about the CIG-COMMITS
mailing list