[cig-commits] r15588 - in short/3D/PyLith/trunk/pylith: problems topology

[willic3 at geodynamics.org]

Author: willic3
Date: 2009-08-24 21:03:18 -0700 (Mon, 24 Aug 2009)
New Revision: 15588

Modified:
   short/3D/PyLith/trunk/pylith/problems/Formulation.py
   short/3D/PyLith/trunk/pylith/topology/MeshGenerator.py
Log:
Cleaned up a little journal output.



Modified: short/3D/PyLith/trunk/pylith/problems/Formulation.py
===================================================================
--- short/3D/PyLith/trunk/pylith/problems/Formulation.py	2009-08-25 03:42:47 UTC (rev 15587)
+++ short/3D/PyLith/trunk/pylith/problems/Formulation.py	2009-08-25 04:03:18 UTC (rev 15588)
@@ -394,7 +394,7 @@
       self._debug.log(resourceUsageString())
 
       self._info.log("Added elasticity integrator for material '%s'." % \
-                     material.label)    
+                     material.label())
     return
 
 
@@ -418,12 +418,12 @@
         else:
           self.integratorsMesh.append(bc)
         self._info.log("Added boundary condition '%s' as an integrator." % \
-                       bc.label)
+                       bc.label())
       if implementsConstraint(bc):
         foundType = True
         self.constraints.append(bc)
         self._info.log("Added boundary condition '%s' as a constraint." % \
-                       bc.label)
+                       bc.label())
       if not foundType:
         raise TypeError, \
               "Could not determine whether boundary condition '%s' is an " \
@@ -447,12 +447,12 @@
         foundType = True
         self.integratorsSubMesh.append(ic)
         self._info.log("Added interface condition '%s' as an integrator." % \
-                       ic.label)
+                       ic.label())
       if implementsConstraint(ic):
         foundType = True
         self.constraints.append(ic)
         self._info.log("Added interface condition '%s' as a constraint." % \
-                       ic.label)
+                       ic.label())
       if not foundType:
         raise TypeError, \
               "Could not determine whether interface condition '%s' is an " \

Modified: short/3D/PyLith/trunk/pylith/topology/MeshGenerator.py
===================================================================
--- short/3D/PyLith/trunk/pylith/topology/MeshGenerator.py	2009-08-25 03:42:47 UTC (rev 15587)
+++ short/3D/PyLith/trunk/pylith/topology/MeshGenerator.py	2009-08-25 04:03:18 UTC (rev 15588)
@@ -100,8 +100,9 @@
         if interface.useLagrangeConstraints():
           firstFaultCell += nvertices
       for interface in interfaces:
+        nvertices = interface.numVertices(mesh)
         self._info.log("Adjusting topology for fault '%s' with %d vertices." % \
-                         (interface.label, nvertices))
+                         (interface.label(), nvertices))
         firstFaultVertex, firstFaultCell = \
             interface.adjustTopology(mesh, firstFaultVertex, firstFaultCell)