[cig-commits] r15207 - in short/3D/PyLith/trunk: libsrc/materials modulesrc/bc modulesrc/utils

[brad at geodynamics.org]

Author: brad
Date: 2009-06-11 23:35:10 -0700 (Thu, 11 Jun 2009)
New Revision: 15207

Modified:
   short/3D/PyLith/trunk/libsrc/materials/PowerLaw3D.cc
   short/3D/PyLith/trunk/modulesrc/bc/BoundaryConditionPoints.i
   short/3D/PyLith/trunk/modulesrc/utils/petsc_general.i
Log:
Fixed a few trivial power-law bugs.

Modified: short/3D/PyLith/trunk/libsrc/materials/PowerLaw3D.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/materials/PowerLaw3D.cc	2009-06-12 06:23:15 UTC (rev 15206)
+++ short/3D/PyLith/trunk/libsrc/materials/PowerLaw3D.cc	2009-06-12 06:35:10 UTC (rev 15207)
@@ -488,7 +488,7 @@
   assert(0 != properties);
   assert(_numPropsQuadPt == numProperties);
   assert(0 != stateVars);
-  assert(_numPropsQuadPt == numStateVars);
+  assert(_numVarsQuadPt == numStateVars);
   assert(0 != totalStrain);
   assert(_PowerLaw3D::tensorSize == strainSize);
   assert(0 != initialStress);
@@ -816,7 +816,7 @@
   assert(0 != properties);
   assert(_numPropsQuadPt == numProperties);
   assert(0 != stateVars);
-  assert(_numPropsQuadPt == numStateVars);
+  assert(_numVarsQuadPt == numStateVars);
   assert(0 != totalStrain);
   assert(_PowerLaw3D::tensorSize == strainSize);
   assert(0 != initialStress);
@@ -901,7 +901,7 @@
   assert(0 != properties);
   assert(_numPropsQuadPt == numProperties);
   assert(0 != stateVars);
-  assert(_numPropsQuadPt == numStateVars);
+  assert(_numVarsQuadPt == numStateVars);
   assert(0 != totalStrain);
   assert(_PowerLaw3D::tensorSize == strainSize);
   assert(0 != initialStress);
@@ -1172,7 +1172,7 @@
 				    const int initialStrainSize)
 { // _updateStateVarsElastic
   assert(0 != stateVars);
-  assert(_numPropsQuadPt == numStateVars);
+  assert(_numVarsQuadPt == numStateVars);
   assert(0 != properties);
   assert(_numPropsQuadPt == numProperties);
   assert(0 != totalStrain);

Modified: short/3D/PyLith/trunk/modulesrc/bc/BoundaryConditionPoints.i
===================================================================
--- short/3D/PyLith/trunk/modulesrc/bc/BoundaryConditionPoints.i	2009-06-12 06:23:15 UTC (rev 15206)
+++ short/3D/PyLith/trunk/modulesrc/bc/BoundaryConditionPoints.i	2009-06-12 06:35:10 UTC (rev 15207)
@@ -35,6 +35,13 @@
       virtual
       void deallocate(void);
   
+      /** Get parameter fields.
+       *
+       * @returns Parameter fields.
+       */
+      const pylith::topology::Fields<pylith::topology::Field<pylith::topology::Mesh> >*
+      parameterFields(void) const;
+
     }; // class BoundaryConditionPoints
 
   } // bc

Modified: short/3D/PyLith/trunk/modulesrc/utils/petsc_general.i
===================================================================
--- short/3D/PyLith/trunk/modulesrc/utils/petsc_general.i	2009-06-12 06:23:15 UTC (rev 15206)
+++ short/3D/PyLith/trunk/modulesrc/utils/petsc_general.i	2009-06-12 06:35:10 UTC (rev 15207)
@@ -34,6 +34,16 @@
   } // finalize
 %} // inline
 
+// ----------------------------------------------------------------------
+// sizeofVoidPtr
+%inline %{
+  int
+  sizeofVoidPtr(void)
+  { // sizeofVoidPtr
+    return sizeof(void*);
+  } // sizeofVoidPtr
+%} // inline
 
+
 // End of file