[cig-commits] r22264 - in short/3D/PyLith/trunk: pylith/bc unittests/pytests/bc unittests/pytests/meshio/data

[brad at geodynamics.org]

Author: brad
Date: 2013-06-13 15:36:08 -0700 (Thu, 13 Jun 2013)
New Revision: 22264

Added:
   short/3D/PyLith/trunk/unittests/pytests/meshio/data/point.txt
Modified:
   short/3D/PyLith/trunk/pylith/bc/DirichletBC.py
   short/3D/PyLith/trunk/unittests/pytests/bc/TestDirichletBC.py
   short/3D/PyLith/trunk/unittests/pytests/meshio/data/Makefile.am
Log:
Small fixes from bad manual patches from v1.7-trunk.

Modified: short/3D/PyLith/trunk/pylith/bc/DirichletBC.py
===================================================================
--- short/3D/PyLith/trunk/pylith/bc/DirichletBC.py	2013-06-13 22:08:47 UTC (rev 22263)
+++ short/3D/PyLith/trunk/pylith/bc/DirichletBC.py	2013-06-13 22:36:08 UTC (rev 22264)
@@ -79,8 +79,8 @@
     logEvent = "%sverify" % self._loggingPrefix
     self._eventLogger.eventBegin(logEvent)
 
-    BoundaryCondition.verifyConfiguration(self, self.mesh)
-    spaceDim = self.mesh.coordsys().spaceDim()
+    BoundaryCondition.verifyConfiguration(self, self.mesh())
+    spaceDim = self.mesh().coordsys().spaceDim()
     for d in self.bcDOF:
       if d < 0 or d >= spaceDim:
         raise ValueError("Attempting to constrain DOF (%d) that doesn't exist. Space dimension is %d." % \

Modified: short/3D/PyLith/trunk/unittests/pytests/bc/TestDirichletBC.py
===================================================================
--- short/3D/PyLith/trunk/unittests/pytests/bc/TestDirichletBC.py	2013-06-13 22:08:47 UTC (rev 22263)
+++ short/3D/PyLith/trunk/unittests/pytests/bc/TestDirichletBC.py	2013-06-13 22:36:08 UTC (rev 22264)
@@ -108,6 +108,7 @@
     """
 
     (mesh, bc, field) = self._initialize()
+    field.allocate()
     bc.verifyConfiguration()
 
     # We should really add something here to check to make sure things
@@ -258,9 +259,6 @@
     from pylith.topology.Field import Field
     field = Field(mesh)
     field.newSection(field.VERTICES_FIELD, cs.spaceDim())
-    field.allocate()
-
-    field.zero()
     
     return (mesh, bc, field)
 

Modified: short/3D/PyLith/trunk/unittests/pytests/meshio/data/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/unittests/pytests/meshio/data/Makefile.am	2013-06-13 22:08:47 UTC (rev 22263)
+++ short/3D/PyLith/trunk/unittests/pytests/meshio/data/Makefile.am	2013-06-13 22:36:08 UTC (rev 22264)
@@ -23,6 +23,7 @@
 	cube2.txt \
 	twohex8.exo \
 	twohex8.txt \
+	point.txt \
 	points.txt
 
 noinst_TMP = \

Added: short/3D/PyLith/trunk/unittests/pytests/meshio/data/point.txt
===================================================================
--- short/3D/PyLith/trunk/unittests/pytests/meshio/data/point.txt	                        (rev 0)
+++ short/3D/PyLith/trunk/unittests/pytests/meshio/data/point.txt	2013-06-13 22:36:08 UTC (rev 22264)
@@ -0,0 +1,2 @@
+# Here is a point within the volume of the hex8 mesh.
+ 0.5  0.2  0.0