[cig-commits] r12555 - in short/3D/PyLith/trunk/unittests/libtests/materials: . data
willic3 at geodynamics.org
willic3 at geodynamics.org
Wed Aug 6 14:06:16 PDT 2008
Author: willic3
Date: 2008-08-06 14:06:16 -0700 (Wed, 06 Aug 2008)
New Revision: 12555
Modified:
short/3D/PyLith/trunk/unittests/libtests/materials/TestElasticIsotropic3D.cc
short/3D/PyLith/trunk/unittests/libtests/materials/TestElasticMaterial.cc
short/3D/PyLith/trunk/unittests/libtests/materials/TestElasticPlaneStrain.cc
short/3D/PyLith/trunk/unittests/libtests/materials/TestElasticPlaneStress.cc
short/3D/PyLith/trunk/unittests/libtests/materials/TestElasticStrain1D.cc
short/3D/PyLith/trunk/unittests/libtests/materials/TestElasticStress1D.cc
short/3D/PyLith/trunk/unittests/libtests/materials/TestGenMaxwellIsotropic3D.cc
short/3D/PyLith/trunk/unittests/libtests/materials/TestMaxwellIsotropic3D.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/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
Log:
Updated to test initialState.
Tests could probably be more thorough.
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/TestElasticIsotropic3D.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/TestElasticIsotropic3D.cc 2008-08-06 21:04:45 UTC (rev 12554)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/TestElasticIsotropic3D.cc 2008-08-06 21:06:16 UTC (rev 12555)
@@ -64,7 +64,7 @@
double_array initialState(initialStateSize);
for (int i=0; i < tensorSize; ++i) {
totalStrain[i] = i;
- initialState[i] = 0;
+ initialState[i] = 0.1*i;
} // for
material._updateProperties(¶meters[0], numParams, &totalStrain[0],
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/TestElasticMaterial.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/TestElasticMaterial.cc 2008-08-06 21:04:45 UTC (rev 12554)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/TestElasticMaterial.cc 2008-08-06 21:06:16 UTC (rev 12555)
@@ -143,8 +143,14 @@
const int strainSize = material._tensorSize;
double_array strain(data.strain, numQuadPts*strainSize);
- material._initialState = NULL;
- material._initialStateSize = material._tensorSize;
+ const int initialStateSize = material._tensorSize;
+ material._initialStateSize = initialStateSize;
+ const int initialStateFiberDim = numQuadPts * initialStateSize;
+ material._initialState = new real_section_type(mesh->comm(), mesh->debug());
+ material._initialState->setChart(mesh->getSieve()->getChart());
+ material._initialState->setFiberDimension(cells, initialStateFiberDim);
+ mesh->allocate(material._initialState);
+ material._initialState->updatePoint(*c_iter, data.initialState);
material.getPropertiesCell(*c_iter, numQuadPts);
const double_array& stress = material.calcStress(strain);
@@ -217,8 +223,13 @@
const int strainSize = material._tensorSize;
double_array strain(data.strain, numQuadPts*strainSize);
- material._initialState = NULL;
- material._initialStateSize = material._tensorSize;
+ const int initialStateSize = material._tensorSize;
+ material._initialStateSize = initialStateSize;
+ const int initialStateFiberDim = numQuadPts * initialStateSize;
+ material._initialState = new real_section_type(mesh->comm(), mesh->debug());
+ material._initialState->setChart(mesh->getSieve()->getChart());
+ material._initialState->setFiberDimension(cells, initialStateFiberDim);
+ mesh->allocate(material._initialState);
material.getPropertiesCell(*c_iter, numQuadPts);
const double_array& elasticConsts = material.calcDerivElastic(strain);
@@ -283,8 +294,13 @@
const int numParams = data.numParameters;
const int numParamsQuadPt = data.numParamsQuadPt;
- material._initialState = NULL;
- material._initialStateSize = material._tensorSize;
+ const int initialStateSize = material._tensorSize;
+ material._initialStateSize = initialStateSize;
+ const int initialStateFiberDim = numQuadPts * initialStateSize;
+ material._initialState = new real_section_type(mesh->comm(), mesh->debug());
+ material._initialState->setChart(mesh->getSieve()->getChart());
+ material._initialState->setFiberDimension(cells, initialStateFiberDim);
+ mesh->allocate(material._initialState);
Mesh::label_sequence::iterator c_iter = cells->begin();
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/TestElasticPlaneStrain.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/TestElasticPlaneStrain.cc 2008-08-06 21:04:45 UTC (rev 12554)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/TestElasticPlaneStrain.cc 2008-08-06 21:06:16 UTC (rev 12555)
@@ -64,7 +64,7 @@
double_array initialState(initialStateSize);
for (int i=0; i < tensorSize; ++i) {
totalStrain[i] = i;
- initialState[i] = 0;
+ initialState[i] = 0.1*i;
} // for
material._updateProperties(¶meters[0], numParams, &totalStrain[0],
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/TestElasticPlaneStress.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/TestElasticPlaneStress.cc 2008-08-06 21:04:45 UTC (rev 12554)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/TestElasticPlaneStress.cc 2008-08-06 21:06:16 UTC (rev 12555)
@@ -64,7 +64,7 @@
double_array initialState(initialStateSize);
for (int i=0; i < tensorSize; ++i) {
totalStrain[i] = i;
- initialState[i] = 0;
+ initialState[i] = 0.1*i;
} // for
material._updateProperties(¶meters[0], numParams, &totalStrain[0],
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/TestElasticStrain1D.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/TestElasticStrain1D.cc 2008-08-06 21:04:45 UTC (rev 12554)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/TestElasticStrain1D.cc 2008-08-06 21:06:16 UTC (rev 12555)
@@ -64,7 +64,7 @@
double_array totalStrain(tensorSize);
for (int i=0; i < tensorSize; ++i) {
totalStrain[i] = i;
- initialState[i] = 0;
+ initialState[i] = 0.1*i;
} // for
material._updateProperties(¶meters[0], numParams, &totalStrain[0],
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/TestElasticStress1D.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/TestElasticStress1D.cc 2008-08-06 21:04:45 UTC (rev 12554)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/TestElasticStress1D.cc 2008-08-06 21:06:16 UTC (rev 12555)
@@ -64,7 +64,7 @@
double_array initialState(initialStateSize);
for (int i=0; i < tensorSize; ++i) {
totalStrain[i] = i;
- initialState[i] = i;
+ initialState[i] = 0.1*i;
} // for
material._updateProperties(¶meters[0], numParams, &totalStrain[0],
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/TestGenMaxwellIsotropic3D.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/TestGenMaxwellIsotropic3D.cc 2008-08-06 21:04:45 UTC (rev 12554)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/TestGenMaxwellIsotropic3D.cc 2008-08-06 21:06:16 UTC (rev 12555)
@@ -125,7 +125,7 @@
double_array initialState(initialStateSize);
for (int i=0; i < tensorSize; ++i) {
totalStrain[i] = i;
- initialState[i] = 0;
+ initialState[i] = 0.1*i;
} // for
const double meanStrain =
@@ -231,7 +231,7 @@
visStrainT[i] = totalStrainTpdt[i] / 4.0;
visStrainT[i + tensorSize] = totalStrainTpdt[i] / 4.0;
visStrainT[i + 2 * tensorSize] = totalStrainTpdt[i] / 4.0;
- initialState[i] = 0;
+ initialState[i] = 0.1*i;
} // for
const double meanStrainTpdt =
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/TestMaxwellIsotropic3D.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/TestMaxwellIsotropic3D.cc 2008-08-06 21:04:45 UTC (rev 12554)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/TestMaxwellIsotropic3D.cc 2008-08-06 21:06:16 UTC (rev 12555)
@@ -125,7 +125,7 @@
double_array initialState(initialStateSize);
for (int i=0; i < tensorSize; ++i) {
totalStrain[i] = i;
- initialState[i] = 0;
+ initialState[i] = 0.1*i;
} // for
const double meanStrain =
@@ -219,7 +219,7 @@
totalStrainTpdt[i] = i;
totalStrainT[i] = totalStrainTpdt[i] / 2.0;
visStrainT[i] = totalStrainTpdt[i] / 4.0;
- initialState[i] = 0;
+ initialState[i] = 0.1*i;
} // for
const double meanStrainTpdt =
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticIsotropic3D.py
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticIsotropic3D.py 2008-08-06 21:04:45 UTC (rev 12554)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticIsotropic3D.py 2008-08-06 21:06:16 UTC (rev 12555)
@@ -50,13 +50,13 @@
vsA = 3000.0
vpA = vsA*3**0.5
strainA = [1.1e-4, 2.2e-4, 3.3e-4, 4.4e-4, 5.5e-4, 6.6e-4]
- initialStateA = [0.0, 0.0, 0.0, 0.0, 0.0, 0.0]
+ initialStateA = [1.2e4, 2.3e4, 3.4e4, 4.5e4, 5.6e4, 6.7e4]
densityB = 2000.0
vsB = 1200.0
vpB = vsB*3**0.5
strainB = [1.2e-4, 2.3e-4, 3.4e-4, 4.5e-4, 5.6e-4, 6.7e-4]
- initialStateB = [0.0, 0.0, 0.0, 0.0, 0.0, 0.0]
+ initialStateB = [2.1e4, 3.2e4, 4.3e4, 5.4e4, 6.5e4, 7.6e4]
self.dbData = 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 2008-08-06 21:04:45 UTC (rev 12554)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticIsotropic3DData.cc 2008-08-06 21:06:16 UTC (rev 12555)
@@ -60,18 +60,18 @@
};
const double pylith::materials::ElasticIsotropic3DData::_initialStateDBData[] = {
- 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.20000000e+04,
+ 2.30000000e+04,
+ 3.40000000e+04,
+ 4.50000000e+04,
+ 5.60000000e+04,
+ 6.70000000e+04,
+ 2.10000000e+04,
+ 3.20000000e+04,
+ 4.30000000e+04,
+ 5.40000000e+04,
+ 6.50000000e+04,
+ 7.60000000e+04,
};
const double pylith::materials::ElasticIsotropic3DData::_parameterData[] = {
@@ -84,18 +84,18 @@
};
const double pylith::materials::ElasticIsotropic3DData::_initialState[] = {
- 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.20000000e+04,
+ 2.30000000e+04,
+ 3.40000000e+04,
+ 4.50000000e+04,
+ 5.60000000e+04,
+ 6.70000000e+04,
+ 2.10000000e+04,
+ 3.20000000e+04,
+ 4.30000000e+04,
+ 5.40000000e+04,
+ 6.50000000e+04,
+ 7.60000000e+04,
};
const double pylith::materials::ElasticIsotropic3DData::_density[] = {
@@ -119,18 +119,18 @@
};
const double pylith::materials::ElasticIsotropic3DData::_stress[] = {
- 1.98000000e+07,
- 2.47500000e+07,
- 2.97000000e+07,
- 1.98000000e+07,
- 2.47500000e+07,
- 2.97000000e+07,
- 2.67840000e+06,
- 3.31200000e+06,
- 3.94560000e+06,
- 2.59200000e+06,
- 3.22560000e+06,
- 3.85920000e+06,
+ 1.98120000e+07,
+ 2.47730000e+07,
+ 2.97340000e+07,
+ 1.98450000e+07,
+ 2.48060000e+07,
+ 2.97670000e+07,
+ 2.69940000e+06,
+ 3.34400000e+06,
+ 3.98860000e+06,
+ 2.64600000e+06,
+ 3.29060000e+06,
+ 3.93520000e+06,
};
const double pylith::materials::ElasticIsotropic3DData::_elasticConsts[] = {
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticPlaneStrain.py
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticPlaneStrain.py 2008-08-06 21:04:45 UTC (rev 12554)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticPlaneStrain.py 2008-08-06 21:06:16 UTC (rev 12555)
@@ -49,13 +49,13 @@
vsA = 3000.0
vpA = vsA*3**0.5
strainA = [1.1e-4, 2.2e-4, 3.3e-4]
- initialStateA = [0.0, 0.0, 0.0]
+ initialStateA = [1.2e4, 2.1e4, 3.2e4]
densityB = 2000.0
vsB = 1200.0
vpB = vsB*3**0.5
strainB = [1.2e-4, 2.3e-4, 3.4e-4]
- initialStateB = [0.0, 0.0, 0.0]
+ initialStateB = [2.1e4, 3.2e4, 4.3e4]
self.dbData = 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 2008-08-06 21:04:45 UTC (rev 12554)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticPlaneStrainData.cc 2008-08-06 21:06:16 UTC (rev 12555)
@@ -57,12 +57,12 @@
};
const double pylith::materials::ElasticPlaneStrainData::_initialStateDBData[] = {
- 0.00000000e+00,
- 0.00000000e+00,
- 0.00000000e+00,
- 0.00000000e+00,
- 0.00000000e+00,
- 0.00000000e+00,
+ 1.20000000e+04,
+ 2.10000000e+04,
+ 3.20000000e+04,
+ 2.10000000e+04,
+ 3.20000000e+04,
+ 4.30000000e+04,
};
const double pylith::materials::ElasticPlaneStrainData::_parameterData[] = {
@@ -75,12 +75,12 @@
};
const double pylith::materials::ElasticPlaneStrainData::_initialState[] = {
- 0.00000000e+00,
- 0.00000000e+00,
- 0.00000000e+00,
- 0.00000000e+00,
- 0.00000000e+00,
- 0.00000000e+00,
+ 1.20000000e+04,
+ 2.10000000e+04,
+ 3.20000000e+04,
+ 2.10000000e+04,
+ 3.20000000e+04,
+ 4.30000000e+04,
};
const double pylith::materials::ElasticPlaneStrainData::_density[] = {
@@ -98,12 +98,12 @@
};
const double pylith::materials::ElasticPlaneStrainData::_stress[] = {
- 1.23750000e+07,
- 1.73250000e+07,
- 1.48500000e+07,
- 1.69920000e+06,
- 2.33280000e+06,
- 1.95840000e+06,
+ 1.23870000e+07,
+ 1.73460000e+07,
+ 1.48820000e+07,
+ 1.72020000e+06,
+ 2.36480000e+06,
+ 2.00140000e+06,
};
const double pylith::materials::ElasticPlaneStrainData::_elasticConsts[] = {
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticPlaneStress.py
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticPlaneStress.py 2008-08-06 21:04:45 UTC (rev 12554)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticPlaneStress.py 2008-08-06 21:06:16 UTC (rev 12555)
@@ -49,13 +49,13 @@
vsA = 3000.0
vpA = vsA*3**0.5
strainA = [1.1e-4, 2.2e-4, 3.3e-4]
- initialStateA = [0.0, 0.0, 0.0]
+ initialStateA = [1.2e4, 2.3e4, 3.2e4]
densityB = 2000.0
vsB = 1200.0
vpB = vsB*3**0.5
strainB = [1.2e-4, 2.3e-4, 3.4e-4]
- initialStateB = [0.0, 0.0, 0.0]
+ initialStateB = [2.1e4, 3.2e4, 4.3e4]
self.dbData = 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 2008-08-06 21:04:45 UTC (rev 12554)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticPlaneStressData.cc 2008-08-06 21:06:16 UTC (rev 12555)
@@ -57,12 +57,12 @@
};
const double pylith::materials::ElasticPlaneStressData::_initialStateDBData[] = {
- 0.00000000e+00,
- 0.00000000e+00,
- 0.00000000e+00,
- 0.00000000e+00,
- 0.00000000e+00,
- 0.00000000e+00,
+ 1.20000000e+04,
+ 2.30000000e+04,
+ 3.20000000e+04,
+ 2.10000000e+04,
+ 3.20000000e+04,
+ 4.30000000e+04,
};
const double pylith::materials::ElasticPlaneStressData::_parameterData[] = {
@@ -75,12 +75,12 @@
};
const double pylith::materials::ElasticPlaneStressData::_initialState[] = {
- 0.00000000e+00,
- 0.00000000e+00,
- 0.00000000e+00,
- 0.00000000e+00,
- 0.00000000e+00,
- 0.00000000e+00,
+ 1.20000000e+04,
+ 2.30000000e+04,
+ 3.20000000e+04,
+ 2.10000000e+04,
+ 3.20000000e+04,
+ 4.30000000e+04,
};
const double pylith::materials::ElasticPlaneStressData::_density[] = {
@@ -98,12 +98,12 @@
};
const double pylith::materials::ElasticPlaneStressData::_stress[] = {
- 9.90000000e+06,
- 1.48500000e+07,
- 1.48500000e+07,
- 1.36320000e+06,
- 1.99680000e+06,
- 1.95840000e+06,
+ 9.91200000e+06,
+ 1.48730000e+07,
+ 1.48820000e+07,
+ 1.38420000e+06,
+ 2.02880000e+06,
+ 2.00140000e+06,
};
const double pylith::materials::ElasticPlaneStressData::_elasticConsts[] = {
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticStrain1D.py
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticStrain1D.py 2008-08-06 21:04:45 UTC (rev 12554)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticStrain1D.py 2008-08-06 21:06:16 UTC (rev 12555)
@@ -49,13 +49,13 @@
vsA = 3000.0
vpA = vsA*3**0.5
strainA = [1.1e-4]
- initialStateA = [0.0]
+ initialStateA = [1.2e4]
densityB = 2000.0
vsB = 1200.0
vpB = vsB*3**0.5
strainB = [1.2e-4]
- initialStateB = [0.0]
+ initialStateB = [2.1e4]
self.dbData = numpy.array([ [densityA, vsA, vpA],
[densityB, vsB, vpB] ],
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticStrain1DData.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticStrain1DData.cc 2008-08-06 21:04:45 UTC (rev 12554)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticStrain1DData.cc 2008-08-06 21:06:16 UTC (rev 12555)
@@ -55,8 +55,8 @@
};
const double pylith::materials::ElasticStrain1DData::_initialStateDBData[] = {
- 0.00000000e+00,
- 0.00000000e+00,
+ 1.20000000e+04,
+ 2.10000000e+04,
};
const double pylith::materials::ElasticStrain1DData::_parameterData[] = {
@@ -69,8 +69,8 @@
};
const double pylith::materials::ElasticStrain1DData::_initialState[] = {
- 0.00000000e+00,
- 0.00000000e+00,
+ 1.20000000e+04,
+ 2.10000000e+04,
};
const double pylith::materials::ElasticStrain1DData::_density[] = {
@@ -84,8 +84,8 @@
};
const double pylith::materials::ElasticStrain1DData::_stress[] = {
- 7.42500000e+06,
- 1.03680000e+06,
+ 7.43700000e+06,
+ 1.05780000e+06,
};
const double pylith::materials::ElasticStrain1DData::_elasticConsts[] = {
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticStress1D.py
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticStress1D.py 2008-08-06 21:04:45 UTC (rev 12554)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticStress1D.py 2008-08-06 21:06:16 UTC (rev 12555)
@@ -49,13 +49,13 @@
vsA = 3000.0
vpA = vsA*3**0.5
strainA = [1.1e-4]
- initialStateA = [0.0]
+ initialStateA = [1.2e4]
densityB = 2000.0
vsB = 1200.0
vpB = vsB*3**0.5
strainB = [1.2e-4]
- initialStateB = [0.0]
+ initialStateB = [2.1e4]
self.dbData = 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 2008-08-06 21:04:45 UTC (rev 12554)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/ElasticStress1DData.cc 2008-08-06 21:06:16 UTC (rev 12555)
@@ -55,8 +55,8 @@
};
const double pylith::materials::ElasticStress1DData::_initialStateDBData[] = {
- 0.00000000e+00,
- 0.00000000e+00,
+ 1.20000000e+04,
+ 2.10000000e+04,
};
const double pylith::materials::ElasticStress1DData::_parameterData[] = {
@@ -69,8 +69,8 @@
};
const double pylith::materials::ElasticStress1DData::_initialState[] = {
- 0.00000000e+00,
- 0.00000000e+00,
+ 1.20000000e+04,
+ 2.10000000e+04,
};
const double pylith::materials::ElasticStress1DData::_density[] = {
@@ -84,8 +84,8 @@
};
const double pylith::materials::ElasticStress1DData::_stress[] = {
- 6.18750000e+06,
- 8.64000000e+05,
+ 6.19950000e+06,
+ 8.85000000e+05,
};
const double pylith::materials::ElasticStress1DData::_elasticConsts[] = {
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellIsotropic3DElastic.py
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellIsotropic3DElastic.py 2008-08-06 21:04:45 UTC (rev 12554)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellIsotropic3DElastic.py 2008-08-06 21:06:16 UTC (rev 12555)
@@ -71,7 +71,7 @@
lambdaA = vpA*vpA*densityA - 2.0*muA
elasDataA = [densityA, vsA, vpA]
matDbA = elasDataA + shearRatioA + viscosityA
- initialStateA = [0.0, 0.0, 0.0, 0.0, 0.0, 0.0]
+ initialStateA = [1.2e4, 2.3e4, 3.4e4, 4.5e4, 5.6e4, 6.7e4]
densityB = 2000.0
vsB = 1200.0
@@ -87,7 +87,7 @@
lambdaB = vpB*vpB*densityB - 2.0*muB
elasDataB = [densityB, vsB, vpB]
matDbB = elasDataB + shearRatioB + viscosityB
- initialStateB = [0.0, 0.0, 0.0, 0.0, 0.0, 0.0]
+ initialStateB = [2.1e4, 3.2e4, 4.3e4, 5.4e4, 6.5e4, 7.6e4]
matDb = matDbA + matDbB
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellIsotropic3DElasticData.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellIsotropic3DElasticData.cc 2008-08-06 21:04:45 UTC (rev 12554)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellIsotropic3DElasticData.cc 2008-08-06 21:06:16 UTC (rev 12555)
@@ -82,18 +82,18 @@
};
const double pylith::materials::GenMaxwellIsotropic3DElasticData::_initialStateDBData[] = {
- 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.20000000e+04,
+ 2.30000000e+04,
+ 3.40000000e+04,
+ 4.50000000e+04,
+ 5.60000000e+04,
+ 6.70000000e+04,
+ 2.10000000e+04,
+ 3.20000000e+04,
+ 4.30000000e+04,
+ 5.40000000e+04,
+ 6.50000000e+04,
+ 7.60000000e+04,
};
const double pylith::materials::GenMaxwellIsotropic3DElasticData::_parameterData[] = {
@@ -166,18 +166,18 @@
};
const double pylith::materials::GenMaxwellIsotropic3DElasticData::_initialState[] = {
- 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.20000000e+04,
+ 2.30000000e+04,
+ 3.40000000e+04,
+ 4.50000000e+04,
+ 5.60000000e+04,
+ 6.70000000e+04,
+ 2.10000000e+04,
+ 3.20000000e+04,
+ 4.30000000e+04,
+ 5.40000000e+04,
+ 6.50000000e+04,
+ 7.60000000e+04,
};
const double pylith::materials::GenMaxwellIsotropic3DElasticData::_density[] = {
@@ -201,18 +201,18 @@
};
const double pylith::materials::GenMaxwellIsotropic3DElasticData::_stress[] = {
- 1.98000000e+07,
- 2.47500000e+07,
- 2.97000000e+07,
- 1.98000000e+07,
- 2.47500000e+07,
- 2.97000000e+07,
- 2.67840000e+06,
- 3.31200000e+06,
- 3.94560000e+06,
- 2.59200000e+06,
- 3.22560000e+06,
- 3.85920000e+06,
+ 1.98120000e+07,
+ 2.47730000e+07,
+ 2.97340000e+07,
+ 1.98450000e+07,
+ 2.48060000e+07,
+ 2.97670000e+07,
+ 2.69940000e+06,
+ 3.34400000e+06,
+ 3.98860000e+06,
+ 2.64600000e+06,
+ 3.29060000e+06,
+ 3.93520000e+06,
};
const double pylith::materials::GenMaxwellIsotropic3DElasticData::_elasticConsts[] = {
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellIsotropic3DTimeDep.py
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellIsotropic3DTimeDep.py 2008-08-06 21:04:45 UTC (rev 12554)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellIsotropic3DTimeDep.py 2008-08-06 21:06:16 UTC (rev 12555)
@@ -75,7 +75,7 @@
matDbA = elasDataA + shearRatioA + viscosityA
muA = vsA*vsA*densityA
lambdaA = vpA*vpA*densityA - 2.0*muA
- initialStateA = [0.0, 0.0, 0.0, 0.0, 0.0, 0.0]
+ initialStateA = [1.2e4, 2.3e4, 3.4e4, 4.5e4, 5.6e4, 6.7e4]
densityB = 2000.0
vsB = 1200.0
@@ -91,7 +91,7 @@
matDbB = elasDataB + shearRatioB + viscosityB
muB = vsB*vsB*densityB
lambdaB = vpB*vpB*densityB - 2.0*muB
- initialStateB = [0.0, 0.0, 0.0, 0.0, 0.0, 0.0]
+ initialStateB = [2.1e4, 3.2e4, 4.3e4, 5.4e4, 6.5e4, 7.6e4]
matDb = matDbA + matDbB
self.dbData = numpy.array(matDb, dtype=numpy.float64)
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellIsotropic3DTimeDepData.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellIsotropic3DTimeDepData.cc 2008-08-06 21:04:45 UTC (rev 12554)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/GenMaxwellIsotropic3DTimeDepData.cc 2008-08-06 21:06:16 UTC (rev 12555)
@@ -82,18 +82,18 @@
};
const double pylith::materials::GenMaxwellIsotropic3DTimeDepData::_initialStateDBData[] = {
- 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.20000000e+04,
+ 2.30000000e+04,
+ 3.40000000e+04,
+ 4.50000000e+04,
+ 5.60000000e+04,
+ 6.70000000e+04,
+ 2.10000000e+04,
+ 3.20000000e+04,
+ 4.30000000e+04,
+ 5.40000000e+04,
+ 6.50000000e+04,
+ 7.60000000e+04,
};
const double pylith::materials::GenMaxwellIsotropic3DTimeDepData::_parameterData[] = {
@@ -166,18 +166,18 @@
};
const double pylith::materials::GenMaxwellIsotropic3DTimeDepData::_initialState[] = {
- 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.20000000e+04,
+ 2.30000000e+04,
+ 3.40000000e+04,
+ 4.50000000e+04,
+ 5.60000000e+04,
+ 6.70000000e+04,
+ 2.10000000e+04,
+ 3.20000000e+04,
+ 4.30000000e+04,
+ 5.40000000e+04,
+ 6.50000000e+04,
+ 7.60000000e+04,
};
const double pylith::materials::GenMaxwellIsotropic3DTimeDepData::_density[] = {
@@ -201,18 +201,18 @@
};
const double pylith::materials::GenMaxwellIsotropic3DTimeDepData::_stress[] = {
- 1.98078741e+07,
- 2.47500000e+07,
- 2.96921259e+07,
- 1.97685037e+07,
- 2.47106296e+07,
- 2.96527555e+07,
- 2.67841620e+06,
- 3.31200000e+06,
- 3.94558380e+06,
- 2.59193371e+06,
- 3.22551751e+06,
- 3.85910131e+06,
+ 1.98198741e+07,
+ 2.47730000e+07,
+ 2.97261259e+07,
+ 1.98135037e+07,
+ 2.47666296e+07,
+ 2.97197555e+07,
+ 2.69941620e+06,
+ 3.34400000e+06,
+ 3.98858380e+06,
+ 2.64593371e+06,
+ 3.29051751e+06,
+ 3.93510131e+06,
};
const double pylith::materials::GenMaxwellIsotropic3DTimeDepData::_elasticConsts[] = {
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellIsotropic3DElastic.py
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellIsotropic3DElastic.py 2008-08-06 21:04:45 UTC (rev 12554)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellIsotropic3DElastic.py 2008-08-06 21:06:16 UTC (rev 12555)
@@ -53,14 +53,14 @@
vpA = vsA*3**0.5
viscosityA = 1.0e18
strainA = [1.1e-4, 2.2e-4, 3.3e-4, 4.4e-4, 5.5e-4, 6.6e-4]
- initialStateA = [0.0, 0.0, 0.0, 0.0, 0.0, 0.0]
+ initialStateA = [1.2e4, 2.3e4, 3.4e4, 4.5e4, 5.6e4, 6.7e4]
densityB = 2000.0
vsB = 1200.0
vpB = vsB*3**0.5
viscosityB = 1.0e18
strainB = [1.2e-4, 2.3e-4, 3.4e-4, 4.5e-4, 5.6e-4, 6.7e-4]
- initialStateB = [0.0, 0.0, 0.0, 0.0, 0.0, 0.0]
+ initialStateB = [2.1e4, 3.2e4, 4.3e4, 5.4e4, 6.5e4, 7.6e4]
self.dbData = 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 2008-08-06 21:04:45 UTC (rev 12554)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellIsotropic3DElasticData.cc 2008-08-06 21:06:16 UTC (rev 12555)
@@ -66,18 +66,18 @@
};
const double pylith::materials::MaxwellIsotropic3DElasticData::_initialStateDBData[] = {
- 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.20000000e+04,
+ 2.30000000e+04,
+ 3.40000000e+04,
+ 4.50000000e+04,
+ 5.60000000e+04,
+ 6.70000000e+04,
+ 2.10000000e+04,
+ 3.20000000e+04,
+ 4.30000000e+04,
+ 5.40000000e+04,
+ 6.50000000e+04,
+ 7.60000000e+04,
};
const double pylith::materials::MaxwellIsotropic3DElasticData::_parameterData[] = {
@@ -116,18 +116,18 @@
};
const double pylith::materials::MaxwellIsotropic3DElasticData::_initialState[] = {
- 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.20000000e+04,
+ 2.30000000e+04,
+ 3.40000000e+04,
+ 4.50000000e+04,
+ 5.60000000e+04,
+ 6.70000000e+04,
+ 2.10000000e+04,
+ 3.20000000e+04,
+ 4.30000000e+04,
+ 5.40000000e+04,
+ 6.50000000e+04,
+ 7.60000000e+04,
};
const double pylith::materials::MaxwellIsotropic3DElasticData::_density[] = {
@@ -151,18 +151,18 @@
};
const double pylith::materials::MaxwellIsotropic3DElasticData::_stress[] = {
- 1.98000000e+07,
- 2.47500000e+07,
- 2.97000000e+07,
- 1.98000000e+07,
- 2.47500000e+07,
- 2.97000000e+07,
- 2.67840000e+06,
- 3.31200000e+06,
- 3.94560000e+06,
- 2.59200000e+06,
- 3.22560000e+06,
- 3.85920000e+06,
+ 1.98120000e+07,
+ 2.47730000e+07,
+ 2.97340000e+07,
+ 1.98450000e+07,
+ 2.48060000e+07,
+ 2.97670000e+07,
+ 2.69940000e+06,
+ 3.34400000e+06,
+ 3.98860000e+06,
+ 2.64600000e+06,
+ 3.29060000e+06,
+ 3.93520000e+06,
};
const double pylith::materials::MaxwellIsotropic3DElasticData::_elasticConsts[] = {
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellIsotropic3DTimeDep.py
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellIsotropic3DTimeDep.py 2008-08-06 21:04:45 UTC (rev 12554)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellIsotropic3DTimeDep.py 2008-08-06 21:06:16 UTC (rev 12555)
@@ -54,7 +54,7 @@
viscosityA = 1.0e18
strainA = [1.1e-4, 2.2e-4, 3.3e-4, 4.4e-4, 5.5e-4, 6.6e-4]
meanStrainA = (strainA[1] + strainA[2] + strainA[3])/3.0
- initialStateA = [0.0, 0.0, 0.0, 0.0, 0.0, 0.0]
+ initialStateA = [1.2e4, 2.3e4, 3.4e4, 4.5e4, 5.6e4, 6.7e4]
densityB = 2000.0
vsB = 1200.0
@@ -62,7 +62,7 @@
viscosityB = 1.0e19
strainB = [1.2e-4, 2.3e-4, 3.4e-4, 4.5e-4, 5.6e-4, 6.7e-4]
meanStrainB = (strainB[1] + strainB[2] + strainB[3])/3.0
- initialStateB = [0.0, 0.0, 0.0, 0.0, 0.0, 0.0]
+ initialStateB = [2.1e4, 3.2e4, 4.3e4, 5.4e4, 6.5e4, 7.6e4]
diag = [1.0, 1.0, 1.0, 0.0, 0.0, 0.0]
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellIsotropic3DTimeDepData.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellIsotropic3DTimeDepData.cc 2008-08-06 21:04:45 UTC (rev 12554)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/MaxwellIsotropic3DTimeDepData.cc 2008-08-06 21:06:16 UTC (rev 12555)
@@ -66,18 +66,18 @@
};
const double pylith::materials::MaxwellIsotropic3DTimeDepData::_initialStateDBData[] = {
- 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.20000000e+04,
+ 2.30000000e+04,
+ 3.40000000e+04,
+ 4.50000000e+04,
+ 5.60000000e+04,
+ 6.70000000e+04,
+ 2.10000000e+04,
+ 3.20000000e+04,
+ 4.30000000e+04,
+ 5.40000000e+04,
+ 6.50000000e+04,
+ 7.60000000e+04,
};
const double pylith::materials::MaxwellIsotropic3DTimeDepData::_parameterData[] = {
@@ -116,18 +116,18 @@
};
const double pylith::materials::MaxwellIsotropic3DTimeDepData::_initialState[] = {
- 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.20000000e+04,
+ 2.30000000e+04,
+ 3.40000000e+04,
+ 4.50000000e+04,
+ 5.60000000e+04,
+ 6.70000000e+04,
+ 2.10000000e+04,
+ 3.20000000e+04,
+ 4.30000000e+04,
+ 5.40000000e+04,
+ 6.50000000e+04,
+ 7.60000000e+04,
};
const double pylith::materials::MaxwellIsotropic3DTimeDepData::_density[] = {
@@ -151,18 +151,18 @@
};
const double pylith::materials::MaxwellIsotropic3DTimeDepData::_stress[] = {
- 1.48944499e+07,
- 1.98222250e+07,
- 2.47500000e+07,
- 1.97111002e+07,
- 2.46388752e+07,
- 2.95666503e+07,
- 2.04487299e+06,
- 2.67843649e+06,
- 3.31200000e+06,
- 2.59185071e+06,
- 3.22541421e+06,
- 3.85897772e+06,
+ 1.49064499e+07,
+ 1.98452250e+07,
+ 2.47840000e+07,
+ 1.97561002e+07,
+ 2.46948752e+07,
+ 2.96336503e+07,
+ 2.06587299e+06,
+ 2.71043649e+06,
+ 3.35500000e+06,
+ 2.64585071e+06,
+ 3.29041421e+06,
+ 3.93497772e+06,
};
const double pylith::materials::MaxwellIsotropic3DTimeDepData::_elasticConsts[] = {
More information about the cig-commits
mailing list