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

willic3 at geodynamics.org willic3 at geodynamics.org
Fri Feb 8 10:56:03 PST 2008


Author: willic3
Date: 2008-02-08 10:56:03 -0800 (Fri, 08 Feb 2008)
New Revision: 9267

Modified:
   short/3D/PyLith/trunk/libsrc/materials/GenMaxwellIsotropic3D.cc
Log:
Simplified some indexing.



Modified: short/3D/PyLith/trunk/libsrc/materials/GenMaxwellIsotropic3D.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/materials/GenMaxwellIsotropic3D.cc	2008-02-08 18:52:24 UTC (rev 9266)
+++ short/3D/PyLith/trunk/libsrc/materials/GenMaxwellIsotropic3D.cc	2008-02-08 18:56:03 UTC (rev 9267)
@@ -621,19 +621,18 @@
     parameters[_GenMaxwellIsotropic3D::pidStrainT+iComp] = totalStrain[iComp];
     // std::cout << devStrainTpdt << "  "  << devStrainT << "  " << deltaStrain << std::endl;
     for (int model = 0; model < numMaxwellModels; ++model) {
+      int index = iComp + model * tensorSize;
       const double maxwellTime =
 	parameters[_GenMaxwellIsotropic3D::pidMaxwellTime + model];
       visStrain = 
 	exp(-_dt/maxwellTime) * 
-	parameters[_GenMaxwellIsotropic3D::pidVisStrain + iComp +
-		   model * tensorSize] +
+	parameters[_GenMaxwellIsotropic3D::pidVisStrain + index] +
 	dq[model] * deltaStrain;
       // std::cout << "  " << maxwellTime
 // 		<< "  " << parameters[_GenMaxwellIsotropic3D::pidVisStrain +
 // 		 iComp + model * tensorSize]
 // 		<< "  " << visStrain << std::endl;
-      parameters[_GenMaxwellIsotropic3D::pidVisStrain +
-		 iComp + model * tensorSize] = visStrain;
+      parameters[_GenMaxwellIsotropic3D::pidVisStrain + index] = visStrain;
     } // for
   } // for
   PetscLogFlopsNoCheck((5 + (6 * numMaxwellModels)) * tensorSize);



More information about the cig-commits mailing list