[MOAB-dev] r4300 - in MOAB/trunk: examples src/parallel

[tautges at mcs.anl.gov]

Author: tautges
Date: 2010-11-23 16:11:48 -0600 (Tue, 23 Nov 2010)
New Revision: 4300

Modified:
   MOAB/trunk/examples/FileRead.cpp
   MOAB/trunk/src/parallel/ParallelComm.cpp
Log:
Thought I fixed this with the last commit, but must've removed it.  Again,
fixing a problem where a face is interpreted as being shared with itself.

Chaning FileRead example over to namespace'd code.



Modified: MOAB/trunk/examples/FileRead.cpp
===================================================================
--- MOAB/trunk/examples/FileRead.cpp	2010-11-23 19:34:46 UTC (rev 4299)
+++ MOAB/trunk/examples/FileRead.cpp	2010-11-23 22:11:48 UTC (rev 4300)
@@ -4,10 +4,11 @@
 #include <string>
 #include <sstream> 
 
-#include "MBCore.hpp"
-#include "MBReadUtilIface.hpp"
+#include "moab/Core.hpp"
+#include "moab/ReadUtilIface.hpp"
 
 using namespace std;
+using namespace moab;
 
 int comment(string & line)
 {
@@ -21,13 +22,13 @@
     return 0; // a line with some data in it, then
 
 }
-MBErrorCode ReadTriangleOutput( MBCore *mb, string fileBase ) {    
+ErrorCode ReadTriangleOutput( Core *mb, string fileBase ) {    
   
   //
   // get the read interface from moab
   void* ptr = 0;
-  mb->query_interface("MBReadUtilIface", &ptr);
-  MBReadUtilIface *iface = reinterpret_cast<MBReadUtilIface*>(ptr);
+  mb->query_interface("ReadUtilIface", &ptr);
+  ReadUtilIface *iface = reinterpret_cast<ReadUtilIface*>(ptr);
   //
   if (NULL == iface)
      {
@@ -74,8 +75,8 @@
   //   needed arrays, coordinate arrays
   //   also, it will return a starting handle for the node sequence
   vector<double*> arrays;
-  MBEntityHandle startv;
-  MBErrorCode rval = iface->get_node_coords(2, num_nodes, 0, startv, arrays);
+  EntityHandle startv;
+  ErrorCode rval = iface->get_node_coords(2, num_nodes, 0, startv, arrays);
   for (int i = 0; i < num_nodes; i++)
     {
       getline(nodeFile, line);
@@ -102,8 +103,8 @@
       cout << "num triangles:" << num_triangles << endl; 
     }
 
-  MBEntityHandle starte;