[cig-commits] r15246 - short/3D/PyLith/trunk/unittests/libtests/materials/data
willic3 at geodynamics.org
willic3 at geodynamics.org
Sun Jun 14 19:23:34 PDT 2009
Author: willic3
Date: 2009-06-14 19:23:34 -0700 (Sun, 14 Jun 2009)
New Revision: 15246
Modified:
short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellIsotropic3DTimeDepData.cc
short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLaw3DElastic.py
short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLaw3DElasticData.cc
short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLaw3DTimeDep.py
short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLaw3DTimeDepData.cc
Log:
Fixed stupid mistake in dimensionalizing/nondimensionalizing
viscosity_coeff.
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellIsotropic3DTimeDepData.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellIsotropic3DTimeDepData.cc 2009-06-15 01:15:40 UTC (rev 15245)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellIsotropic3DTimeDepData.cc 2009-06-15 02:23:34 UTC (rev 15246)
@@ -194,27 +194,27 @@
const double pylith::materials::GenMaxwellIsotropic3DTimeDepData::_stateVars[] = {
1.10000000e-04,
- 4.10000000e-04,
+ 2.20000000e-04,
3.30000000e-04,
- 3.30000000e-04,
+ 4.40000000e-04,
5.50000000e-04,
6.60000000e-04,
- -1.73333333e-04,
- 1.26666667e-04,
- 4.66666667e-05,
- 3.30000000e-04,
+ -1.10000000e-04,
+ 0.00000000e+00,
+ 1.10000000e-04,
+ 4.40000000e-04,
5.50000000e-04,
6.60000000e-04,
- -1.73333333e-04,
- 1.26666667e-04,
- 4.66666667e-05,
- 3.30000000e-04,
+ -1.10000000e-04,
+ 0.00000000e+00,
+ 1.10000000e-04,
+ 4.40000000e-04,
5.50000000e-04,
6.60000000e-04,
- -1.73333333e-04,
- 1.26666667e-04,
- 4.66666667e-05,
- 3.30000000e-04,
+ -1.10000000e-04,
+ 0.00000000e+00,
+ 1.10000000e-04,
+ 4.40000000e-04,
5.50000000e-04,
6.60000000e-04,
1.20000000e-04,
@@ -266,27 +266,27 @@
const double pylith::materials::GenMaxwellIsotropic3DTimeDepData::_stateVarsNondim[] = {
1.10000000e-04,
- 4.10000000e-04,
+ 2.20000000e-04,
3.30000000e-04,
- 3.30000000e-04,
+ 4.40000000e-04,
5.50000000e-04,
6.60000000e-04,
- -1.73333333e-04,
- 1.26666667e-04,
- 4.66666667e-05,
- 3.30000000e-04,
+ -1.10000000e-04,
+ 0.00000000e+00,
+ 1.10000000e-04,
+ 4.40000000e-04,
5.50000000e-04,
6.60000000e-04,
- -1.73333333e-04,
- 1.26666667e-04,
- 4.66666667e-05,
- 3.30000000e-04,
+ -1.10000000e-04,
+ 0.00000000e+00,
+ 1.10000000e-04,
+ 4.40000000e-04,
5.50000000e-04,
6.60000000e-04,
- -1.73333333e-04,
- 1.26666667e-04,
- 4.66666667e-05,
- 3.30000000e-04,
+ -1.10000000e-04,
+ 0.00000000e+00,
+ 1.10000000e-04,
+ 4.40000000e-04,
5.50000000e-04,
6.60000000e-04,
1.20000000e-04,
@@ -322,9 +322,9 @@
const double pylith::materials::GenMaxwellIsotropic3DTimeDepData::_strain[] = {
1.10000000e-04,
- 4.10000000e-04,
+ 2.20000000e-04,
3.30000000e-04,
- 3.30000000e-04,
+ 4.40000000e-04,
5.50000000e-04,
6.60000000e-04,
1.20000000e-04,
@@ -336,10 +336,10 @@
};
const double pylith::materials::GenMaxwellIsotropic3DTimeDepData::_stress[] = {
- 2.41084076e+07,
- 3.75879329e+07,
- 3.39946595e+07,
- 1.48503778e+07,
+ 1.98288741e+07,
+ 2.47720000e+07,
+ 2.97151259e+07,
+ 1.97925037e+07,
2.47356296e+07,
2.96787555e+07,
2.72941620e+06,
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLaw3DElastic.py
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLaw3DElastic.py 2009-06-15 01:15:40 UTC (rev 15245)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLaw3DElastic.py 2009-06-15 02:23:34 UTC (rev 15246)
@@ -90,9 +90,9 @@
self.timeScale = 1.0
self.densityScale = 1.0e+3
self.viscosityCoeffScaleA = \
- (self.pressureScale**(1.0/powerLawExponentA))/self.timeScale
+ (self.timeScale**(1.0/powerLawExponentA)) * self.pressureScale
self.viscosityCoeffScaleB = \
- (self.pressureScale**(1.0/powerLawExponentB))/self.timeScale
+ (self.timeScale**(1.0/powerLawExponentB)) * self.pressureScale
self.dbProperties = numpy.array([ [densityA, vsA, vpA, \
viscosityCoeffA, powerLawExponentA],
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLaw3DElasticData.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLaw3DElasticData.cc 2009-06-15 01:15:40 UTC (rev 15245)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLaw3DElasticData.cc 2009-06-15 02:23:34 UTC (rev 15246)
@@ -166,7 +166,7 @@
2.00000000e+00,
1.28000000e-01,
1.28000000e-01,
- 3.54219523e+06,
+ 4.44444444e-01,
3.00000000e+00,
};
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLaw3DTimeDep.py
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLaw3DTimeDep.py 2009-06-15 01:15:40 UTC (rev 15245)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLaw3DTimeDep.py 2009-06-15 02:23:34 UTC (rev 15246)
@@ -103,9 +103,9 @@
self.timeScale = 1.0
self.densityScale = 1.0e+3
self.viscosityCoeffScaleA = \
- (self.pressureScale**(1.0/powerLawExpA))/self.timeScale
+ (self.timeScale**(1.0/powerLawExpA)) * self.pressureScale
self.viscosityCoeffScaleB = \
- (self.pressureScale**(1.0/powerLawExpB))/self.timeScale
+ (self.timeScale**(1.0/powerLawExpB)) * self.pressureScale
self.dbProperties = numpy.array([ [densityA, vsA, vpA, \
viscosityCoeffA, powerLawExpA],
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLaw3DTimeDepData.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLaw3DTimeDepData.cc 2009-06-15 01:15:40 UTC (rev 15245)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLaw3DTimeDepData.cc 2009-06-15 02:23:34 UTC (rev 15246)
@@ -154,7 +154,7 @@
2.00000000e+00,
1.28000000e-01,
1.28000000e-01,
- 3.54219523e+08,
+ 4.44444444e+01,
3.00000000e+00,
};
More information about the CIG-COMMITS
mailing list