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

[brad at geodynamics.org]

Author: brad
Date: 2013-05-11 15:04:53 -0700 (Sat, 11 May 2013)
New Revision: 22051

Modified:
   short/3D/PyLith/trunk/libsrc/pylith/meshio/CellFilterAvg.cc
   short/3D/PyLith/trunk/libsrc/pylith/topology/Field.cc
Log:
Fixed bug in using label with CellFilterAvg.

Modified: short/3D/PyLith/trunk/libsrc/pylith/meshio/CellFilterAvg.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/meshio/CellFilterAvg.cc	2013-05-11 22:04:34 UTC (rev 22050)
+++ short/3D/PyLith/trunk/libsrc/pylith/meshio/CellFilterAvg.cc	2013-05-11 22:04:53 UTC (rev 22051)
@@ -113,7 +113,7 @@
     numCells = cEnd - cStart;
   } else {
     const PetscInt *cells = NULL;
-    err = DMPlexGetStratumIS(dmMesh, label, 1, &cellIS);PYLITH_CHECK_ERROR(err);
+    err = DMPlexGetStratumIS(dmMesh, label, labelId, &cellIS);PYLITH_CHECK_ERROR(err);
     err = ISGetSize(cellIS, &numCells);PYLITH_CHECK_ERROR(err);
     err = ISGetIndices(cellIS, &cells);PYLITH_CHECK_ERROR(err);
     cStart = cells[0];

Modified: short/3D/PyLith/trunk/libsrc/pylith/topology/Field.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/topology/Field.cc	2013-05-11 22:04:34 UTC (rev 22050)
+++ short/3D/PyLith/trunk/libsrc/pylith/topology/Field.cc	2013-05-11 22:04:53 UTC (rev 22051)
@@ -1393,15 +1393,19 @@
 pylith::topology::Field<mesh_type>::addField(const char *name,
 					     int numComponents)
 { // addField
+  PYLITH_METHOD_BEGIN;
+
   // Keep track of name/components until setup
   _tmpFields[name] = numComponents;
   _metadata[name]  = _metadata["default"];
+
+  PYLITH_METHOD_END;
 } // addField
 
 // ----------------------------------------------------------------------
 template<typename mesh_type>
 void
-pylith::topology::Field<mesh_type>::setupFields()
+pylith::topology::Field<mesh_type>::setupFields(void)
 { // setupFields
   PYLITH_METHOD_BEGIN;