[cig-commits] r8994 - short/3D/PyLith/trunk/libsrc/meshio
brad at geodynamics.org
brad at geodynamics.org
Tue Jan 8 11:14:03 PST 2008
Author: brad
Date: 2008-01-08 11:14:02 -0800 (Tue, 08 Jan 2008)
New Revision: 8994
Modified:
short/3D/PyLith/trunk/libsrc/meshio/DataWriter.hh
short/3D/PyLith/trunk/libsrc/meshio/DataWriterVTK.cc
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/DataWriter.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/meshio/DataWriter.hh 2008-01-08 17:57:44 UTC (rev 8993)
+++ short/3D/PyLith/trunk/libsrc/meshio/DataWriter.hh 2008-01-08 19:14:02 UTC (rev 8994)
@@ -19,7 +19,7 @@
#if !defined(pylith_meshio_datawriter_hh)
#define pylith_meshio_datawriter_hh
-#include "pylith/utils/petscfwd.hh" // USES PetscVec
+#include "pylith/utils/petscfwd.h" // USES PetscVec
#include "pylith/utils/sievetypes.hh" // USES ALE::Mesh, real_section_type
namespace pylith {
Modified: short/3D/PyLith/trunk/libsrc/meshio/DataWriterVTK.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/meshio/DataWriterVTK.cc 2008-01-08 17:57:44 UTC (rev 8993)
+++ short/3D/PyLith/trunk/libsrc/meshio/DataWriterVTK.cc 2008-01-08 19:14:02 UTC (rev 8994)
@@ -143,8 +143,7 @@
buffer << name << "_t" << timestamp;
err = PetscViewerPushFormat(_viewer, PETSC_VIEWER_ASCII_VTK_CELL);
-
- PetscErrorCode err = VecView(*vec, _viewer);
+ err = VecView(*vec, _viewer);
if (err)
throw std::runtime_error("Could not write cell data.");
} catch (const std::exception& err) {
Modified: short/3D/PyLith/trunk/libsrc/meshio/OutputManager.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/meshio/OutputManager.cc 2008-01-08 17:57:44 UTC (rev 8993)
+++ short/3D/PyLith/trunk/libsrc/meshio/OutputManager.cc 2008-01-08 19:14:02 UTC (rev 8994)
@@ -15,6 +15,7 @@
#include "OutputManager.hh" // implementation of class methods
#include "DataWriter.hh" // HOLDSA DataWriter
+#include "pylith/topology/FieldsManager.hh" // USES FieldsManager
#if 0 // TEMPORARY
#include "VertexFilter.hh" // HOLDS VertexFilter
#include "CellFilter.hh" // HOLDS CellFilter
@@ -108,7 +109,7 @@
void
pylith::meshio::OutputManager::writeFields(
const double t,
- const topology::FieldsManager* fields,
+ topology::FieldsManager* const fields,
const ALE::Obj<ALE::Mesh>& mesh,
const spatialdata::geocoords::CoordSys* csMesh)
{ // writeFields
@@ -120,7 +121,7 @@
const int nvfields = _vertexFields.size();
for (int i=0; i < nvfields; ++i) {
const ALE::Obj<real_section_type>& field =
- fields->getReal(_vertexFields[i]);
+ fields->getReal(_vertexFields[i].c_str());
// Create PETSc Vec for field values (if nec)
// ADD STUFF HERE
@@ -138,7 +139,7 @@
const int ncfields = _cellFields.size();
for (int i=0; i < ncfields; ++i) {
const ALE::Obj<real_section_type>& field =
- fields->getReal(_cellFields[i]);
+ fields->getReal(_cellFields[i].c_str());
// Create PETSc Vec for field values (if nec)
// ADD STUFF HERE
Modified: short/3D/PyLith/trunk/libsrc/meshio/OutputManager.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/meshio/OutputManager.hh 2008-01-08 17:57:44 UTC (rev 8993)
+++ short/3D/PyLith/trunk/libsrc/meshio/OutputManager.hh 2008-01-08 19:14:02 UTC (rev 8994)
@@ -106,7 +106,7 @@
* @param csMesh Coordinate system of mesh geometry
*/
void writeFields(const double t,
- const topology::FieldsManager* fields,
+ topology::FieldsManager* const fields,
const ALE::Obj<ALE::Mesh>& mesh,
const spatialdata::geocoords::CoordSys* csMesh);
More information about the cig-commits
mailing list