[cig-commits] r15223 - in short/3D/PyLith/trunk/pylith: bc problems

[knepley at geodynamics.org]

Author: knepley
Date: 2009-06-12 17:47:23 -0700 (Fri, 12 Jun 2009)
New Revision: 15223

Modified:
   short/3D/PyLith/trunk/pylith/bc/DirichletBC.py
   short/3D/PyLith/trunk/pylith/problems/Formulation.py
Log:
Logging now working again


Modified: short/3D/PyLith/trunk/pylith/bc/DirichletBC.py
===================================================================
--- short/3D/PyLith/trunk/pylith/bc/DirichletBC.py	2009-06-12 23:38:36 UTC (rev 15222)
+++ short/3D/PyLith/trunk/pylith/bc/DirichletBC.py	2009-06-13 00:47:23 UTC (rev 15223)
@@ -92,15 +92,9 @@
     logEvent = "%sinit" % self._loggingPrefix
     self._eventLogger.eventBegin(logEvent)
 
-    from pylith.utils.petsc import MemoryLogger
-    #memoryLogger = MemoryLogger.singleton()
-    #memoryLogger.setDebug(0)
-    #memoryLogger.stagePush("BoundaryConditions")
-
     self.normalizer(normalizer)
     BoundaryCondition.initialize(self, totalTime, numTimeSteps, normalizer)
 
-    #memoryLogger.stagePop()    
     self._modelMemoryUse()
     self._eventLogger.eventEnd(logEvent)    
     return
@@ -129,7 +123,7 @@
     """
     Model memory allocation.
     """
-    #self.perfLogger.logFields("BoundaryConditions", self.parameterFields())
+    self.perfLogger.logFields("BoundaryConditions", self.parameterFields())
     return
 
 

Modified: short/3D/PyLith/trunk/pylith/problems/Formulation.py
===================================================================
--- short/3D/PyLith/trunk/pylith/problems/Formulation.py	2009-06-12 23:38:36 UTC (rev 15222)
+++ short/3D/PyLith/trunk/pylith/problems/Formulation.py	2009-06-13 00:47:23 UTC (rev 15223)
@@ -341,19 +341,6 @@
     logEvent = "%sfinalize" % self._loggingPrefix
     self._eventLogger.eventBegin(logEvent)
 
-    for name in self.fields.fieldNames():
-      field = self.fields.get(name)
-      self.perfLogger.logField('Problem', field)
-    self.perfLogger.logGlobalOrder('GlobalOrder', 'VectorOrder',
-                                   self.fields.get('residual'))
-    for integrator in self.integratorsMesh + self.integratorsSubMesh:
-      self.perfLogger.logQuadrature('Quadrature', integrator.quadrature())
-
-    # Placeholders until we know we they go
-    self.perfLogger.memory['Fault'] = 0
-    self.perfLogger.memory['BoundaryConditions'] = 0
-    self.perfLogger.memory['Output'] = 0
-
     self._info.log("Formulation finalize.")
     self._debug.log(resourceUsageString())
     for integrator in self.integratorsMesh + self.integratorsSubMesh:
@@ -549,6 +536,9 @@
                                    self.fields.get('residual'))
     for integrator in self.integratorsMesh + self.integratorsSubMesh:
       self.perfLogger.logQuadrature('Quadrature', integrator.quadrature())
+    # Placeholders until we know we they go
+    self.perfLogger.memory['Fault'] = 0
+    self.perfLogger.memory['Output'] = 0
     return