[cig-commits] r15227 - in short/3D/PyLith/trunk/pylith: materials perf

[brad at geodynamics.org]

Author: brad
Date: 2009-06-12 22:06:15 -0700 (Fri, 12 Jun 2009)
New Revision: 15227

Modified:
   short/3D/PyLith/trunk/pylith/materials/Material.py
   short/3D/PyLith/trunk/pylith/perf/MemoryLogger.py
Log:
Moved memory calculation of material fields to Material object.

Modified: short/3D/PyLith/trunk/pylith/materials/Material.py
===================================================================
--- short/3D/PyLith/trunk/pylith/materials/Material.py	2009-06-13 03:35:11 UTC (rev 15226)
+++ short/3D/PyLith/trunk/pylith/materials/Material.py	2009-06-13 05:06:15 UTC (rev 15227)
@@ -147,6 +147,8 @@
     Model allocated memory.
     """
     self.perfLogger.logMaterial('Materials', self)
+    self.perfLogger.logField('Materials', self.propertiesField())
+    self.perfLogger.logField('Materials', self.stateVarsField())
     return
 
 

Modified: short/3D/PyLith/trunk/pylith/perf/MemoryLogger.py
===================================================================
--- short/3D/PyLith/trunk/pylith/perf/MemoryLogger.py	2009-06-13 03:35:11 UTC (rev 15226)
+++ short/3D/PyLith/trunk/pylith/perf/MemoryLogger.py	2009-06-13 05:06:15 UTC (rev 15227)
@@ -96,8 +96,6 @@
     materialModel = pylith.perf.Material.Material(material.label(), 
                                                   material.ncells)
     materialModel.tabulate(self.memory[stage])
-    self.logField(stage, material.propertiesField())
-    self.logField(stage, material.stateVarsField())
     return