[cig-commits] r17096 - in short/3D/PyLith/trunk/libsrc: feassemble materials
brad at geodynamics.org
brad at geodynamics.org
Tue Aug 17 17:28:21 PDT 2010
Author: brad
Date: 2010-08-17 17:28:21 -0700 (Tue, 17 Aug 2010)
New Revision: 17096
Modified:
short/3D/PyLith/trunk/libsrc/feassemble/IntegratorElasticity.cc
short/3D/PyLith/trunk/libsrc/feassemble/IntegratorElasticityLgDeform.cc
short/3D/PyLith/trunk/libsrc/materials/DruckerPrager3D.cc
Log:
Merge from stable.
Modified: short/3D/PyLith/trunk/libsrc/feassemble/IntegratorElasticity.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/IntegratorElasticity.cc 2010-08-17 17:17:47 UTC (rev 17095)
+++ short/3D/PyLith/trunk/libsrc/feassemble/IntegratorElasticity.cc 2010-08-18 00:28:21 UTC (rev 17096)
@@ -842,8 +842,8 @@
const double C2211 = elasticConsts[iQuad*numConsts+3];
const double C2222 = elasticConsts[iQuad*numConsts+4];
const double C2212 = elasticConsts[iQuad*numConsts+5]/2.0;
- const double C1211 = elasticConsts[iQuad*numConsts+6]/2.0;
- const double C1222 = elasticConsts[iQuad*numConsts+7]/2.0;
+ const double C1211 = elasticConsts[iQuad*numConsts+6];
+ const double C1222 = elasticConsts[iQuad*numConsts+7];
const double C1212 = elasticConsts[iQuad*numConsts+8]/2.0;
for (int iBasis=0, iQ=iQuad*numBasis*spaceDim;
iBasis < numBasis;
@@ -966,21 +966,21 @@
const double C3312 = elasticConsts[iQuad*numConsts+15] / 2.0;
const double C3323 = elasticConsts[iQuad*numConsts+16] / 2.0;
const double C3313 = elasticConsts[iQuad*numConsts+17] / 2.0;
- const double C1211 = elasticConsts[iQuad*numConsts+18] / 2.0;
- const double C1222 = elasticConsts[iQuad*numConsts+19] / 2.0;
- const double C1233 = elasticConsts[iQuad*numConsts+20] / 2.0;
+ const double C1211 = elasticConsts[iQuad*numConsts+18];
+ const double C1222 = elasticConsts[iQuad*numConsts+19];
+ const double C1233 = elasticConsts[iQuad*numConsts+20];
const double C1212 = elasticConsts[iQuad*numConsts+21] / 2.0;
const double C1223 = elasticConsts[iQuad*numConsts+22] / 2.0;
const double C1213 = elasticConsts[iQuad*numConsts+23] / 2.0;
- const double C2311 = elasticConsts[iQuad*numConsts+24] / 2.0;
- const double C2322 = elasticConsts[iQuad*numConsts+25] / 2.0;
- const double C2333 = elasticConsts[iQuad*numConsts+26] / 2.0;
+ const double C2311 = elasticConsts[iQuad*numConsts+24];
+ const double C2322 = elasticConsts[iQuad*numConsts+25];
+ const double C2333 = elasticConsts[iQuad*numConsts+26];
const double C2312 = elasticConsts[iQuad*numConsts+27] / 2.0;
const double C2323 = elasticConsts[iQuad*numConsts+28] / 2.0;
const double C2313 = elasticConsts[iQuad*numConsts+29] / 2.0;
- const double C1311 = elasticConsts[iQuad*numConsts+30] / 2.0;
- const double C1322 = elasticConsts[iQuad*numConsts+31] / 2.0;
- const double C1333 = elasticConsts[iQuad*numConsts+32] / 2.0;
+ const double C1311 = elasticConsts[iQuad*numConsts+30];
+ const double C1322 = elasticConsts[iQuad*numConsts+31];
+ const double C1333 = elasticConsts[iQuad*numConsts+32];
const double C1312 = elasticConsts[iQuad*numConsts+33] / 2.0;
const double C1323 = elasticConsts[iQuad*numConsts+34] / 2.0;
const double C1313 = elasticConsts[iQuad*numConsts+35] / 2.0;
Modified: short/3D/PyLith/trunk/libsrc/feassemble/IntegratorElasticityLgDeform.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/IntegratorElasticityLgDeform.cc 2010-08-17 17:17:47 UTC (rev 17095)
+++ short/3D/PyLith/trunk/libsrc/feassemble/IntegratorElasticityLgDeform.cc 2010-08-18 00:28:21 UTC (rev 17096)
@@ -575,8 +575,8 @@
const double C2211 = elasticConsts[iC+3];
const double C2222 = elasticConsts[iC+4];
const double C2212 = elasticConsts[iC+5] / 2.0;
- const double C1211 = elasticConsts[iC+6] / 2.0;
- const double C1222 = elasticConsts[iC+7] / 2.0;
+ const double C1211 = elasticConsts[iC+6];
+ const double C1222 = elasticConsts[iC+7];
const double C1212 = elasticConsts[iC+8] / 2.0;
const int iS = iQuad*tensorSize;
@@ -717,21 +717,21 @@
const double C3312 = elasticConsts[iC+15] / 2.0;
const double C3323 = elasticConsts[iC+16] / 2.0;
const double C3313 = elasticConsts[iC+17] / 2.0;
- const double C1211 = elasticConsts[iC+18] / 2.0;
- const double C1222 = elasticConsts[iC+19] / 2.0;
- const double C1233 = elasticConsts[iC+20] / 2.0;
+ const double C1211 = elasticConsts[iC+18];
+ const double C1222 = elasticConsts[iC+19];
+ const double C1233 = elasticConsts[iC+20];
const double C1212 = elasticConsts[iC+21] / 2.0;
const double C1223 = elasticConsts[iC+22] / 2.0;
const double C1213 = elasticConsts[iC+23] / 2.0;
- const double C2311 = elasticConsts[iC+24] / 2.0;
- const double C2322 = elasticConsts[iC+25] / 2.0;
- const double C2333 = elasticConsts[iC+26] / 2.0;
+ const double C2311 = elasticConsts[iC+24];
+ const double C2322 = elasticConsts[iC+25];
+ const double C2333 = elasticConsts[iC+26];
const double C2312 = elasticConsts[iC+27] / 2.0;
const double C2323 = elasticConsts[iC+28] / 2.0;
const double C2313 = elasticConsts[iC+29] / 2.0;
- const double C1311 = elasticConsts[iC+30] / 2.0;
- const double C1322 = elasticConsts[iC+31] / 2.0;
- const double C1333 = elasticConsts[iC+32] / 2.0;
+ const double C1311 = elasticConsts[iC+30];
+ const double C1322 = elasticConsts[iC+31];
+ const double C1333 = elasticConsts[iC+32];
const double C1312 = elasticConsts[iC+33] / 2.0;
const double C1323 = elasticConsts[iC+34] / 2.0;
const double C1313 = elasticConsts[iC+35] / 2.0;
Modified: short/3D/PyLith/trunk/libsrc/materials/DruckerPrager3D.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/materials/DruckerPrager3D.cc 2010-08-17 17:17:47 UTC (rev 17095)
+++ short/3D/PyLith/trunk/libsrc/materials/DruckerPrager3D.cc 2010-08-18 00:28:21 UTC (rev 17096)
@@ -195,7 +195,7 @@
const double dilatationAngle = dbValues[db_dilatationAngle];
if (density <= 0.0 || vs <= 0.0 || vp <= 0.0 || frictionAngle < 0.0
- || cohesion <= 0.0 || dilatationAngle < 0.0
+ || cohesion < 0.0 || dilatationAngle < 0.0
|| frictionAngle < dilatationAngle) {
std::ostringstream msg;
msg << "Spatial database returned illegal value for physical "
More information about the CIG-COMMITS
mailing list