[cig-commits] r21652 - short/3D/PyLith/trunk/unittests/libtests/topology

[brad at geodynamics.org]

Author: brad
Date: 2013-03-26 18:22:22 -0700 (Tue, 26 Mar 2013)
New Revision: 21652

Modified:
   short/3D/PyLith/trunk/unittests/libtests/topology/TestMesh.cc
   short/3D/PyLith/trunk/unittests/libtests/topology/TestSubMesh.cc
Log:
Fixed communicator comparisons.

Modified: short/3D/PyLith/trunk/unittests/libtests/topology/TestMesh.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/topology/TestMesh.cc	2013-03-27 01:19:22 UTC (rev 21651)
+++ short/3D/PyLith/trunk/unittests/libtests/topology/TestMesh.cc	2013-03-27 01:22:22 UTC (rev 21652)
@@ -36,21 +36,26 @@
 void
 pylith::topology::TestMesh::testConstructor(void)
 { // testConstructor
+  int result = 0;
+
   Mesh mesh;
   CPPUNIT_ASSERT(mesh._mesh.isNull());
   CPPUNIT_ASSERT_EQUAL(0, mesh.dimension());
   CPPUNIT_ASSERT_EQUAL(false, mesh.debug());
-  CPPUNIT_ASSERT_EQUAL(PETSC_COMM_WORLD, mesh.comm());
+  MPI_Comm_compare(PETSC_COMM_WORLD, mesh.comm(), &result);
+  CPPUNIT_ASSERT_EQUAL(MPI_IDENT, result);
   
   Mesh mesh2(2);
   CPPUNIT_ASSERT(!mesh2._mesh.isNull());
   CPPUNIT_ASSERT_EQUAL(2, mesh2.dimension());
-  CPPUNIT_ASSERT_EQUAL(PETSC_COMM_WORLD, mesh2.comm());
+  MPI_Comm_compare(PETSC_COMM_WORLD, mesh2.comm(), &result);
+  CPPUNIT_ASSERT_EQUAL(MPI_IDENT, result);
 
   Mesh mesh3(1, PETSC_COMM_SELF);
   CPPUNIT_ASSERT(!mesh3._mesh.isNull());
   CPPUNIT_ASSERT_EQUAL(1, mesh3.dimension());
-  CPPUNIT_ASSERT_EQUAL(PETSC_COMM_SELF, mesh3.comm());
+  MPI_Comm_compare(PETSC_COMM_WORLD, mesh3.comm(), &result);
+  CPPUNIT_ASSERT_EQUAL(MPI_CONGRUENT, result);
 } // testConstructor
 
 // ----------------------------------------------------------------------

Modified: short/3D/PyLith/trunk/unittests/libtests/topology/TestSubMesh.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/topology/TestSubMesh.cc	2013-03-27 01:19:22 UTC (rev 21651)
+++ short/3D/PyLith/trunk/unittests/libtests/topology/TestSubMesh.cc	2013-03-27 01:22:22 UTC (rev 21652)
@@ -84,18 +84,11 @@
   
   SubMesh mesh(mesh2D, _TestSubMesh::label);
   CPPUNIT_ASSERT_EQUAL(_TestSubMesh::cellDim-1, mesh.dimension());
-  MPI_Comm commA, commB;
-  PetscObjectGetComm((PetscObject)mesh2D.dmMesh(), &commA);
-  PetscObjectGetComm((PetscObject)mesh.dmMesh(), &commB);
-  std::cout << "mesh2D comm: " << mesh2D.comm()
-	    << ", dm comm: " << commA
-	    << ", PETSC_COMM_WORLD: " << PETSC_COMM_WORLD
-	    << ", PETSC_COMM_SELF: " << PETSC_COMM_SELF
-	    << ", submesh comm: " << mesh.comm()
-	    << ", dm comm: " << commB
-	    << std::endl;
-  CPPUNIT_ASSERT_EQUAL(PETSC_COMM_WORLD, mesh.comm());
 
+  int result = 0;
+  MPI_Comm_compare(PETSC_COMM_WORLD, mesh.comm(), &result);
+  CPPUNIT_ASSERT_EQUAL(MPI_CONGRUENT, result);
+
   // Check vertices
   const PetscDM dmMesh = mesh.dmMesh();CPPUNIT_ASSERT(dmMesh);
   Stratum depthStratum(dmMesh, Stratum::DEPTH, 0);
@@ -131,8 +124,11 @@
   SubMesh mesh;
   mesh.createSubMesh(mesh2D, _TestSubMesh::label);
   CPPUNIT_ASSERT_EQUAL(_TestSubMesh::cellDim-1, mesh.dimension());
-  CPPUNIT_ASSERT_EQUAL(PETSC_COMM_WORLD, mesh.comm());
 
+  int result = 0;
+  MPI_Comm_compare(PETSC_COMM_WORLD, mesh.comm(), &result);
+  CPPUNIT_ASSERT_EQUAL(MPI_CONGRUENT, result);
+
   // Check vertices
   const PetscDM dmMesh = mesh.dmMesh();CPPUNIT_ASSERT(dmMesh);
   Stratum depthStratum(dmMesh, Stratum::DEPTH, 0);
@@ -207,7 +203,9 @@
   _buildMesh(&mesh2D);
   mesh.createSubMesh(mesh2D, _TestSubMesh::label);
 
-  CPPUNIT_ASSERT_EQUAL(PETSC_COMM_WORLD, mesh.comm());
+  int result = 0;
+  MPI_Comm_compare(PETSC_COMM_WORLD, mesh.comm(), &result);
+  CPPUNIT_ASSERT_EQUAL(MPI_CONGRUENT, result);
 } // testComm
 
 // ----------------------------------------------------------------------