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

[brad at geodynamics.org]

Author: brad
Date: 2008-01-12 20:20:53 -0800 (Sat, 12 Jan 2008)
New Revision: 9001

Modified:
   short/3D/PyLith/trunk/libsrc/meshio/OutputManager.cc
   short/3D/PyLith/trunk/libsrc/meshio/OutputManager.hh
Log:
Fixed compilation errors.

Modified: short/3D/PyLith/trunk/libsrc/meshio/OutputManager.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/meshio/OutputManager.cc	2008-01-13 00:31:29 UTC (rev 9000)
+++ short/3D/PyLith/trunk/libsrc/meshio/OutputManager.cc	2008-01-13 04:20:53 UTC (rev 9001)
@@ -143,7 +143,7 @@
     const ALE::Obj<real_section_type>& fieldFiltered = 
       (0 != _vertexFilter) ? field : _vertexFilter->filter(field, mesh);
 
-    _writer->writeVertexField(t, fieldFiltered, fieldName, mesh);
+    _writer->writeVertexField(t, fieldName, fieldFiltered, mesh);
   } // for
 
   for (map_names_type::iterator f_iter=_cellFields.begin();
@@ -156,7 +156,7 @@
     const ALE::Obj<real_section_type>& fieldFiltered = 
       (0 != _cellFilter) ? field : _cellFilter->filter(field, mesh);
 
-    _writer->writeCellField(t, fieldFiltered, fieldName, mesh);
+    _writer->writeCellField(t, fieldName, fieldFiltered, mesh);
   } // for
 
   _writer->closeTimeStep();
@@ -197,23 +197,25 @@
   const ALE::Obj<real_section_type>& fieldFiltered = 
     (0 != _vertexFilter) ? field : _vertexFilter->filter(field, mesh);
 
-  _writer->writeVertexField(t, fieldFiltered, name, mesh);
+  _writer->writeVertexField(t, name, fieldFiltered, mesh);
 } // appendVertexField
 
 // ----------------------------------------------------------------------
 // Append finite-element cell field to file.
 void
-appendCellField(const double t,
-		const ALE::Obj<real_section_type>& field,
-		const ALE::Obj<ALE::Mesh>& mesh,
-		const spatialdata::geocoords::CoordSys* csMesh)
+pylith::meshio::OutputManager::appendCellField(
+				const double t,
+				const char* name,
+				const ALE::Obj<real_section_type>& field,
+				const ALE::Obj<ALE::Mesh>& mesh,
+				const spatialdata::geocoords::CoordSys* csMesh)
 { // appendCellField
   assert(0 != name);
 
   const ALE::Obj<real_section_type>& fieldFiltered = 
     (0 != _cellFilter) ? field : _cellFilter->filter(field, mesh);
 
-  _writer->writeCellField(t, fieldFiltered, name, mesh);
+  _writer->writeCellField(t, name, fieldFiltered, mesh);
 } // appendCellField
 
 

Modified: short/3D/PyLith/trunk/libsrc/meshio/OutputManager.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/meshio/OutputManager.hh	2008-01-13 00:31:29 UTC (rev 9000)
+++ short/3D/PyLith/trunk/libsrc/meshio/OutputManager.hh	2008-01-13 04:20:53 UTC (rev 9001)
@@ -148,11 +148,13 @@
   /** Append finite-element vertex field to file.
    *
    * @param t Time associated with field.
+   * @param name Name of field.
    * @param field Vertex field.
    * @param mesh PETSc mesh object.
    * @param csMesh Coordinate system of mesh geometry
    */
   void appendVertexField(const double t,
+			 const char* name,
 			 const ALE::Obj<real_section_type>& field,
 			 const ALE::Obj<ALE::Mesh>& mesh,
 			 const spatialdata::geocoords::CoordSys* csMesh);
@@ -160,11 +162,13 @@
   /** Append finite-element cell field to file.
    *
    * @param t Time associated with field.
+   * @param name Name of field.
    * @param field Cell field.
    * @param mesh PETSc mesh object.
    * @param csMesh Coordinate system of mesh geometry
    */
   void appendCellField(const double t,
+		       const char* name,
 		       const ALE::Obj<real_section_type>& field,
 		       const ALE::Obj<ALE::Mesh>& mesh,
 		       const spatialdata::geocoords::CoordSys* csMesh);