[MOAB-dev] r3763 - in MOAB/trunk/src: . io moab parallel

[tautges at mcs.anl.gov]

Author: tautges
Date: 2010-04-09 20:57:56 -0500 (Fri, 09 Apr 2010)
New Revision: 3763

Modified:
   MOAB/trunk/src/Core.cpp
   MOAB/trunk/src/io/Tqdcfr.cpp
   MOAB/trunk/src/io/Tqdcfr.hpp
   MOAB/trunk/src/moab/GeomTopoTool.hpp
   MOAB/trunk/src/parallel/ParallelComm.cpp
Log:
Fix several bugs, most importantly conversion of edges to higher-order edges in
.cub reader.  mbparallelcomm_test now works for 64brick mesh with higher-order nodes, 
and for tjunc7 with up to 20 procs.


Core.cpp: fixed a bit of formatting
GeomTopoTool.hpp: changed order of initialization to get rid of warnings
ParallelComm.cpp:
- inserting more debug output, and another round of shared handle checking
  after shared verts are found but before shared ents are found
- resize some vectors again in case buffProcs.size() has changed
- in a few places, changed calls to get_connectivity to get all verts, not
  just corner ones

Tqdcfr.cpp: 
- store hasMidNodes in BlockHeader, instead of recomputing that data later
- check for higher-order nodes on bounding edges as well as faces



Modified: MOAB/trunk/src/Core.cpp
===================================================================
--- MOAB/trunk/src/Core.cpp	2010-04-09 13:50:26 UTC (rev 3762)
+++ MOAB/trunk/src/Core.cpp	2010-04-10 01:57:56 UTC (rev 3763)
@@ -2335,8 +2335,8 @@
 }
 
 ErrorCode Core::convert_entities( const EntityHandle meshset, 
-                                        const bool mid_side, const bool mid_face, const bool mid_volume,
-                                        Interface::HONodeAddedRemoved* function_object )
+                                  const bool mid_side, const bool mid_face, const bool mid_volume,
+                                  Interface::HONodeAddedRemoved* function_object )
 {
   HigherOrderFactory fact(this, function_object);
   return fact.convert(meshset, mid_side, mid_face, mid_volume);

Modified: MOAB/trunk/src/io/Tqdcfr.cpp
===================================================================
--- MOAB/trunk/src/io/Tqdcfr.cpp	2010-04-09 13:50:26 UTC (rev 3762)
+++ MOAB/trunk/src/io/Tqdcfr.cpp	2010-04-10 01:57:56 UTC (rev 3763)
@@ -329,6 +329,7 @@
     // read blocks...
     // ***********************
   if (debug) std::cout << "Reading blocks... ";
+  Range ho_entities;
   for (unsigned int blindex = 0; 
        blindex < mesh_model->feModelHeader.blockArray.numEntities;
        blindex++) {
@@ -337,6 +338,8 @@
     if (MB_SUCCESS != result)
       return result;
   }
+  
+  
   if (debug) std::cout << mesh_model->feModelHeader.blockArray.numEntities 
                        << " read successfully." << std::endl;;
   
@@ -739,8 +742,8 @@
 }
 
 ErrorCode Tqdcfr::read_block(const double data_version,
-                               Tqdcfr::ModelEntry *model,
-                               Tqdcfr::BlockHeader *blockh)  
+                             Tqdcfr::ModelEntry *model,
+                             Tqdcfr::BlockHeader *blockh)  
 {
   if (blockh->memCt == 0) return MB_SUCCESS;
   
@@ -798,13 +801,21 @@
     // contains an entity set, but we still need to call it on any elements
     // directly in the block (rather than a geometry subset).  So bypass