[MOAB-dev] r2141 - in MOAB/trunk: parallel tools/iMesh

[tautges at mcs.anl.gov]

Author: tautges
Date: 2008-10-14 10:54:32 -0500 (Tue, 14 Oct 2008)
New Revision: 2141

Modified:
   MOAB/trunk/parallel/parallel_unit_tests.cpp
   MOAB/trunk/tools/iMesh/iMesh_MOAB.cpp
Log:
In iMesh_getEntities, allocate array for entities only (without entity sets).

Fixing an include in parallel_unit_tests that shows up with gcc4.3.

Passes make check.


Modified: MOAB/trunk/parallel/parallel_unit_tests.cpp
===================================================================
--- MOAB/trunk/parallel/parallel_unit_tests.cpp	2008-10-13 18:09:18 UTC (rev 2140)
+++ MOAB/trunk/parallel/parallel_unit_tests.cpp	2008-10-14 15:54:32 UTC (rev 2141)
@@ -6,6 +6,7 @@
 #include "MBCore.hpp"
 #include "mpi.h"
 #include <iostream>
+#include <algorithm>
 #include <sstream>
 #include <assert.h>
 

Modified: MOAB/trunk/tools/iMesh/iMesh_MOAB.cpp
===================================================================
--- MOAB/trunk/tools/iMesh/iMesh_MOAB.cpp	2008-10-13 18:09:18 UTC (rev 2140)
+++ MOAB/trunk/tools/iMesh/iMesh_MOAB.cpp	2008-10-14 15:54:32 UTC (rev 2141)
@@ -2673,8 +2673,10 @@
       RETURN(iBase_ERROR_MAP[result]);
     }
 
+    int num_ents = out_entities.size() - out_entities.num_of_type(MBENTITYSET);
+    
     CHECK_SIZE(*entity_handles, *entity_handles_allocated, 
-               (int)out_entities.size(), iBase_EntityHandle, iBase_MEMORY_ALLOCATION_FAILED);
+               num_ents, iBase_EntityHandle, iBase_MEMORY_ALLOCATION_FAILED);
   
     MBRange::iterator iter = out_entities.begin();
     MBRange::iterator end_iter = out_entities.end();