[MOAB-dev] r4851 - in MOAB/trunk: . src src/moab test test/perf

[tautges at mcs.anl.gov]

Author: tautges
Date: 2011-05-19 16:50:23 -0500 (Thu, 19 May 2011)
New Revision: 4851

Added:
   MOAB/trunk/src/SetIterator.cpp
   MOAB/trunk/src/moab/SetIterator.hpp
Modified:
   MOAB/trunk/RELEASE_NOTES
   MOAB/trunk/src/Core.cpp
   MOAB/trunk/src/Makefile.am
   MOAB/trunk/src/MeshSet.hpp
   MOAB/trunk/src/WriteUtil.cpp
   MOAB/trunk/src/WriteUtil.hpp
   MOAB/trunk/src/moab/Core.hpp
   MOAB/trunk/src/moab/Forward.hpp
   MOAB/trunk/src/moab/Interface.hpp
   MOAB/trunk/src/moab/WriteUtilIface.hpp
   MOAB/trunk/test/Test_MBMeshSet.cpp
   MOAB/trunk/test/perf/perf.cpp
Log:
Adding native iterator support, though new SetIterator class.  See src/moab/SetIterator.hpp for
details, and test/perf/perf.cpp for example of their usage.

Also refactored perf test a bit, to run all four test types (including one for iterators) on the same run, 
instead of requiring a separate run for each test type.

Passes make check, including the tests written to test iterators.

TODO: write new section of user's guide describing usage of iterators.



Modified: MOAB/trunk/RELEASE_NOTES
===================================================================
--- MOAB/trunk/RELEASE_NOTES	2011-05-19 20:15:31 UTC (rev 4850)
+++ MOAB/trunk/RELEASE_NOTES	2011-05-19 21:50:23 UTC (rev 4851)
@@ -3,6 +3,7 @@
 * Parallel read of netcdf-based .nc files using pnetcdf (see doc/metadata_info.pdf)
 * Updated ParaView plugin (see tools/vtkMOABReader/README for details)
 * Direct access to dense tag storage (see tag_iterate function in src/moab/Interface.hpp)
+* Add set iterators (see src/moab/SetIterator.hpp and usage in test/perf/perf.cpp)
 * Fix zoltan build on case-insensitive file systems (e.g. MacOS)
 * Fix netcdf build w/ required HDF5 in non-system path
 

Modified: MOAB/trunk/src/Core.cpp
===================================================================
--- MOAB/trunk/src/Core.cpp	2011-05-19 20:15:31 UTC (rev 4850)
+++ MOAB/trunk/src/Core.cpp	2011-05-19 21:50:23 UTC (rev 4851)
@@ -43,6 +43,7 @@
 #include "moab/ReaderIface.hpp"
 #include "moab/WriterIface.hpp"
 #include "moab/ScdInterface.hpp"
+#include "moab/SetIterator.hpp"
 
 #include "BitTag.hpp"
 #include "DenseTag.hpp"
@@ -97,7 +98,7 @@
 using namespace std;
 
 static inline const MeshSet* get_mesh_set( const SequenceManager* sm,
-                                             EntityHandle h )
+                                    EntityHandle h )
 {
   const EntitySequence* seq;
   if (MBENTITYSET != TYPE_FROM_HANDLE(h) || MB_SUCCESS != sm->find( h, seq ))
@@ -106,7 +107,7 @@
 }
 
 static inline MeshSet* get_mesh_set( SequenceManager* sm,
-                                       EntityHandle h )
+                                     EntityHandle h )
 {
   EntitySequence* seq;
   if (MBENTITYSET != TYPE_FROM_HANDLE(h) || MB_SUCCESS != sm->find( h, seq ))
@@ -3254,7 +3255,6 @@
   return MB_SUCCESS;
 }
 
-
 ErrorCode Core::get_last_error(std::string& info) const
 {
   return mError->get_last_error(info);