[cig-commits] r12892 - in short/3D/PyLith/trunk: libsrc/meshio pylith/meshio

[brad at geodynamics.org]

Author: brad
Date: 2008-09-16 13:43:58 -0700 (Tue, 16 Sep 2008)
New Revision: 12892

Modified:
   short/3D/PyLith/trunk/libsrc/meshio/DataWriterVTK.cc
   short/3D/PyLith/trunk/pylith/meshio/OutputManager.py
Log:
Fixed setting filename for VTK info files (based on numTimeSteps==0).

Modified: short/3D/PyLith/trunk/libsrc/meshio/DataWriterVTK.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/meshio/DataWriterVTK.cc	2008-09-16 20:42:48 UTC (rev 12891)
+++ short/3D/PyLith/trunk/libsrc/meshio/DataWriterVTK.cc	2008-09-16 20:43:58 UTC (rev 12892)
@@ -84,7 +84,7 @@
   try {
     PetscErrorCode err;
 
-    const std::string filename = _vtkFilename(t);
+    const std::string& filename = _vtkFilename(t);
 
     err = PetscViewerCreate(mesh->comm(), &_viewer);
     err = PetscViewerSetType(_viewer, PETSC_VIEWER_ASCII);
@@ -94,9 +94,9 @@
       throw std::runtime_error("Could not open VTK file.");
     
     err = VTKViewer::writeHeader(_viewer);
-    //std::cout << "Wrote header for " << _filename << std::endl;
+    //std::cout << "Wrote header for " << filename << std::endl;
     err = VTKViewer::writeVertices(mesh, _viewer);
-    //std::cout << "Wrote vertices for " << _filename << std::endl;
+    //std::cout << "Wrote vertices for " << filename << std::endl;
     if (0 == label)
       err = VTKViewer::writeElements(mesh, _viewer);
     else {
@@ -106,7 +106,7 @@
     } // if
     if (err)
       throw std::runtime_error("Could not write topology.");
-    //std::cout << "Wrote elements for " << _filename << std::endl;
+    //std::cout << "Wrote elements for " << filename << std::endl;
 
     _wroteVertexHeader = false;
     _wroteCellHeader = false;

Modified: short/3D/PyLith/trunk/pylith/meshio/OutputManager.py
===================================================================
--- short/3D/PyLith/trunk/pylith/meshio/OutputManager.py	2008-09-16 20:42:48 UTC (rev 12891)
+++ short/3D/PyLith/trunk/pylith/meshio/OutputManager.py	2008-09-16 20:43:58 UTC (rev 12892)
@@ -166,9 +166,9 @@
     self._logger.eventBegin(logEvent)    
 
     nsteps = numTimeSteps
-    if self.outputFreq == "skip" and self.skip > 0:
+    if numTimeSteps > 0 and self.outputFreq == "skip" and self.skip > 0:
       nsteps = numTimeSteps / (1+self.skip)
-    elif self.outputFreq == "time_step":
+    elif numTimeSteps > 0 and self.outputFreq == "time_step":
       nsteps = 1 + int(totalTime / self.dt)
 
     (mesh, label, labelId) = self.dataProvider.getDataMesh()