[cig-commits] r9320 - short/3D/PyLith/trunk/libsrc/meshio

[brad at geodynamics.org]

Author: brad
Date: 2008-02-13 14:54:33 -0800 (Wed, 13 Feb 2008)
New Revision: 9320

Modified:
   short/3D/PyLith/trunk/libsrc/meshio/DataWriterVTK.cc
Log:
Fixed bug in output of state variables without faults (use 'depth', not 'censored depth').

Modified: short/3D/PyLith/trunk/libsrc/meshio/DataWriterVTK.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/meshio/DataWriterVTK.cc	2008-02-13 22:35:33 UTC (rev 9319)
+++ short/3D/PyLith/trunk/libsrc/meshio/DataWriterVTK.cc	2008-02-13 22:54:33 UTC (rev 9320)
@@ -95,8 +95,11 @@
     err = VTKViewer::writeVertices(mesh, _viewer);
     if (0 == label)
       err = VTKViewer::writeElements(mesh, _viewer);
-    else
-      err = VTKViewer::writeElements(mesh, label, labelId, "censored depth", 0, _viewer);      
+    else {
+      const std::string labelName = 
+	(mesh->hasLabel("censored depth")) ? "censored depth" : "depth";
+      err = VTKViewer::writeElements(mesh, label, labelId, labelName, 0, _viewer);      
+    } // if
     if (err)
       throw std::runtime_error("Could not write topology.");
 
@@ -189,15 +192,8 @@
   assert(0 != name);
 
   try {
-    std::string    labelName;
-    PetscErrorCode err = 0;
-
-    if (mesh->hasLabel("censored depth")) {
-      labelName = "censored depth";
-    } else {
-      labelName = "depth";
-    }
-
+    const std::string labelName = 
+      (mesh->hasLabel("censored depth")) ? "censored depth" : "depth";
     const ALE::Obj<Mesh::numbering_type>& numbering = 
       mesh->getFactory()->getNumbering(mesh, labelName, mesh->depth());
     const int fiberDim = 
@@ -206,8 +202,8 @@
     const int enforceDim = (fieldType != VECTOR_FIELD) ? fiberDim : 3;
 
     if (!_wroteCellHeader) {
-      err = PetscViewerASCIIPrintf(_viewer, "CELL_DATA %d\n", 
-				   numbering->getGlobalSize());
+      PetscErrorCode err = PetscViewerASCIIPrintf(_viewer, "CELL_DATA %d\n", 
+						  numbering->getGlobalSize());
       if (err)
 	throw std::runtime_error("Could not write VTK point data header.");
       _wroteCellHeader = true;