[cig-commits] r14831 - in short/3D/PyLith/branches/pylith-swig: pylith/meshio unittests/pytests/meshio

[brad at geodynamics.org]

Author: brad
Date: 2009-04-30 21:52:55 -0700 (Thu, 30 Apr 2009)
New Revision: 14831

Modified:
   short/3D/PyLith/branches/pylith-swig/pylith/meshio/OutputManager.py
   short/3D/PyLith/branches/pylith-swig/unittests/pytests/meshio/TestOutputManagerMesh.py
   short/3D/PyLith/branches/pylith-swig/unittests/pytests/meshio/TestOutputManagerSubMesh.py
Log:
Fixed tests of OutputManager.checkWrite().

Modified: short/3D/PyLith/branches/pylith-swig/pylith/meshio/OutputManager.py
===================================================================
--- short/3D/PyLith/branches/pylith-swig/pylith/meshio/OutputManager.py	2009-05-01 00:43:04 UTC (rev 14830)
+++ short/3D/PyLith/branches/pylith-swig/pylith/meshio/OutputManager.py	2009-05-01 04:52:55 UTC (rev 14831)
@@ -18,8 +18,6 @@
 ## Factory: output_manager
 
 from pylith.utils.PetscComponent import PetscComponent
-from meshio import MeshOutputManager as ModuleMeshObject
-from meshio import SubMeshOutputManager as ModuleSubMeshObject
 
 # OutputManager class
 class OutputManager(PetscComponent):
@@ -133,8 +131,8 @@
     self._logger.eventBegin(logEvent)    
 
     # Nondimensionalize time step
-    lengthScale = normalizer.timeScale()
-    self.dt = normalizer.nondimensionalize(self.dt, lengthScale)
+    timeScale = normalizer.timeScale()
+    self.dtN = normalizer.nondimensionalize(self.dt, timeScale)
 
     # Initialize coordinate system
     if self.coordsys is None:
@@ -159,7 +157,7 @@
     if numTimeSteps > 0 and self.outputFreq == "skip" and self.skip > 0:
       nsteps = int(numTimeSteps / (1+self.skip))
     elif numTimeSteps > 0 and self.outputFreq == "time_step":
-      nsteps = 1 + int(totalTime / self.dt)
+      nsteps = 1 + int(totalTime / self.dtN)
 
     (mesh, label, labelId) = self.dataProvider.getDataMesh()
     self._open(mesh, nsteps, label, labelId)
@@ -246,7 +244,14 @@
     PetscComponent._configure(self)
     return
 
+  def _createModuleObj(self):
+    """
+    Create handle to C++ object.
+    """
+    raise NotImplementedError, \
+        "Please implement _createModuleObj() in derived class."
 
+
   def _checkWrite(self, t):
     """
     Check if we want to write data at time t.
@@ -265,7 +270,7 @@
         self._stepWrite = self._stepCur
 
     elif self.outputFreq == "time_step":
-      if t >= self._tWrite + self.dt:
+      if t >= self._tWrite + self.dtN:
        write = True
        self._tWrite = t
 

Modified: short/3D/PyLith/branches/pylith-swig/unittests/pytests/meshio/TestOutputManagerMesh.py
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/pytests/meshio/TestOutputManagerMesh.py	2009-05-01 00:43:04 UTC (rev 14830)
+++ short/3D/PyLith/branches/pylith-swig/unittests/pytests/meshio/TestOutputManagerMesh.py	2009-05-01 04:52:55 UTC (rev 14831)
@@ -277,14 +277,14 @@
 
     # Check writing based on time
     output = OutputManagerMesh()
+    output.inventory.writer._configure()
     output._configure()
-    output.writer._configure()
     output.preinitialize(dataProvider)
     output.initialize(self.normalizer)
 
-    output.outputFreq = "time_step"
+    output.inventory.outputFreq = "time_step"
     t = 0.0
-    dt = output.dt
+    dt = output.dtN
     self.assertEqual(True, output._checkWrite(t))
     self.assertEqual(False, output._checkWrite(t))
     self.assertEqual(False, output._checkWrite(t + 0.8*dt))
@@ -295,12 +295,12 @@
     
     # Check writing based on number of steps
     output = OutputManagerMesh()
+    output.inventory.writer._configure()
+    output.inventory.outputFreq = "skip"
+    output.inventory.skip = 1
     output._configure()
-    output.writer._configure()
     output.preinitialize(dataProvider)
     output.initialize(self.normalizer)
-    output.outputFreq = "skip"
-    output.skip = 1
     t = 0.0
     dt = 1.0
     self.assertEqual(True, output._checkWrite(t))
@@ -308,7 +308,7 @@
     self.assertEqual(False, output._checkWrite(t))
     t += dt
     self.assertEqual(True, output._checkWrite(t))
-    output.skip = 2
+    output.inventory.skip = 2
     t += dt
     self.assertEqual(False, output._checkWrite(t))
     t += dt

Modified: short/3D/PyLith/branches/pylith-swig/unittests/pytests/meshio/TestOutputManagerSubMesh.py
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/pytests/meshio/TestOutputManagerSubMesh.py	2009-05-01 00:43:04 UTC (rev 14830)
+++ short/3D/PyLith/branches/pylith-swig/unittests/pytests/meshio/TestOutputManagerSubMesh.py	2009-05-01 04:52:55 UTC (rev 14831)
@@ -281,14 +281,14 @@
 
     # Check writing based on time
     output = OutputManagerSubMesh()
+    output.inventory.writer._configure()
     output._configure()
-    output.writer._configure()
     output.preinitialize(dataProvider)
     output.initialize(self.normalizer)
 
-    output.outputFreq = "time_step"
+    output.inventory.outputFreq = "time_step"
     t = 0.0
-    dt = output.dt
+    dt = output.dtN
     self.assertEqual(True, output._checkWrite(t))
     self.assertEqual(False, output._checkWrite(t))
     self.assertEqual(False, output._checkWrite(t + 0.8*dt))
@@ -299,12 +299,12 @@
     
     # Check writing based on number of steps
     output = OutputManagerSubMesh()
+    output.inventory.writer._configure()
+    output.inventory.outputFreq = "skip"
+    output.inventory.skip = 1
     output._configure()
-    output.writer._configure()
     output.preinitialize(dataProvider)
     output.initialize(self.normalizer)
-    output.outputFreq = "skip"
-    output.skip = 1
     t = 0.0
     dt = 1.0
     self.assertEqual(True, output._checkWrite(t))
@@ -312,7 +312,7 @@
     self.assertEqual(False, output._checkWrite(t))
     t += dt
     self.assertEqual(True, output._checkWrite(t))
-    output.skip = 2
+    output.inventory.skip = 2
     t += dt
     self.assertEqual(False, output._checkWrite(t))
     t += dt