[MOAB-dev] r4649 - in MOAB/trunk/src: . io io/mhdf/src moab

[tautges at mcs.anl.gov]

Author: tautges
Date: 2011-03-25 13:04:36 -0500 (Fri, 25 Mar 2011)
New Revision: 4649

Modified:
   MOAB/trunk/src/SmoothCurve.cpp
   MOAB/trunk/src/SmoothFace.cpp
   MOAB/trunk/src/io/ReadSms.cpp
   MOAB/trunk/src/io/mhdf/src/file.c
   MOAB/trunk/src/moab/GeomTopoTool.hpp
Log:
Changes to eliminate warnings.

Iulian, when you're back, please glance at my changes to Smooth[Face,Curve].cpp,
to make sure the values initialized are appropriate.

Passes make check.



Modified: MOAB/trunk/src/SmoothCurve.cpp
===================================================================
--- MOAB/trunk/src/SmoothCurve.cpp	2011-03-25 17:47:36 UTC (rev 4648)
+++ MOAB/trunk/src/SmoothCurve.cpp	2011-03-25 18:04:36 UTC (rev 4649)
@@ -122,6 +122,7 @@
 
   CartVect position;
   ErrorCode rval = evaluate_smooth_edge(edge, t, position);
+  if (MB_SUCCESS != rval) return false;
   assert(rval==MB_SUCCESS);
   x = position[0];
   y = position[1];

Modified: MOAB/trunk/src/SmoothFace.cpp
===================================================================
--- MOAB/trunk/src/SmoothFace.cpp	2011-03-25 17:47:36 UTC (rev 4648)
+++ MOAB/trunk/src/SmoothFace.cpp	2011-03-25 18:04:36 UTC (rev 4649)
@@ -124,6 +124,7 @@
 
   ErrorCode rval = project_to_facets_main(loc2, trim, outside, &closestPoint,
       NULL);
+  if (MB_SUCCESS != rval) return;
   assert(rval==MB_SUCCESS);
   x = closestPoint[0];
   y = closestPoint[1];
@@ -150,6 +151,7 @@
   // not interested in normal
   CartVect normal;
   ErrorCode rval = project_to_facets_main(loc2, trim, outside, NULL, &normal);
+  if (MB_SUCCESS != rval) return false;
   assert(rval==MB_SUCCESS);
   nx = normal[0];
   ny = normal[1];
@@ -392,6 +394,7 @@
     assert(nnodes == 2);
     CartVect P[2]; // store the coordinates for the nodes
     ErrorCode rval = _mb->get_coords(conn2, 2, (double *) &P[0]);
+    if (MB_SUCCESS != rval) return rval;
     assert(rval==MB_SUCCESS);
     CartVect T[2];
     T[0] = P[1] - P[0];
@@ -916,6 +919,7 @@
   double plane[4];
 
   ErrorCode rval = _mb->tag_get_data(_planeTag, &tri, 1, plane);
+  if (MB_SUCCESS != rval) return;
   assert(rval == MB_SUCCESS);
   // _planeTag
   CartVect normal(&plane[0]);// just first 3 components are used
@@ -1110,14 +1114,14 @@
 {