[cig-commits] commit: Cleanup

[Mercurial]

changeset:   910:b73798246e20
tag:         tip
user:        Walter Landry <wlandry at caltech.edu>
date:        Wed Nov 09 00:58:10 2011 -0800
files:       Rheology/src/ConstitutiveMatrix.cxx Rheology/src/ConstitutiveMatrixCartesian.cxx
description:
Cleanup


diff -r 1a2bed9b406a -r b73798246e20 Rheology/src/ConstitutiveMatrix.cxx
--- a/Rheology/src/ConstitutiveMatrix.cxx	Wed Nov 09 00:57:57 2011 -0800
+++ b/Rheology/src/ConstitutiveMatrix.cxx	Wed Nov 09 00:58:10 2011 -0800
@@ -289,11 +289,13 @@ void ConstitutiveMatrix_Assemble(
    MaterialPoint*          materialPoint;
 
    /* Big fat assumption!
-    * Because of Rheology framework vs PIC IP mapping change, ConstitutiveMatrix assumes that
-    * we are using a one-to-one mapping.
-    * This is because the Rheology stuff was made based on operating on MaterialPoints
-    * rather than IntegrationPoints even though its assembling. However it does require xi
-    * which we are passing from the integration point for speed (rather than re-computing it)
+    * Because of Rheology framework vs PIC IP mapping change,
+    * ConstitutiveMatrix assumes that we are using a one-to-one
+    * mapping.  This is because the Rheology stuff was made based on
+    * operating on MaterialPoints rather than IntegrationPoints even
+    * though its assembling. However it does require xi which we are
+    * passing from the integration point for speed (rather than
+    * re-computing it)
     *
     * _Init() firewalls this assumption.
     *
diff -r 1a2bed9b406a -r b73798246e20 Rheology/src/ConstitutiveMatrixCartesian.cxx
--- a/Rheology/src/ConstitutiveMatrixCartesian.cxx	Wed Nov 09 00:57:57 2011 -0800
+++ b/Rheology/src/ConstitutiveMatrixCartesian.cxx	Wed Nov 09 00:58:10 2011 -0800
@@ -360,6 +360,12 @@ void _ConstitutiveMatrixCartesian_Assemb
 
      eta = self->matrixData[2][2];
 
+       // std::cout << "eta "
+       //           << lElement_I << " "
+       //           << cParticle_I << " "
+       //           << eta << " "
+       //           << "\n";
+
      /* Turn D Matrix into D~ Matrix by multiplying in the weight and the detJac (this is a shortcut for speed) */
      ConstitutiveMatrix_MultiplyByValue( constitutiveMatrix, detJac * particle->weight );