[MOAB-dev] r4946 - in MOAB/trunk: src src/io test

[iulian at mcs.anl.gov]

Author: iulian
Date: 2011-06-05 12:25:15 -0500 (Sun, 05 Jun 2011)
New Revision: 4946

Modified:
   MOAB/trunk/src/GeomTopoTool.cpp
   MOAB/trunk/src/io/Tqdcfr.cpp
   MOAB/trunk/test/gttool_test.cpp
   MOAB/trunk/test/mbfacet_test.cpp
Log:
when restore topology is called, the geom ranges should be filled up
also, set the senses for edge/faces too, not only for face/regions



Modified: MOAB/trunk/src/GeomTopoTool.cpp
===================================================================
--- MOAB/trunk/src/GeomTopoTool.cpp	2011-06-04 13:49:02 UTC (rev 4945)
+++ MOAB/trunk/src/GeomTopoTool.cpp	2011-06-05 17:25:15 UTC (rev 4946)
@@ -304,28 +304,11 @@
   //     add it to list of parents
   //   . make parent/child links with parents
 
-  ErrorCode result;
-  // get the geom topology tag
-  if (0 == geomTag) {
-    result = mdbImpl->tag_get_handle(GEOM_DIMENSION_TAG_NAME, 1, MB_TYPE_INTEGER, geomTag);
-    if (MB_SUCCESS != result)
-      return result;
-  }
+  // the  geomRanges are already known, separated by dimension
 
-  // get all sets with this tag
-  Range geom_sets;
-  result = mdbImpl->get_entities_by_type_and_tag(modelSet, MBENTITYSET, &geomTag,
-      NULL, 1, geom_sets);
-  if (MB_SUCCESS != result || geom_sets.empty())
-    return result;
-
-  Range entities[4];
-  result = separate_by_dimension(geom_sets, entities);
-  if (MB_SUCCESS != result)
-    return result;
-
   std::vector<EntityHandle> parents;
   Range tmp_parents;
+  ErrorCode result;
 
   // loop over dimensions
   for (int dim = 2; dim >= 0; dim--) {
@@ -339,7 +322,7 @@
       continue;
     Range dp1ents;
     std::vector<EntityHandle> owners;
-    for (Range::iterator rit = entities[dim + 1].begin(); rit != entities[dim
+    for (Range::iterator rit = geomRanges[dim + 1].begin(); rit != geomRanges[dim
         + 1].end(); rit++) {
       dp1ents.clear();
       result = mdbImpl->get_entities_by_dimension(*rit, dim + 1, dp1ents);
@@ -352,8 +335,8 @@
         continue;
     }
 
-    for (Range::iterator d_it = entities[dim].begin(); d_it
-        != entities[dim].end(); d_it++) {
+    for (Range::iterator d_it = geomRanges[dim].begin(); d_it