[cig-commits] r17089 - short/3D/PyLith/branches/v1.5-stable/libsrc/feassemble

[willic3 at geodynamics.org]

Author: willic3
Date: 2010-08-15 22:04:25 -0700 (Sun, 15 Aug 2010)
New Revision: 17089

Modified:
   short/3D/PyLith/branches/v1.5-stable/libsrc/feassemble/IntegratorElasticity.cc
   short/3D/PyLith/branches/v1.5-stable/libsrc/feassemble/IntegratorElasticityLgDeform.cc
Log:
Changed elasticConsts so that they only get divided by 2 if k != l (strain
indices).  Previously we were also doing this if i != j.



Modified: short/3D/PyLith/branches/v1.5-stable/libsrc/feassemble/IntegratorElasticity.cc
===================================================================
--- short/3D/PyLith/branches/v1.5-stable/libsrc/feassemble/IntegratorElasticity.cc	2010-08-14 02:36:33 UTC (rev 17088)
+++ short/3D/PyLith/branches/v1.5-stable/libsrc/feassemble/IntegratorElasticity.cc	2010-08-16 05:04:25 UTC (rev 17089)
@@ -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/branches/v1.5-stable/libsrc/feassemble/IntegratorElasticityLgDeform.cc
===================================================================
--- short/3D/PyLith/branches/v1.5-stable/libsrc/feassemble/IntegratorElasticityLgDeform.cc	2010-08-14 02:36:33 UTC (rev 17088)
+++ short/3D/PyLith/branches/v1.5-stable/libsrc/feassemble/IntegratorElasticityLgDeform.cc	2010-08-16 05:04:25 UTC (rev 17089)
@@ -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;