[cig-commits] r8622 - short/3D/PyLith/trunk/pylith/topology

[brad at geodynamics.org]

Author: brad
Date: 2007-12-07 22:03:21 -0800 (Fri, 07 Dec 2007)
New Revision: 8622

Modified:
   short/3D/PyLith/trunk/pylith/topology/Distributor.py
   short/3D/PyLith/trunk/pylith/topology/MeshImporter.py
Log:
Added logging for mesh distribution.

Modified: short/3D/PyLith/trunk/pylith/topology/Distributor.py
===================================================================
--- short/3D/PyLith/trunk/pylith/topology/Distributor.py	2007-12-08 05:11:45 UTC (rev 8621)
+++ short/3D/PyLith/trunk/pylith/topology/Distributor.py	2007-12-08 06:03:21 UTC (rev 8622)
@@ -74,6 +74,10 @@
     """
     Distribute a Mesh
     """
+    self._setupLogging()
+    logEvent = "%sdistribute" % self._loggingPrefix
+    self._logger.eventBegin(logEvent)
+
     self._createCppHandle()
     
     from Mesh import Mesh
@@ -86,6 +90,8 @@
       self.writer.open(newMesh)
       self.cppHandle.write(newMesh.cppHandle, self.writer.cppHandle)
       self.writer.close()
+
+    self._logger.eventEnd(logEvent)
     return newMesh
 
 
@@ -112,6 +118,23 @@
     return
   
 
+  def _setupLogging(self):
+    """
+    Setup event logging.
+    """
+    self._loggingPrefix = "Dist "
+    from pylith.utils.EventLogger import EventLogger
+    logger = EventLogger()
+    logger.setClassName("FE Distribution")
+    logger.initialize()
+    events = ["distribute"]
+    for event in events:
+      logger.registerEvent("%s%s" % (self._loggingPrefix, event))
+
+    self._logger = logger
+    return
+  
+
 # FACTORIES ////////////////////////////////////////////////////////////
 
 def mesh_partitioner():

Modified: short/3D/PyLith/trunk/pylith/topology/MeshImporter.py
===================================================================
--- short/3D/PyLith/trunk/pylith/topology/MeshImporter.py	2007-12-08 05:11:45 UTC (rev 8621)
+++ short/3D/PyLith/trunk/pylith/topology/MeshImporter.py	2007-12-08 06:03:21 UTC (rev 8622)
@@ -79,10 +79,10 @@
     mesh = self.importer.read(self.debug, self.interpolate)
     self._info.log("Adjusting topology.")
     self._adjustTopology(mesh, faults)
-    self._info.log("Distributing mesh.")
 
     import mpi
     if mpi.MPI_Comm_size(mpi.MPI_COMM_WORLD) > 1:
+      self._info.log("Distributing mesh.")
       mesh = self.distributor.distribute(mesh)
     #mesh.view()