[cig-commits] r7302 - short/3D/PyLith/trunk/libsrc/materials

[willic3 at geodynamics.org]

Author: willic3
Date: 2007-06-19 10:44:54 -0700 (Tue, 19 Jun 2007)
New Revision: 7302

Modified:
   short/3D/PyLith/trunk/libsrc/materials/MaxwellIsotropic3D.cc
Log:
Fixed bug that now allows unit test for updateStateViscoelastic to pass.
I had forgotten to divide mean strain by 3.
Also (temporarily) commented out some debugging code.



Modified: short/3D/PyLith/trunk/libsrc/materials/MaxwellIsotropic3D.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/materials/MaxwellIsotropic3D.cc	2007-06-19 16:48:47 UTC (rev 7301)
+++ short/3D/PyLith/trunk/libsrc/materials/MaxwellIsotropic3D.cc	2007-06-19 17:44:54 UTC (rev 7302)
@@ -268,11 +268,11 @@
   const double diag[] = { 1.0, 1.0, 1.0, 0.0, 0.0, 0.0 };
   const double meanStressTpdt = bulkmodulus * traceStrainTpdt;
   // See what's going on in state variables.
-  std::cout << " pidStrainT, pidVisStrain : " << std::endl;
-  for (int iComp=0; iComp < _MaxwellIsotropic3D::tensorSize; ++iComp)
-    std::cout << "  " << parameters[_MaxwellIsotropic3D::pidStrainT][iComp]
-	    << "   " << parameters[_MaxwellIsotropic3D::pidVisStrain][iComp]
-	    << std::endl;
+  // std::cout << " pidStrainT, pidVisStrain : " << std::endl;
+  // for (int iComp=0; iComp < _MaxwellIsotropic3D::tensorSize; ++iComp)
+    // std::cout << "  " << parameters[_MaxwellIsotropic3D::pidStrainT][iComp]
+	    // << "   " << parameters[_MaxwellIsotropic3D::pidVisStrain][iComp]
+	    // << std::endl;
 
   const double meanStrainT = (parameters[_MaxwellIsotropic3D::pidStrainT][0] +
 			      parameters[_MaxwellIsotropic3D::pidStrainT][1] +
@@ -314,13 +314,13 @@
     // Later I will want to put in initial stresses.
     (*stress)[iComp] =diag[iComp]*meanStressTpdt+devStressTpdt;
   } // for
-  std::cout << " totalStrain: " << std::endl;
-  for (int iComp=0; iComp < _MaxwellIsotropic3D::tensorSize; ++iComp)
-    std::cout << "  " << totalStrain[iComp];
-  std::cout << std::endl << " stress: " << std::endl;
-  for (int iComp=0; iComp < _MaxwellIsotropic3D::tensorSize; ++iComp)
-    std::cout << "  " << (*stress)[iComp];
-  std::cout << std::endl;
+  // std::cout << " totalStrain: " << std::endl;
+  // for (int iComp=0; iComp < _MaxwellIsotropic3D::tensorSize; ++iComp)
+    // std::cout << "  " << totalStrain[iComp];
+  // std::cout << std::endl << " stress: " << std::endl;
+  // for (int iComp=0; iComp < _MaxwellIsotropic3D::tensorSize; ++iComp)
+    // std::cout << "  " << (*stress)[iComp];
+  // std::cout << std::endl;
 } // _calcStress
 
 // ----------------------------------------------------------------------
@@ -463,11 +463,11 @@
     (*parameters)[_MaxwellIsotropic3D::pidVisStrain][iComp] =
       totalStrain[iComp] - diag[iComp]*meanStrainTpdt;
   } // for
-  std::cout << " pidStrainT, pidVisStrain : " << std::endl;
-  for (int iComp=0; iComp < _MaxwellIsotropic3D::tensorSize; ++iComp)
-    std::cout << "  " << (*parameters)[_MaxwellIsotropic3D::pidStrainT][iComp]
-	    << "   " << (*parameters)[_MaxwellIsotropic3D::pidVisStrain][iComp]
-	    << std::endl;
+  // std::cout << " updateStateElastic: pidStrainT, pidVisStrain : " << std::endl;
+  // for (int iComp=0; iComp < _MaxwellIsotropic3D::tensorSize; ++iComp)
+    // std::cout << "  " << (*parameters)[_MaxwellIsotropic3D::pidStrainT][iComp]
+	    // << "   " << (*parameters)[_MaxwellIsotropic3D::pidVisStrain][iComp]
+	    // << std::endl;
   _needNewJacobian = true;
 } // _calcStressElastic
 
@@ -499,9 +499,9 @@
   const double diag[] = { 1.0, 1.0, 1.0, 0.0, 0.0, 0.0 };
 
   const double meanStrainT = 
-    (*parameters)[_MaxwellIsotropic3D::pidStrainT][0] +
-    (*parameters)[_MaxwellIsotropic3D::pidStrainT][1] +
-    (*parameters)[_MaxwellIsotropic3D::pidStrainT][2];
+    ((*parameters)[_MaxwellIsotropic3D::pidStrainT][0] +
+     (*parameters)[_MaxwellIsotropic3D::pidStrainT][1] +
+     (*parameters)[_MaxwellIsotropic3D::pidStrainT][2])/3.0;
   
   // The code below should probably be in a separate function since it
   // is used more than once.  I should also probably cover the possibility
@@ -537,6 +537,12 @@
     (*parameters)[_MaxwellIsotropic3D::pidVisStrain][iComp] = visStrain;
     (*parameters)[_MaxwellIsotropic3D::pidStrainT][iComp] = totalStrain[iComp];
   } // for
+
+  // std::cout << " updateStateViscoelastic: pidStrainT, pidVisStrain : " << std::endl;
+  // for (int iComp=0; iComp < _MaxwellIsotropic3D::tensorSize; ++iComp)
+    // std::cout << "  " << (*parameters)[_MaxwellIsotropic3D::pidStrainT][iComp]
+	    // << "   " << (*parameters)[_MaxwellIsotropic3D::pidVisStrain][iComp]
+	    // << std::endl;
 } // _calcStressViscoelastic