[cig-commits] r17961 - in short/3D/PyLith/trunk: . libsrc/meshio

[brad at geodynamics.org]

Author: brad
Date: 2011-02-23 14:36:43 -0800 (Wed, 23 Feb 2011)
New Revision: 17961

Modified:
   short/3D/PyLith/trunk/configure.ac
   short/3D/PyLith/trunk/libsrc/meshio/MeshIOCubit.cc
Log:
Merge from stable.

Modified: short/3D/PyLith/trunk/configure.ac
===================================================================
--- short/3D/PyLith/trunk/configure.ac	2011-02-23 21:27:12 UTC (rev 17960)
+++ short/3D/PyLith/trunk/configure.ac	2011-02-23 22:36:43 UTC (rev 17961)
@@ -147,6 +147,9 @@
 CIT_NUMPY_PYTHON_MODULE
 CIT_NUMPY_INCDIR
 
+# FIAT
+CIT_PYTHON_MODULE([FIAT])
+
 # SWIG
 if test "$enable_swig" = "yes" ; then
   AC_PROG_SWIG(1.3.33)

Modified: short/3D/PyLith/trunk/libsrc/meshio/MeshIOCubit.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/meshio/MeshIOCubit.cc	2011-02-23 21:27:12 UTC (rev 17960)
+++ short/3D/PyLith/trunk/libsrc/meshio/MeshIOCubit.cc	2011-02-23 22:36:43 UTC (rev 17961)
@@ -63,7 +63,8 @@
 void
 pylith::meshio::MeshIOCubit::_read(void)
 { // _read
-  MPI_Comm comm = _mesh->comm();
+  assert(_mesh);
+
   int rank = 0;
   int meshDim = 0;
   int spaceDim = 0;
@@ -74,7 +75,7 @@
   int_array cells;
   int_array materialIds;
 
-  MPI_Comm_rank(comm, &rank);
+  MPI_Comm_rank(_mesh->comm(), &rank);
   if (0 == rank) {
     try {
       NcFile ncfile(_filename.c_str());