[cig-commits] r21453 - in short/3D/PyLith/trunk/unittests/libtests/materials: . data
brad at geodynamics.org
brad at geodynamics.org
Wed Mar 6 12:15:03 PST 2013
Author: brad
Date: 2013-03-06 12:15:02 -0800 (Wed, 06 Mar 2013)
New Revision: 21453
Modified:
short/3D/PyLith/trunk/unittests/libtests/materials/TestElasticMaterial.cc
short/3D/PyLith/trunk/unittests/libtests/materials/data/DruckerPrager3DElastic.py
short/3D/PyLith/trunk/unittests/libtests/materials/data/DruckerPrager3DElasticData.cc
short/3D/PyLith/trunk/unittests/libtests/materials/data/DruckerPrager3DTimeDep.py
short/3D/PyLith/trunk/unittests/libtests/materials/data/DruckerPrager3DTimeDepData.cc
short/3D/PyLith/trunk/unittests/libtests/materials/data/DruckerPragerPlaneStrainElastic.py
short/3D/PyLith/trunk/unittests/libtests/materials/data/DruckerPragerPlaneStrainElasticData.cc
short/3D/PyLith/trunk/unittests/libtests/materials/data/DruckerPragerPlaneStrainTimeDep.py
short/3D/PyLith/trunk/unittests/libtests/materials/data/DruckerPragerPlaneStrainTimeDepData.cc
short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticIsotropic3D.py
short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticIsotropic3DData.cc
short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticPlaneStrain.py
short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticPlaneStrainData.cc
short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticPlaneStress.py
short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticPlaneStressData.cc
short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticStrain1D.py
short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticStrain1DData.cc
short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticStress1D.py
short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticStress1DData.cc
short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellIsotropic3DElastic.py
short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellIsotropic3DElasticData.cc
short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellIsotropic3DTimeDep.py
short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellIsotropic3DTimeDepData.cc
short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellPlaneStrainElastic.py
short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellPlaneStrainElasticData.cc
short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellPlaneStrainTimeDep.py
short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellPlaneStrainTimeDepData.cc
short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellQpQsIsotropic3DElastic.py
short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellQpQsIsotropic3DElasticData.cc
short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellQpQsIsotropic3DTimeDep.py
short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellQpQsIsotropic3DTimeDepData.cc
short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellIsotropic3DElastic.py
short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellIsotropic3DElasticData.cc
short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellIsotropic3DTimeDep.py
short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellIsotropic3DTimeDepData.cc
short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellPlaneStrainElastic.py
short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellPlaneStrainElasticData.cc
short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellPlaneStrainTimeDep.py
short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellPlaneStrainTimeDepData.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
short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLawPlaneStrainElastic.py
short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLawPlaneStrainElasticData.cc
short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLawPlaneStrainTimeDep.py
short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLawPlaneStrainTimeDepData.cc
Log:
Corrected density scale for material unit tests (need correct, not arbitrary scale). Added use of scales in ElasticMaterial tests.
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/TestElasticMaterial.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/TestElasticMaterial.cc 2013-03-06 02:43:29 UTC (rev 21452)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/TestElasticMaterial.cc 2013-03-06 20:15:02 UTC (rev 21453)
@@ -123,7 +123,7 @@
CPPUNIT_ASSERT(0 != initialStressE);
err = VecGetArray(stressVec, &initialStress);CHECK_PETSC_ERROR(err);
for(int i = 0; i < fiberDim; ++i) {
- CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, initialStress[off+i]/initialStressE[i], tolerance);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, initialStress[off+i]/initialStressE[i]*data.pressureScale, tolerance);
}
err = VecRestoreArray(stressVec, &initialStress);CHECK_PETSC_ERROR(err);
@@ -218,7 +218,7 @@
const int numVarsQuadPt = data.numVarsQuadPt;
// Test cell arrays
- const PylithScalar* propertiesE = data.properties;
+ const PylithScalar* propertiesE = data.propertiesNondim;
CPPUNIT_ASSERT(0 != propertiesE);
const scalar_array& properties = material._propertiesCell;
size_t size = data.numLocs*data.numPropsQuadPt;
@@ -227,7 +227,7 @@
CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, properties[i]/propertiesE[i],
tolerance);
- const PylithScalar* stateVarsE = data.stateVars;
+ const PylithScalar* stateVarsE = data.stateVarsNondim;
CPPUNIT_ASSERT( (0 < numVarsQuadPt && 0 != stateVarsE) ||
(0 == numVarsQuadPt && 0 == stateVarsE) );
const scalar_array& stateVars = material._stateVarsCell;
@@ -243,7 +243,7 @@
size = data.numLocs*tensorSize;
CPPUNIT_ASSERT_EQUAL(size, initialStress.size());
for (size_t i=0; i < size; ++i)
- CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, initialStress[i]/initialStressE[i],
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, initialStress[i]/initialStressE[i]*data.pressureScale,
tolerance);
const PylithScalar* initialStrainE = data.initialStrain;
@@ -294,7 +294,7 @@
CPPUNIT_ASSERT_EQUAL(size, density.size());
const PylithScalar tolerance = 1.0e-06;
for (size_t i=0; i < size; ++i)
- CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, density[i]/densityE[i], tolerance);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, density[i]/densityE[i]*data.densityScale, tolerance);
} // testCalcDensity
// ----------------------------------------------------------------------
@@ -338,7 +338,7 @@
CPPUNIT_ASSERT_EQUAL(size, stress.size());
const PylithScalar tolerance = 1.0e-06;
for (size_t i=0; i < size; ++i)
- CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, stress[i]/stressE[i], tolerance);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, stress[i]/stressE[i]*data.pressureScale, tolerance);
} // testCalcStress
// ----------------------------------------------------------------------
@@ -398,7 +398,7 @@
CPPUNIT_ASSERT_EQUAL(size, elasticConsts.size());
const PylithScalar tolerance = 1.0e-06;
for (size_t i=0; i < size; ++i)
- CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, elasticConsts[i]/elasticConstsE[i],
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, elasticConsts[i]/elasticConstsE[i]*data.pressureScale,
tolerance);
} // testCalcDerivElastic
@@ -492,7 +492,7 @@
const PylithScalar dt = material.stableTimeStepExplicit(mesh, &quadrature);
const PylithScalar tolerance = 1.0e-06;
- const PylithScalar dtE = data.dtStableExplicit / 1000.0 * 2.0;
+ const PylithScalar dtE = 2.0 / 5196.15242;
CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, dt/dtE, tolerance);
} // testStableTimeStepExplicit
@@ -810,6 +810,10 @@
// Set up coordinates
spatialdata::geocoords::CSCart cs;
spatialdata::units::Nondimensional normalizer;
+ normalizer.lengthScale(data->lengthScale);
+ normalizer.pressureScale(data->pressureScale);
+ normalizer.timeScale(data->timeScale);
+ normalizer.densityScale(data->densityScale);
cs.setSpaceDim(mesh->dimension());
cs.initialize();
mesh->coordsys(&cs);
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/DruckerPrager3DElastic.py
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/DruckerPrager3DElastic.py 2013-03-06 02:43:29 UTC (rev 21452)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/DruckerPrager3DElastic.py 2013-03-06 20:15:02 UTC (rev 21453)
@@ -106,8 +106,8 @@
self.lengthScale = 1.0e+3
self.pressureScale = muA
- self.densityScale = 1.0e+3
self.timeScale = 1.0
+ self.densityScale = muA / (self.lengthScale / self.timeScale)**2
self.dbProperties = numpy.array([ [densityA, vsA, vpA, \
frictionAngleA, cohesionA, \
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/DruckerPrager3DElasticData.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/DruckerPrager3DElasticData.cc 2013-03-06 02:43:29 UTC (rev 21452)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/DruckerPrager3DElasticData.cc 2013-03-06 20:15:02 UTC (rev 21453)
@@ -43,7 +43,7 @@
const PylithScalar pylith::materials::DruckerPrager3DElasticData::_pressureScale = 2.25000000e+10;
-const PylithScalar pylith::materials::DruckerPrager3DElasticData::_densityScale = 1.00000000e+03;
+const PylithScalar pylith::materials::DruckerPrager3DElasticData::_densityScale = 2.25000000e+04;
const PylithScalar pylith::materials::DruckerPrager3DElasticData::_dtStableImplicit = 1.00000000e+10;
@@ -141,13 +141,13 @@
};
const PylithScalar pylith::materials::DruckerPrager3DElasticData::_propertiesNondim[] = {
- 2.50000000e+00,
+ 1.11111111e-01,
1.00000000e+00,
1.00000000e+00,
2.30940108e-01,
1.60000000e-05,
1.48583084e-01,
- 2.00000000e+00,
+ 8.88888889e-02,
1.28000000e-01,
1.28000000e-01,
1.89338478e-01,
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/DruckerPrager3DTimeDep.py
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/DruckerPrager3DTimeDep.py 2013-03-06 02:43:29 UTC (rev 21452)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/DruckerPrager3DTimeDep.py 2013-03-06 20:15:02 UTC (rev 21453)
@@ -115,8 +115,8 @@
self.lengthScale = 1.0e+3
self.pressureScale = muA
- self.densityScale = 1.0e+3
self.timeScale = 1.0
+ self.densityScale = muA / (self.lengthScale / self.timeScale)**2
self.dbProperties = numpy.array([ [densityA, vsA, vpA, \
frictionAngleA, cohesionA, \
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/DruckerPrager3DTimeDepData.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/DruckerPrager3DTimeDepData.cc 2013-03-06 02:43:29 UTC (rev 21452)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/DruckerPrager3DTimeDepData.cc 2013-03-06 20:15:02 UTC (rev 21453)
@@ -43,7 +43,7 @@
const PylithScalar pylith::materials::DruckerPrager3DTimeDepData::_pressureScale = 2.25000000e+10;
-const PylithScalar pylith::materials::DruckerPrager3DTimeDepData::_densityScale = 1.00000000e+03;
+const PylithScalar pylith::materials::DruckerPrager3DTimeDepData::_densityScale = 2.25000000e+04;
const PylithScalar pylith::materials::DruckerPrager3DTimeDepData::_dtStableImplicit = 1.00000000e+99;
@@ -141,13 +141,13 @@
};
const PylithScalar pylith::materials::DruckerPrager3DTimeDepData::_propertiesNondim[] = {
- 2.50000000e+00,
+ 1.11111111e-01,
1.00000000e+00,
1.00000000e+00,
2.30940108e-01,
1.60000000e-05,
1.48583084e-01,
- 2.00000000e+00,
+ 8.88888889e-02,
1.28000000e-01,
1.28000000e-01,
1.89338478e-01,
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/DruckerPragerPlaneStrainElastic.py
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/DruckerPragerPlaneStrainElastic.py 2013-03-06 02:43:29 UTC (rev 21452)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/DruckerPragerPlaneStrainElastic.py 2013-03-06 20:15:02 UTC (rev 21453)
@@ -107,8 +107,8 @@
self.lengthScale = 1.0e+3
self.pressureScale = muA
- self.densityScale = 1.0e+3
self.timeScale = 1.0
+ self.densityScale = muA / (self.lengthScale / self.timeScale)**2
self.dbProperties = numpy.array([ [densityA, vsA, vpA, \
frictionAngleA, cohesionA, \
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/DruckerPragerPlaneStrainElasticData.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/DruckerPragerPlaneStrainElasticData.cc 2013-03-06 02:43:29 UTC (rev 21452)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/DruckerPragerPlaneStrainElasticData.cc 2013-03-06 20:15:02 UTC (rev 21453)
@@ -43,7 +43,7 @@
const PylithScalar pylith::materials::DruckerPragerPlaneStrainElasticData::_pressureScale = 2.25000000e+10;
-const PylithScalar pylith::materials::DruckerPragerPlaneStrainElasticData::_densityScale = 1.00000000e+03;
+const PylithScalar pylith::materials::DruckerPragerPlaneStrainElasticData::_densityScale = 2.25000000e+04;
const PylithScalar pylith::materials::DruckerPragerPlaneStrainElasticData::_dtStableImplicit = 1.00000000e+10;
@@ -137,13 +137,13 @@
};
const PylithScalar pylith::materials::DruckerPragerPlaneStrainElasticData::_propertiesNondim[] = {
- 2.50000000e+00,
+ 1.11111111e-01,
1.00000000e+00,
1.00000000e+00,
2.30940108e-01,
1.60000000e-05,
1.48583084e-01,
- 2.00000000e+00,
+ 8.88888889e-02,
1.28000000e-01,
1.28000000e-01,
1.89338478e-01,
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/DruckerPragerPlaneStrainTimeDep.py
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/DruckerPragerPlaneStrainTimeDep.py 2013-03-06 02:43:29 UTC (rev 21452)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/DruckerPragerPlaneStrainTimeDep.py 2013-03-06 20:15:02 UTC (rev 21453)
@@ -112,8 +112,8 @@
self.lengthScale = 1.0e+3
self.pressureScale = muA
- self.densityScale = 1.0e+3
self.timeScale = 1.0
+ self.densityScale = muA / (self.lengthScale / self.timeScale)**2
self.dbProperties = numpy.array([ [densityA, vsA, vpA, \
frictionAngleA, cohesionA, \
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/DruckerPragerPlaneStrainTimeDepData.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/DruckerPragerPlaneStrainTimeDepData.cc 2013-03-06 02:43:29 UTC (rev 21452)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/DruckerPragerPlaneStrainTimeDepData.cc 2013-03-06 20:15:02 UTC (rev 21453)
@@ -43,7 +43,7 @@
const PylithScalar pylith::materials::DruckerPragerPlaneStrainTimeDepData::_pressureScale = 2.25000000e+10;
-const PylithScalar pylith::materials::DruckerPragerPlaneStrainTimeDepData::_densityScale = 1.00000000e+03;
+const PylithScalar pylith::materials::DruckerPragerPlaneStrainTimeDepData::_densityScale = 2.25000000e+04;
const PylithScalar pylith::materials::DruckerPragerPlaneStrainTimeDepData::_dtStableImplicit = 1.00000000e+99;
@@ -137,13 +137,13 @@
};
const PylithScalar pylith::materials::DruckerPragerPlaneStrainTimeDepData::_propertiesNondim[] = {
- 2.50000000e+00,
+ 1.11111111e-01,
1.00000000e+00,
1.00000000e+00,
2.30940108e-01,
1.60000000e-05,
1.48583084e-01,
- 2.00000000e+00,
+ 8.88888889e-02,
1.28000000e-01,
1.28000000e-01,
1.89338478e-01,
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticIsotropic3D.py
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticIsotropic3D.py 2013-03-06 02:43:29 UTC (rev 21452)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticIsotropic3D.py 2013-03-06 20:15:02 UTC (rev 21453)
@@ -75,7 +75,7 @@
self.lengthScale = 1.0e+3
self.pressureScale = muA
self.timeScale = 1.0
- self.densityScale = 1.0e+3
+ self.densityScale = muA / (self.lengthScale / self.timeScale)**2
self.dbProperties = numpy.array([ [densityA, vsA, vpA],
[densityB, vsB, vpB] ],
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticIsotropic3DData.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticIsotropic3DData.cc 2013-03-06 02:43:29 UTC (rev 21452)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticIsotropic3DData.cc 2013-03-06 20:15:02 UTC (rev 21453)
@@ -43,7 +43,7 @@
const PylithScalar pylith::materials::ElasticIsotropic3DData::_pressureScale = 2.25000000e+10;
-const PylithScalar pylith::materials::ElasticIsotropic3DData::_densityScale = 1.00000000e+03;
+const PylithScalar pylith::materials::ElasticIsotropic3DData::_densityScale = 2.25000000e+04;
const PylithScalar pylith::materials::ElasticIsotropic3DData::_dtStableImplicit = 1.00000000e+99;
@@ -88,10 +88,10 @@
const PylithScalar* pylith::materials::ElasticIsotropic3DData::_stateVars = 0;
const PylithScalar pylith::materials::ElasticIsotropic3DData::_propertiesNondim[] = {
- 2.50000000e+00,
+ 1.11111111e-01,
1.00000000e+00,
1.00000000e+00,
- 2.00000000e+00,
+ 8.88888889e-02,
1.28000000e-01,
1.28000000e-01,
};
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticPlaneStrain.py
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticPlaneStrain.py 2013-03-06 02:43:29 UTC (rev 21452)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticPlaneStrain.py 2013-03-06 20:15:02 UTC (rev 21453)
@@ -75,7 +75,7 @@
self.lengthScale = 1.0e+3
self.pressureScale = muA
self.timeScale = 1.0
- self.densityScale = 1.0e+3
+ self.densityScale = muA / (self.lengthScale / self.timeScale)**2
self.dbProperties = numpy.array([ [densityA, vsA, vpA],
[densityB, vsB, vpB] ],
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticPlaneStrainData.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticPlaneStrainData.cc 2013-03-06 02:43:29 UTC (rev 21452)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticPlaneStrainData.cc 2013-03-06 20:15:02 UTC (rev 21453)
@@ -43,7 +43,7 @@
const PylithScalar pylith::materials::ElasticPlaneStrainData::_pressureScale = 2.25000000e+10;
-const PylithScalar pylith::materials::ElasticPlaneStrainData::_densityScale = 1.00000000e+03;
+const PylithScalar pylith::materials::ElasticPlaneStrainData::_densityScale = 2.25000000e+04;
const PylithScalar pylith::materials::ElasticPlaneStrainData::_dtStableImplicit = 1.00000000e+99;
@@ -88,10 +88,10 @@
const PylithScalar* pylith::materials::ElasticPlaneStrainData::_stateVars = 0;
const PylithScalar pylith::materials::ElasticPlaneStrainData::_propertiesNondim[] = {
- 2.50000000e+00,
+ 1.11111111e-01,
1.00000000e+00,
1.00000000e+00,
- 2.00000000e+00,
+ 8.88888889e-02,
1.28000000e-01,
1.28000000e-01,
};
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticPlaneStress.py
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticPlaneStress.py 2013-03-06 02:43:29 UTC (rev 21452)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticPlaneStress.py 2013-03-06 20:15:02 UTC (rev 21453)
@@ -75,7 +75,7 @@
self.lengthScale = 1.0e+3
self.pressureScale = muA
self.timeScale = 1.0
- self.densityScale = 1.0e+3
+ self.densityScale = muA / (self.lengthScale / self.timeScale)**2
self.dbProperties = numpy.array([ [densityA, vsA, vpA],
[densityB, vsB, vpB] ],
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticPlaneStressData.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticPlaneStressData.cc 2013-03-06 02:43:29 UTC (rev 21452)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticPlaneStressData.cc 2013-03-06 20:15:02 UTC (rev 21453)
@@ -43,7 +43,7 @@
const PylithScalar pylith::materials::ElasticPlaneStressData::_pressureScale = 2.25000000e+10;
-const PylithScalar pylith::materials::ElasticPlaneStressData::_densityScale = 1.00000000e+03;
+const PylithScalar pylith::materials::ElasticPlaneStressData::_densityScale = 2.25000000e+04;
const PylithScalar pylith::materials::ElasticPlaneStressData::_dtStableImplicit = 1.00000000e+99;
@@ -88,10 +88,10 @@
const PylithScalar* pylith::materials::ElasticPlaneStressData::_stateVars = 0;
const PylithScalar pylith::materials::ElasticPlaneStressData::_propertiesNondim[] = {
- 2.50000000e+00,
+ 1.11111111e-01,
1.00000000e+00,
1.00000000e+00,
- 2.00000000e+00,
+ 8.88888889e-02,
1.28000000e-01,
1.28000000e-01,
};
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticStrain1D.py
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticStrain1D.py 2013-03-06 02:43:29 UTC (rev 21452)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticStrain1D.py 2013-03-06 20:15:02 UTC (rev 21453)
@@ -75,7 +75,7 @@
self.lengthScale = 1.0e+3
self.pressureScale = muA
self.timeScale = 1.0
- self.densityScale = 1.0e+3
+ self.densityScale = muA / (self.lengthScale / self.timeScale)**2
self.dbProperties = numpy.array([ [densityA, vsA, vpA],
[densityB, vsB, vpB] ],
@@ -119,7 +119,7 @@
self.stress = stress
self.elasticConsts = elasticConsts
- self.dtStableExplicit = 1000.0 / vpA
+ self.dtStableExplicit = (1000.0 / vpA) / self.timeScale
return
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticStrain1DData.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticStrain1DData.cc 2013-03-06 02:43:29 UTC (rev 21452)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticStrain1DData.cc 2013-03-06 20:15:02 UTC (rev 21453)
@@ -43,7 +43,7 @@
const PylithScalar pylith::materials::ElasticStrain1DData::_pressureScale = 2.25000000e+10;
-const PylithScalar pylith::materials::ElasticStrain1DData::_densityScale = 1.00000000e+03;
+const PylithScalar pylith::materials::ElasticStrain1DData::_densityScale = 2.25000000e+04;
const PylithScalar pylith::materials::ElasticStrain1DData::_dtStableImplicit = 1.00000000e+99;
@@ -88,10 +88,10 @@
const PylithScalar* pylith::materials::ElasticStrain1DData::_stateVars = 0;
const PylithScalar pylith::materials::ElasticStrain1DData::_propertiesNondim[] = {
- 2.50000000e+00,
+ 1.11111111e-01,
1.00000000e+00,
1.00000000e+00,
- 2.00000000e+00,
+ 8.88888889e-02,
1.28000000e-01,
1.28000000e-01,
};
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticStress1D.py
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticStress1D.py 2013-03-06 02:43:29 UTC (rev 21452)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticStress1D.py 2013-03-06 20:15:02 UTC (rev 21453)
@@ -75,7 +75,7 @@
self.lengthScale = 1.0e+3
self.pressureScale = muA
self.timeScale = 1.0
- self.densityScale = 1.0e+3
+ self.densityScale = muA / (self.lengthScale / self.timeScale)**2
self.dbProperties = numpy.array([ [densityA, vsA, vpA],
[densityB, vsB, vpB] ],
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticStress1DData.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticStress1DData.cc 2013-03-06 02:43:29 UTC (rev 21452)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticStress1DData.cc 2013-03-06 20:15:02 UTC (rev 21453)
@@ -43,7 +43,7 @@
const PylithScalar pylith::materials::ElasticStress1DData::_pressureScale = 2.25000000e+10;
-const PylithScalar pylith::materials::ElasticStress1DData::_densityScale = 1.00000000e+03;
+const PylithScalar pylith::materials::ElasticStress1DData::_densityScale = 2.25000000e+04;
const PylithScalar pylith::materials::ElasticStress1DData::_dtStableImplicit = 1.00000000e+99;
@@ -88,10 +88,10 @@
const PylithScalar* pylith::materials::ElasticStress1DData::_stateVars = 0;
const PylithScalar pylith::materials::ElasticStress1DData::_propertiesNondim[] = {
- 2.50000000e+00,
+ 1.11111111e-01,
1.00000000e+00,
1.00000000e+00,
- 2.00000000e+00,
+ 8.88888889e-02,
1.28000000e-01,
1.28000000e-01,
};
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellIsotropic3DElastic.py
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellIsotropic3DElastic.py 2013-03-06 02:43:29 UTC (rev 21452)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellIsotropic3DElastic.py 2013-03-06 20:15:02 UTC (rev 21453)
@@ -121,7 +121,7 @@
self.lengthScale = 1.0e+3
self.pressureScale = muA
self.timeScale = 1.0
- self.densityScale = 1.0e+3
+ self.densityScale = muA / (self.lengthScale / self.timeScale)**2
propA = [densityA, vsA, vpA] + shearRatioA + viscosityA
propB = [densityB, vsB, vpB] + shearRatioB + viscosityB
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellIsotropic3DElasticData.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellIsotropic3DElasticData.cc 2013-03-06 02:43:29 UTC (rev 21452)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellIsotropic3DElasticData.cc 2013-03-06 20:15:02 UTC (rev 21453)
@@ -43,7 +43,7 @@
const PylithScalar pylith::materials::GenMaxwellIsotropic3DElasticData::_pressureScale = 2.25000000e+10;
-const PylithScalar pylith::materials::GenMaxwellIsotropic3DElasticData::_densityScale = 1.00000000e+03;
+const PylithScalar pylith::materials::GenMaxwellIsotropic3DElasticData::_densityScale = 2.25000000e+04;
const PylithScalar pylith::materials::GenMaxwellIsotropic3DElasticData::_dtStableImplicit = 8.88888889e+06;
@@ -252,7 +252,7 @@
};
const PylithScalar pylith::materials::GenMaxwellIsotropic3DElasticData::_propertiesNondim[] = {
- 2.50000000e+00,
+ 1.11111111e-01,
1.00000000e+00,
1.00000000e+00,
5.00000000e-01,
@@ -261,7 +261,7 @@
8.88888889e+07,
4.44444444e+07,
2.22222222e+09,
- 2.00000000e+00,
+ 8.88888889e-02,
1.28000000e-01,
1.28000000e-01,
2.00000000e-01,
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellIsotropic3DTimeDep.py
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellIsotropic3DTimeDep.py 2013-03-06 02:43:29 UTC (rev 21452)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellIsotropic3DTimeDep.py 2013-03-06 20:15:02 UTC (rev 21453)
@@ -148,7 +148,7 @@
self.lengthScale = 1.0e+3
self.pressureScale = muA
self.timeScale = 1.0
- self.densityScale = 1.0e+3
+ self.densityScale = muA / (self.lengthScale / self.timeScale)**2
mu0 = self.pressureScale
density0 = self.densityScale
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellIsotropic3DTimeDepData.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellIsotropic3DTimeDepData.cc 2013-03-06 02:43:29 UTC (rev 21452)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellIsotropic3DTimeDepData.cc 2013-03-06 20:15:02 UTC (rev 21453)
@@ -43,7 +43,7 @@
const PylithScalar pylith::materials::GenMaxwellIsotropic3DTimeDepData::_pressureScale = 2.25000000e+10;
-const PylithScalar pylith::materials::GenMaxwellIsotropic3DTimeDepData::_densityScale = 1.00000000e+03;
+const PylithScalar pylith::materials::GenMaxwellIsotropic3DTimeDepData::_densityScale = 2.25000000e+04;
const PylithScalar pylith::materials::GenMaxwellIsotropic3DTimeDepData::_dtStableImplicit = 8.88888889e+06;
@@ -252,7 +252,7 @@
};
const PylithScalar pylith::materials::GenMaxwellIsotropic3DTimeDepData::_propertiesNondim[] = {
- 2.50000000e+00,
+ 1.11111111e-01,
1.00000000e+00,
1.00000000e+00,
5.00000000e-01,
@@ -261,7 +261,7 @@
8.88888889e+07,
4.44444444e+07,
2.22222222e+09,
- 2.00000000e+00,
+ 8.88888889e-02,
1.28000000e-01,
1.28000000e-01,
2.00000000e-01,
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellPlaneStrainElastic.py
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellPlaneStrainElastic.py 2013-03-06 02:43:29 UTC (rev 21452)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellPlaneStrainElastic.py 2013-03-06 20:15:02 UTC (rev 21453)
@@ -116,7 +116,7 @@
self.lengthScale = 1.0e+3
self.pressureScale = muA
self.timeScale = 1.0
- self.densityScale = 1.0e+3
+ self.densityScale = muA / (self.lengthScale / self.timeScale)**2
propA = [densityA, vsA, vpA] + shearRatioA + viscosityA
propB = [densityB, vsB, vpB] + shearRatioB + viscosityB
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellPlaneStrainElasticData.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellPlaneStrainElasticData.cc 2013-03-06 02:43:29 UTC (rev 21452)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellPlaneStrainElasticData.cc 2013-03-06 20:15:02 UTC (rev 21453)
@@ -43,7 +43,7 @@
const PylithScalar pylith::materials::GenMaxwellPlaneStrainElasticData::_pressureScale = 2.25000000e+10;
-const PylithScalar pylith::materials::GenMaxwellPlaneStrainElasticData::_densityScale = 1.00000000e+03;
+const PylithScalar pylith::materials::GenMaxwellPlaneStrainElasticData::_densityScale = 2.25000000e+04;
const PylithScalar pylith::materials::GenMaxwellPlaneStrainElasticData::_dtStableImplicit = 8.88888889e+06;
@@ -213,7 +213,7 @@
};
const PylithScalar pylith::materials::GenMaxwellPlaneStrainElasticData::_propertiesNondim[] = {
- 2.50000000e+00,
+ 1.11111111e-01,
1.00000000e+00,
1.00000000e+00,
5.00000000e-01,
@@ -222,7 +222,7 @@
8.88888889e+07,
4.44444444e+07,
2.22222222e+09,
- 2.00000000e+00,
+ 8.88888889e-02,
1.28000000e-01,
1.28000000e-01,
2.00000000e-01,
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellPlaneStrainTimeDep.py
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellPlaneStrainTimeDep.py 2013-03-06 02:43:29 UTC (rev 21452)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellPlaneStrainTimeDep.py 2013-03-06 20:15:02 UTC (rev 21453)
@@ -146,7 +146,7 @@
self.lengthScale = 1.0e+3
self.pressureScale = muA
self.timeScale = 1.0
- self.densityScale = 1.0e+3
+ self.densityScale = muA / (self.lengthScale / self.timeScale)**2
mu0 = self.pressureScale
density0 = self.densityScale
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellPlaneStrainTimeDepData.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellPlaneStrainTimeDepData.cc 2013-03-06 02:43:29 UTC (rev 21452)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellPlaneStrainTimeDepData.cc 2013-03-06 20:15:02 UTC (rev 21453)
@@ -43,7 +43,7 @@
const PylithScalar pylith::materials::GenMaxwellPlaneStrainTimeDepData::_pressureScale = 2.25000000e+10;
-const PylithScalar pylith::materials::GenMaxwellPlaneStrainTimeDepData::_densityScale = 1.00000000e+03;
+const PylithScalar pylith::materials::GenMaxwellPlaneStrainTimeDepData::_densityScale = 2.25000000e+04;
const PylithScalar pylith::materials::GenMaxwellPlaneStrainTimeDepData::_dtStableImplicit = 8.88888889e+06;
@@ -213,7 +213,7 @@
};
const PylithScalar pylith::materials::GenMaxwellPlaneStrainTimeDepData::_propertiesNondim[] = {
- 2.50000000e+00,
+ 1.11111111e-01,
1.00000000e+00,
1.00000000e+00,
5.00000000e-01,
@@ -222,7 +222,7 @@
8.88888889e+07,
4.44444444e+07,
2.22222222e+09,
- 2.00000000e+00,
+ 8.88888889e-02,
1.28000000e-01,
1.28000000e-01,
2.00000000e-01,
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellQpQsIsotropic3DElastic.py
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellQpQsIsotropic3DElastic.py 2013-03-06 02:43:29 UTC (rev 21452)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellQpQsIsotropic3DElastic.py 2013-03-06 20:15:02 UTC (rev 21453)
@@ -153,7 +153,7 @@
self.lengthScale = 1.0e+3
self.pressureScale = muA
self.timeScale = 1.0
- self.densityScale = 1.0e+3
+ self.densityScale = muA / (self.lengthScale / self.timeScale)**2
propA = [densityA, vsA, vpA] + shearRatioA + shearViscosityA + bulkRatioA + bulkViscosityA
propB = [densityB, vsB, vpB] + shearRatioB + shearViscosityB + bulkRatioB + bulkViscosityB
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellQpQsIsotropic3DElasticData.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellQpQsIsotropic3DElasticData.cc 2013-03-06 02:43:29 UTC (rev 21452)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellQpQsIsotropic3DElasticData.cc 2013-03-06 20:15:02 UTC (rev 21453)
@@ -43,7 +43,7 @@
const PylithScalar pylith::materials::GenMaxwellQpQsIsotropic3DElasticData::_pressureScale = 2.25000000e+10;
-const PylithScalar pylith::materials::GenMaxwellQpQsIsotropic3DElasticData::_densityScale = 1.00000000e+03;
+const PylithScalar pylith::materials::GenMaxwellQpQsIsotropic3DElasticData::_densityScale = 2.25000000e+04;
const PylithScalar pylith::materials::GenMaxwellQpQsIsotropic3DElasticData::_dtStableImplicit = 8.88888889e+05;
@@ -326,7 +326,7 @@
};
const PylithScalar pylith::materials::GenMaxwellQpQsIsotropic3DElasticData::_propertiesNondim[] = {
- 2.50000000e+00,
+ 1.11111111e-01,
1.00000000e+00,
1.66666667e+00,
5.00000000e-01,
@@ -341,7 +341,7 @@
5.33333333e+07,
5.33333333e+06,
5.33333333e+08,
- 2.00000000e+00,
+ 8.88888889e-02,
1.28000000e-01,
2.13333333e-01,
2.00000000e-01,
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellQpQsIsotropic3DTimeDep.py
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellQpQsIsotropic3DTimeDep.py 2013-03-06 02:43:29 UTC (rev 21452)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellQpQsIsotropic3DTimeDep.py 2013-03-06 20:15:02 UTC (rev 21453)
@@ -178,7 +178,7 @@
self.lengthScale = 1.0e+3
self.pressureScale = muA
self.timeScale = 1.0
- self.densityScale = 1.0e+3
+ self.densityScale = muA / (self.lengthScale / self.timeScale)**2
propA = [densityA, vsA, vpA] + shearRatioA + shearViscosityA + bulkRatioA + bulkViscosityA
propB = [densityB, vsB, vpB] + shearRatioB + shearViscosityB + bulkRatioB + bulkViscosityB
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellQpQsIsotropic3DTimeDepData.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellQpQsIsotropic3DTimeDepData.cc 2013-03-06 02:43:29 UTC (rev 21452)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellQpQsIsotropic3DTimeDepData.cc 2013-03-06 20:15:02 UTC (rev 21453)
@@ -43,7 +43,7 @@
const PylithScalar pylith::materials::GenMaxwellQpQsIsotropic3DTimeDepData::_pressureScale = 2.25000000e+10;
-const PylithScalar pylith::materials::GenMaxwellQpQsIsotropic3DTimeDepData::_densityScale = 1.00000000e+03;
+const PylithScalar pylith::materials::GenMaxwellQpQsIsotropic3DTimeDepData::_densityScale = 2.25000000e+04;
const PylithScalar pylith::materials::GenMaxwellQpQsIsotropic3DTimeDepData::_dtStableImplicit = 8.88888889e+05;
@@ -326,7 +326,7 @@
};
const PylithScalar pylith::materials::GenMaxwellQpQsIsotropic3DTimeDepData::_propertiesNondim[] = {
- 2.50000000e+00,
+ 1.11111111e-01,
1.00000000e+00,
1.66666667e+00,
5.00000000e-01,
@@ -341,7 +341,7 @@
1.33333333e+08,
1.77777778e+07,
5.33333333e+09,
- 2.00000000e+00,
+ 8.88888889e-02,
1.28000000e-01,
2.13333333e-01,
2.00000000e-01,
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellIsotropic3DElastic.py
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellIsotropic3DElastic.py 2013-03-06 02:43:29 UTC (rev 21452)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellIsotropic3DElastic.py 2013-03-06 20:15:02 UTC (rev 21453)
@@ -93,7 +93,7 @@
self.lengthScale = 1.0e+3
self.pressureScale = muA
self.timeScale = 1.0
- self.densityScale = 1.0e+3
+ self.densityScale = muA / (self.lengthScale / self.timeScale)**2
self.dbProperties = numpy.array([ [densityA, vsA, vpA, viscosityA],
[densityB, vsB, vpB, viscosityB] ],
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellIsotropic3DElasticData.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellIsotropic3DElasticData.cc 2013-03-06 02:43:29 UTC (rev 21452)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellIsotropic3DElasticData.cc 2013-03-06 20:15:02 UTC (rev 21453)
@@ -43,7 +43,7 @@
const PylithScalar pylith::materials::MaxwellIsotropic3DElasticData::_pressureScale = 2.25000000e+10;
-const PylithScalar pylith::materials::MaxwellIsotropic3DElasticData::_densityScale = 1.00000000e+03;
+const PylithScalar pylith::materials::MaxwellIsotropic3DElasticData::_densityScale = 2.25000000e+04;
const PylithScalar pylith::materials::MaxwellIsotropic3DElasticData::_dtStableImplicit = 8.88888889e+06;
@@ -160,11 +160,11 @@
};
const PylithScalar pylith::materials::MaxwellIsotropic3DElasticData::_propertiesNondim[] = {
- 2.50000000e+00,
+ 1.11111111e-01,
1.00000000e+00,
1.00000000e+00,
4.44444444e+07,
- 2.00000000e+00,
+ 8.88888889e-02,
1.28000000e-01,
1.28000000e-01,
3.47222222e+08,
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellIsotropic3DTimeDep.py
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellIsotropic3DTimeDep.py 2013-03-06 02:43:29 UTC (rev 21452)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellIsotropic3DTimeDep.py 2013-03-06 20:15:02 UTC (rev 21453)
@@ -105,7 +105,7 @@
self.lengthScale = 1.0e+3
self.pressureScale = muA
self.timeScale = 1.0
- self.densityScale = 1.0e+3
+ self.densityScale = muA / (self.lengthScale / self.timeScale)**2
self.dbProperties = numpy.array([ [densityA, vsA, vpA, viscosityA],
[densityB, vsB, vpB, viscosityB] ],
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellIsotropic3DTimeDepData.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellIsotropic3DTimeDepData.cc 2013-03-06 02:43:29 UTC (rev 21452)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellIsotropic3DTimeDepData.cc 2013-03-06 20:15:02 UTC (rev 21453)
@@ -43,7 +43,7 @@
const PylithScalar pylith::materials::MaxwellIsotropic3DTimeDepData::_pressureScale = 2.25000000e+10;
-const PylithScalar pylith::materials::MaxwellIsotropic3DTimeDepData::_densityScale = 1.00000000e+03;
+const PylithScalar pylith::materials::MaxwellIsotropic3DTimeDepData::_densityScale = 2.25000000e+04;
const PylithScalar pylith::materials::MaxwellIsotropic3DTimeDepData::_dtStableImplicit = 8.88888889e+06;
@@ -148,11 +148,11 @@
};
const PylithScalar pylith::materials::MaxwellIsotropic3DTimeDepData::_propertiesNondim[] = {
- 2.50000000e+00,
+ 1.11111111e-01,
1.00000000e+00,
1.00000000e+00,
4.44444444e+07,
- 2.00000000e+00,
+ 8.88888889e-02,
1.28000000e-01,
1.28000000e-01,
3.47222222e+09,
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellPlaneStrainElastic.py
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellPlaneStrainElastic.py 2013-03-06 02:43:29 UTC (rev 21452)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellPlaneStrainElastic.py 2013-03-06 20:15:02 UTC (rev 21453)
@@ -94,7 +94,7 @@
self.lengthScale = 1.0e+3
self.pressureScale = muA
self.timeScale = 1.0
- self.densityScale = 1.0e+3
+ self.densityScale = muA / (self.lengthScale / self.timeScale)**2
self.dbProperties = numpy.array([ [densityA, vsA, vpA, viscosityA],
[densityB, vsB, vpB, viscosityB] ],
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellPlaneStrainElasticData.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellPlaneStrainElasticData.cc 2013-03-06 02:43:29 UTC (rev 21452)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellPlaneStrainElasticData.cc 2013-03-06 20:15:02 UTC (rev 21453)
@@ -43,7 +43,7 @@
const PylithScalar pylith::materials::MaxwellPlaneStrainElasticData::_pressureScale = 2.25000000e+10;
-const PylithScalar pylith::materials::MaxwellPlaneStrainElasticData::_densityScale = 1.00000000e+03;
+const PylithScalar pylith::materials::MaxwellPlaneStrainElasticData::_densityScale = 2.25000000e+04;
const PylithScalar pylith::materials::MaxwellPlaneStrainElasticData::_dtStableImplicit = 8.88888889e+06;
@@ -141,11 +141,11 @@
};
const PylithScalar pylith::materials::MaxwellPlaneStrainElasticData::_propertiesNondim[] = {
- 2.50000000e+00,
+ 1.11111111e-01,
1.00000000e+00,
1.00000000e+00,
4.44444444e+07,
- 2.00000000e+00,
+ 8.88888889e-02,
1.28000000e-01,
1.28000000e-01,
3.47222222e+08,
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellPlaneStrainTimeDep.py
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellPlaneStrainTimeDep.py 2013-03-06 02:43:29 UTC (rev 21452)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellPlaneStrainTimeDep.py 2013-03-06 20:15:02 UTC (rev 21453)
@@ -105,7 +105,7 @@
self.lengthScale = 1.0e+3
self.pressureScale = muA
self.timeScale = 1.0
- self.densityScale = 1.0e+3
+ self.densityScale = muA / (self.lengthScale / self.timeScale)**2
self.dbProperties = numpy.array([ [densityA, vsA, vpA, viscosityA],
[densityB, vsB, vpB, viscosityB] ],
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellPlaneStrainTimeDepData.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellPlaneStrainTimeDepData.cc 2013-03-06 02:43:29 UTC (rev 21452)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellPlaneStrainTimeDepData.cc 2013-03-06 20:15:02 UTC (rev 21453)
@@ -43,7 +43,7 @@
const PylithScalar pylith::materials::MaxwellPlaneStrainTimeDepData::_pressureScale = 2.25000000e+10;
-const PylithScalar pylith::materials::MaxwellPlaneStrainTimeDepData::_densityScale = 1.00000000e+03;
+const PylithScalar pylith::materials::MaxwellPlaneStrainTimeDepData::_densityScale = 2.25000000e+04;
const PylithScalar pylith::materials::MaxwellPlaneStrainTimeDepData::_dtStableImplicit = 8.88888889e+06;
@@ -141,11 +141,11 @@
};
const PylithScalar pylith::materials::MaxwellPlaneStrainTimeDepData::_propertiesNondim[] = {
- 2.50000000e+00,
+ 1.11111111e-01,
1.00000000e+00,
1.00000000e+00,
4.44444444e+07,
- 2.00000000e+00,
+ 8.88888889e-02,
1.28000000e-01,
1.28000000e-01,
3.47222222e+09,
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLaw3DElastic.py
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLaw3DElastic.py 2013-03-06 02:43:29 UTC (rev 21452)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLaw3DElastic.py 2013-03-06 20:15:02 UTC (rev 21453)
@@ -112,7 +112,7 @@
self.lengthScale = 1.0e+3
self.pressureScale = muA
self.timeScale = 1.0
- self.densityScale = 1.0e+3
+ self.densityScale = muA / (self.lengthScale / self.timeScale)**2
self.strainRateScale = 1.0/self.timeScale
self.dbProperties = numpy.array([ [densityA, vsA, vpA, \
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLaw3DElasticData.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLaw3DElasticData.cc 2013-03-06 02:43:29 UTC (rev 21452)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLaw3DElasticData.cc 2013-03-06 20:15:02 UTC (rev 21453)
@@ -43,7 +43,7 @@
const PylithScalar pylith::materials::PowerLaw3DElasticData::_pressureScale = 2.25000000e+10;
-const PylithScalar pylith::materials::PowerLaw3DElasticData::_densityScale = 1.00000000e+03;
+const PylithScalar pylith::materials::PowerLaw3DElasticData::_densityScale = 2.25000000e+04;
const PylithScalar pylith::materials::PowerLaw3DElasticData::_dtStableImplicit = 4.44444444e+06;
@@ -172,13 +172,13 @@
};
const PylithScalar pylith::materials::PowerLaw3DElasticData::_propertiesNondim[] = {
- 2.50000000e+00,
+ 1.11111111e-01,
1.00000000e+00,
1.00000000e+00,
1.00000000e-06,
8.88888889e+01,
1.00000000e+00,
- 2.00000000e+00,
+ 8.88888889e-02,
1.28000000e-01,
1.28000000e-01,
1.00000000e-06,
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLaw3DTimeDep.py
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLaw3DTimeDep.py 2013-03-06 02:43:29 UTC (rev 21452)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLaw3DTimeDep.py 2013-03-06 20:15:02 UTC (rev 21453)
@@ -115,7 +115,7 @@
self.lengthScale = 1.0e+3
self.pressureScale = muA
self.timeScale = 1.0
- self.densityScale = 1.0e+3
+ self.densityScale = muA / (self.lengthScale / self.timeScale)**2
self.strainRateScale = 1.0/self.timeScale
self.dbProperties = numpy.array([ [densityA, vsA, vpA, \
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLaw3DTimeDepData.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLaw3DTimeDepData.cc 2013-03-06 02:43:29 UTC (rev 21452)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLaw3DTimeDepData.cc 2013-03-06 20:15:02 UTC (rev 21453)
@@ -43,7 +43,7 @@
const PylithScalar pylith::materials::PowerLaw3DTimeDepData::_pressureScale = 2.25000000e+10;
-const PylithScalar pylith::materials::PowerLaw3DTimeDepData::_densityScale = 1.00000000e+03;
+const PylithScalar pylith::materials::PowerLaw3DTimeDepData::_densityScale = 2.25000000e+04;
const PylithScalar pylith::materials::PowerLaw3DTimeDepData::_dtStableImplicit = 4.44444444e+06;
@@ -160,13 +160,13 @@
};
const PylithScalar pylith::materials::PowerLaw3DTimeDepData::_propertiesNondim[] = {
- 2.50000000e+00,
+ 1.11111111e-01,
1.00000000e+00,
1.00000000e+00,
1.00000000e-06,
8.88888889e+01,
1.00000000e+00,
- 2.00000000e+00,
+ 8.88888889e-02,
1.28000000e-01,
1.28000000e-01,
1.00000000e-06,
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLawPlaneStrainElastic.py
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLawPlaneStrainElastic.py 2013-03-06 02:43:29 UTC (rev 21452)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLawPlaneStrainElastic.py 2013-03-06 20:15:02 UTC (rev 21453)
@@ -111,7 +111,7 @@
self.lengthScale = 1.0e+3
self.pressureScale = muA
self.timeScale = 1.0
- self.densityScale = 1.0e+3
+ self.densityScale = muA / (self.lengthScale / self.timeScale)**2
self.strainRateScale = 1.0/self.timeScale
self.dbProperties = numpy.array([ [densityA, vsA, vpA, \
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLawPlaneStrainElasticData.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLawPlaneStrainElasticData.cc 2013-03-06 02:43:29 UTC (rev 21452)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLawPlaneStrainElasticData.cc 2013-03-06 20:15:02 UTC (rev 21453)
@@ -43,7 +43,7 @@
const PylithScalar pylith::materials::PowerLawPlaneStrainElasticData::_pressureScale = 2.25000000e+10;
-const PylithScalar pylith::materials::PowerLawPlaneStrainElasticData::_densityScale = 1.00000000e+03;
+const PylithScalar pylith::materials::PowerLawPlaneStrainElasticData::_densityScale = 2.25000000e+04;
const PylithScalar pylith::materials::PowerLawPlaneStrainElasticData::_dtStableImplicit = 4.09893495e+06;
@@ -158,13 +158,13 @@
};
const PylithScalar pylith::materials::PowerLawPlaneStrainElasticData::_propertiesNondim[] = {
- 2.50000000e+00,
+ 1.11111111e-01,
1.00000000e+00,
1.00000000e+00,
1.00000000e-06,
8.88888889e+01,
1.00000000e+00,
- 2.00000000e+00,
+ 8.88888889e-02,
1.28000000e-01,
1.28000000e-01,
1.00000000e-06,
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLawPlaneStrainTimeDep.py
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLawPlaneStrainTimeDep.py 2013-03-06 02:43:29 UTC (rev 21452)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLawPlaneStrainTimeDep.py 2013-03-06 20:15:02 UTC (rev 21453)
@@ -113,7 +113,7 @@
self.lengthScale = 1.0e+3
self.pressureScale = muA
self.timeScale = 1.0
- self.densityScale = 1.0e+3
+ self.densityScale = muA / (self.lengthScale / self.timeScale)**2
self.strainRateScale = 1.0/self.timeScale
self.dbProperties = numpy.array([ [densityA, vsA, vpA, \
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLawPlaneStrainTimeDepData.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLawPlaneStrainTimeDepData.cc 2013-03-06 02:43:29 UTC (rev 21452)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/PowerLawPlaneStrainTimeDepData.cc 2013-03-06 20:15:02 UTC (rev 21453)
@@ -43,7 +43,7 @@
const PylithScalar pylith::materials::PowerLawPlaneStrainTimeDepData::_pressureScale = 2.25000000e+10;
-const PylithScalar pylith::materials::PowerLawPlaneStrainTimeDepData::_densityScale = 1.00000000e+03;
+const PylithScalar pylith::materials::PowerLawPlaneStrainTimeDepData::_densityScale = 2.25000000e+04;
const PylithScalar pylith::materials::PowerLawPlaneStrainTimeDepData::_dtStableImplicit = 4.44444444e+06;
@@ -146,13 +146,13 @@
};
const PylithScalar pylith::materials::PowerLawPlaneStrainTimeDepData::_propertiesNondim[] = {
- 2.50000000e+00,
+ 1.11111111e-01,
1.00000000e+00,
1.00000000e+00,
1.00000000e-06,
8.88888889e+01,
1.00000000e+00,
- 2.00000000e+00,
+ 8.88888889e-02,
1.28000000e-01,
1.28000000e-01,
1.00000000e-06,
More information about the CIG-COMMITS
mailing list