[MOAB-dev] r4524 - in MOAB/trunk: itaps/igeom src src/moab

[iulian at mcs.anl.gov]

Author: iulian
Date: 2011-02-23 17:04:05 -0600 (Wed, 23 Feb 2011)
New Revision: 4524

Modified:
   MOAB/trunk/itaps/igeom/iGeom_MOAB.cpp
   MOAB/trunk/src/FBEngine.cpp
   MOAB/trunk/src/moab/FBEngine.hpp
Log:
small bug in getting measures for more than 1 entity in iGeom_MOAB
more methods needed for FBiGeom implementation of iGeom 
It is a partial implementation, but it should be enough for MeshKit
 (more might be needed)


Modified: MOAB/trunk/itaps/igeom/iGeom_MOAB.cpp
===================================================================
--- MOAB/trunk/itaps/igeom/iGeom_MOAB.cpp	2011-02-23 23:00:37 UTC (rev 4523)
+++ MOAB/trunk/itaps/igeom/iGeom_MOAB.cpp	2011-02-23 23:04:05 UTC (rev 4524)
@@ -1440,7 +1440,7 @@
       (*measures)[i] = 0.;
 
       int type;
-      iGeom_getEntType(instance, entity_handles[0], &type, err);
+      iGeom_getEntType(instance, entity_handles[i], &type, err);
       ERRORR("Failed to get entity type in iGeom_measure.");
 
       if (type == 1) { // edge

Modified: MOAB/trunk/src/FBEngine.cpp
===================================================================
--- MOAB/trunk/src/FBEngine.cpp	2011-02-23 23:00:37 UTC (rev 4523)
+++ MOAB/trunk/src/FBEngine.cpp	2011-02-23 23:04:05 UTC (rev 4524)
@@ -14,7 +14,6 @@
 #include "SmoothCurve.hpp"
 #include "SmoothFace.hpp"
 
-
 // this is just to replace MBI with moab interface, which is _mbImpl in this class
 #define MBI _mbImpl
 #define MBERRORR(rval, STR) { if (MB_SUCCESS != rval) { std::cout<<STR<<std::endl; return rval; } }
@@ -30,9 +29,8 @@
 }
 
 FBEngine::FBEngine(Interface *impl, GeomTopoTool * topoTool, const bool smooth) :
-  _mbImpl(impl), _my_geomTopoTool(topoTool),
-      _t_created(false), _smooth(smooth), _initialized(false),
-      _smthFace(NULL), _smthCurve(NULL)
+  _mbImpl(impl), _my_geomTopoTool(topoTool), _t_created(false),
+      _smooth(smooth), _initialized(false), _smthFace(NULL), _smthCurve(NULL)
 {
   if (!_my_geomTopoTool)
   {
@@ -269,8 +267,7 @@
   }
   Range sets;
   // see now if they are in the set passed as input or not
-  ErrorCode rval = MBI->get_entities_by_type(set_handle, MBENTITYSET,
-      sets);
+  ErrorCode rval = MBI->get_entities_by_type(set_handle, MBENTITYSET, sets);
   MBERRORR(rval, "can't get sets in the initial set");
   gentities = intersect(gentities, sets);
 
@@ -377,9 +374,8 @@
 
   return MB_SUCCESS;