[MOAB-dev] r4615 - MOAB/branches/Version4.0/itaps/imesh

[jvporter at wisc.edu]

Author: jvporter
Date: 2011-03-20 04:18:34 -0500 (Sun, 20 Mar 2011)
New Revision: 4615

Modified:
   MOAB/branches/Version4.0/itaps/imesh/iMeshP_MOAB.cpp
Log:
This file needed to be merged too...


Modified: MOAB/branches/Version4.0/itaps/imesh/iMeshP_MOAB.cpp
===================================================================
--- MOAB/branches/Version4.0/itaps/imesh/iMeshP_MOAB.cpp	2011-03-19 02:38:42 UTC (rev 4614)
+++ MOAB/branches/Version4.0/itaps/imesh/iMeshP_MOAB.cpp	2011-03-20 09:18:34 UTC (rev 4615)
@@ -131,7 +131,7 @@
 
 #endif
 
-#define PCOMM ParallelComm::get_pcomm( MBI, itaps_cast<EntityHandle>(partition_handle) )
+#define PCOMM ParallelComm::get_pcomm( MOABI, itaps_cast<EntityHandle>(partition_handle) )
 
 // Need a different function name for Tag because (currently)
 // both Tag and iBase_EntityHandle are void**.
@@ -213,18 +213,18 @@
   ErrorCode rval;
   
   if (!set1) {
-    rval = get_entities( MBI, itaps_cast<EntityHandle>(set2), type, topo, result );
+    rval = get_entities( MOABI, itaps_cast<EntityHandle>(set2), type, topo, result );
     CHKERR(rval,"Invalid Part handle");
   }
   else if (!set2) {
-    rval = get_entities( MBI, itaps_cast<EntityHandle>(set1), type, topo, result );
+    rval = get_entities( MOABI, itaps_cast<EntityHandle>(set1), type, topo, result );
     CHKERR(rval,"Invalid set handle");
   }
   else {
     Range r1, r2;
-    rval = get_entities( MBI, itaps_cast<EntityHandle>(set1), type, topo, r1 );
+    rval = get_entities( MOABI, itaps_cast<EntityHandle>(set1), type, topo, r1 );
     CHKERR(rval,"Invalid Part handle");
-    rval = get_entities( MBI, itaps_cast<EntityHandle>(set2), type, topo, r2 );
+    rval = get_entities( MOABI, itaps_cast<EntityHandle>(set2), type, topo, r2 );
     CHKERR(rval,"Invalid set handle");
     result.merge( intersect( r1, r2) );
   }
@@ -248,7 +248,7 @@
   *partition_handle = 0;
 
   Tag prtn_tag;
-  ErrorCode rval = MBI->tag_create( PARALLEL_PARITIONING_TAG_NAME, 
+  ErrorCode rval = MOABI->tag_create( PARALLEL_PARITIONING_TAG_NAME, 
                                       sizeof(int), 
                                       MB_TAG_SPARSE,
                                       MB_TYPE_INTEGER, 
@@ -257,10 +257,10 @@
                                       true ); CHKERR(rval,"tag creation failed");
   
   EntityHandle handle;
-  rval = MBI->create_meshset( MESHSET_SET, handle ); CHKERR(rval,"set creation failed");
-  ParallelComm* pcomm = ParallelComm::get_pcomm( MBI, handle, &communicator );