[MOAB-dev] r2550 - MOAB/trunk/tools/iMesh

[kraftche at mcs.anl.gov]

Author: kraftche
Date: 2009-01-14 17:49:37 -0600 (Wed, 14 Jan 2009)
New Revision: 2550

Modified:
   MOAB/trunk/tools/iMesh/iMesh_MOAB.cpp
   MOAB/trunk/tools/iMesh/iMesh_MOAB.hpp
Log:
o Back out addition of "HIGHER_ORDER_ADJ" option (r2537 & r2539)
o Revert getEntArrAdj to old behavior wrt higher-order elements:
   always return complete connectivity array.


Modified: MOAB/trunk/tools/iMesh/iMesh_MOAB.cpp
===================================================================
--- MOAB/trunk/tools/iMesh/iMesh_MOAB.cpp	2009-01-14 23:40:24 UTC (rev 2549)
+++ MOAB/trunk/tools/iMesh/iMesh_MOAB.cpp	2009-01-14 23:49:37 UTC (rev 2550)
@@ -17,9 +17,8 @@
 #include <cassert>
 #define MIN(a,b) (a < b ? a : b)
 
-MBiMesh::MBiMesh(bool adj_includes_ho)
-    : haveDeletedEntities(false),
-      fullConnectivity(adj_includes_ho)
+MBiMesh::MBiMesh()
+    : haveDeletedEntities(false)
 {
   memset(AdjTable, 0, 16*sizeof(int));
   for (int i = 0; i < 4; i++) AdjTable[4*i] = AdjTable[i] = 1;
@@ -255,7 +254,6 @@
     FileOptions opts((std::string(";") + tmp_options).c_str());
 
     MBInterface* core;
-    bool full_conn = (MB_SUCCESS == opts.get_null_option("HIGHER_ORDER_ADJ"));
 
     MBErrorCode result = opts.get_null_option("PARALLEL");
     if (MB_SUCCESS == result) {
@@ -269,7 +267,7 @@
           // mpi not initialized yet - initialize here
         retval = MPI_Init(&argc, &argv);
       }
-      core = new MBiMesh(full_conn);
+      core = new MBiMesh;
 #else
         //mError->set_last_error( "PARALLEL option not valid, this instance"
         //                        " compiled for serial execution.\n" );
@@ -277,7 +275,7 @@
       return;
 #endif
     }
-    else core = new MBiMesh(full_conn);
+    else core = new MBiMesh;
 
     *instance = reinterpret_cast<iMesh_Instance>(core);
     if (0 == *instance) {
@@ -992,7 +990,6 @@
     std::vector<MBEntityHandle> adj_ents;
     const MBEntityHandle *connect;
     int num_connect;
-    const bool topo_only = !reinterpret_cast<MBiMesh*>(instance)->adj_includes_ho_nodes();
     
     MBEntityHandle* array; // ptr to working array of result handles
     int array_alloc;       // allocated size of 'array'
@@ -1013,8 +1010,7 @@
       
       if (iBase_VERTEX == entity_type_requested &&
           TYPE_FROM_HANDLE(*entity_iter) != MBPOLYHEDRON) {
-        result = MBI->get_connectivity(*entity_iter, connect, num_connect, 
-                                       topo_only, &conn_storage);
+        result = MBI->get_connectivity(*entity_iter, connect, num_connect, false, &conn_storage);
         if (MB_SUCCESS != result) {
           iMesh_processError(iBase_ERROR_MAP[result], "iMesh_getEntArrAdj: trouble getting adjacency list.");
           RETURN(iBase_ERROR_MAP[result]);

Modified: MOAB/trunk/tools/iMesh/iMesh_MOAB.hpp
===================================================================
--- MOAB/trunk/tools/iMesh/iMesh_MOAB.hpp	2009-01-14 23:40:24 UTC (rev 2549)
+++ MOAB/trunk/tools/iMesh/iMesh_MOAB.hpp	2009-01-14 23:49:37 UTC (rev 2550)
@@ -46,9 +46,8 @@
 {
 private:
   bool haveDeletedEntities;
-  bool fullConnectivity;
 public:
-  MBiMesh(bool adj_includes_ho = false);
+  MBiMesh();
 
   virtual ~MBiMesh();
   bool have_deleted_ents( bool reset ) {
@@ -62,7 +61,6 @@
   virtual MBErrorCode delete_entities( const MBEntityHandle*, const int );
   virtual MBErrorCode delete_entities( const MBRange& );
   int AdjTable[16];
-  bool adj_includes_ho_nodes() const { return fullConnectivity; }
 };
 
 #define MBimesh reinterpret_cast<MBiMesh*>(MBI)