[MOAB-dev] r4107 - in MOAB/trunk: doc itaps/imesh src src/io src/moab

[tautges at mcs.anl.gov]

Author: tautges
Date: 2010-08-20 17:54:53 -0500 (Fri, 20 Aug 2010)
New Revision: 4107

Modified:
   MOAB/trunk/doc/metadata_info.doc
   MOAB/trunk/itaps/imesh/iMesh.h
   MOAB/trunk/src/Core.cpp
   MOAB/trunk/src/io/ReadNC.cpp
   MOAB/trunk/src/io/ReadNC.hpp
   MOAB/trunk/src/io/WriteCCMIO.cpp
   MOAB/trunk/src/moab/Interface.hpp
Log:
io/ReadNC.?pp: adding a bit more NC reader code
io/WriteCCMIO.cpp: account for case where no material sets have been created
doc/metadata_info.doc: small additions, for CCMIO file metadata and parallel status
Core.cpp: changes to allow range-based deletion of entities, for efficiency
Interface.hpp: adding \mainpage section to comments

Passes make check in serial and parallel.




Modified: MOAB/trunk/doc/metadata_info.doc
===================================================================
(Binary files differ)

Modified: MOAB/trunk/itaps/imesh/iMesh.h
===================================================================
--- MOAB/trunk/itaps/imesh/iMesh.h	2010-08-18 21:07:01 UTC (rev 4106)
+++ MOAB/trunk/itaps/imesh/iMesh.h	2010-08-20 22:54:53 UTC (rev 4107)
@@ -13,7 +13,7 @@
    * to this interface, for example mesh smoothing, adaptive mesh refinement,
    * and parallel mesh support.
    *
-   * \section ITAPS Data Model
+   * \section DataModel Data Model
    *
    * The ITAPS interfaces use a data model composed of four basic data types: \n
    * \em Entity: basic topological entities in a mesh, e.g. vertices, 
@@ -37,14 +37,14 @@
    * types, Entity Type in the iBase_EntityType enumeration, and
    * Entity Topology in the iMesh_EntityTopology enumeration.
    *
-   * \section KTAPS Entity-, Array-, and Iterator-Based Access
+   * \section Access Entity-, Array-, and Iterator-Based Access
    *
    * The iMesh interface provides functions for accessing entities
    * individually, as arrays of entities, or using iterators.  These access
    * methods have different memory versus execution time tradeoffs, 
    * depending on the implementation.
    *
-   * \section LTAPS Lists Passed Through Interface
+   * \section Lists Lists Passed Through Interface
    *
    * Many of the functions in iMesh have arguments corresponding to lists of 
    * objects.  In-type arguments for lists consist of a pointer to an array and

Modified: MOAB/trunk/src/Core.cpp
===================================================================
--- MOAB/trunk/src/Core.cpp	2010-08-18 21:07:01 UTC (rev 4106)
+++ MOAB/trunk/src/Core.cpp	2010-08-20 22:54:53 UTC (rev 4107)
@@ -2183,6 +2183,7 @@
 ErrorCode Core::delete_entities(const Range &range)
 {
   ErrorCode result = MB_SUCCESS, temp_result;
+  Range failed_ents;
   
   for (Range::const_reverse_iterator rit = range.rbegin(); rit != range.rend(); rit++) {
     
@@ -2190,6 +2191,7 @@
     temp_result = aEntityFactory->notify_delete_entity(*rit);
     if (MB_SUCCESS != temp_result) {
       result = temp_result;