[MOAB-dev] r5203 - MOAB/trunk/src

[tautges at mcs.anl.gov]

Author: tautges
Date: 2011-11-02 16:36:02 -0500 (Wed, 02 Nov 2011)
New Revision: 5203

Modified:
   MOAB/trunk/src/FBEngine.cpp
Log:
Removing ^M's, and fixing warning about not returning anything.



Modified: MOAB/trunk/src/FBEngine.cpp
===================================================================
--- MOAB/trunk/src/FBEngine.cpp	2011-11-01 03:56:14 UTC (rev 5202)
+++ MOAB/trunk/src/FBEngine.cpp	2011-11-02 21:36:02 UTC (rev 5203)
@@ -1,3440 +1,3441 @@
-#include <iostream>
-#include <map>
-
-#include "moab/FBEngine.hpp"
-#include "moab/Interface.hpp"
-#include "moab/GeomTopoTool.hpp"
-#include "moab/OrientedBoxTreeTool.hpp"
-
-#include <stdlib.h>
-#include <cstring>
-#include <map>
-#include <set>
-#include <queue>
-#include <algorithm>
-#include "assert.h"
-
-#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; } }
-
-namespace moab {
-
-// some tolerances for ray tracing and geometry intersections
-// these are involved in ray tracing, at least
-
-unsigned min_tolerace_intersections = 1000;
-double tolerance = 0.01; // TODO: how is this used ????
-double tolerance_segment = 0.01; // for segments intersection, points collapse, area coordinates for triangles
-// it should be a relative, not an absolute value
-// as this splitting operation can create small edges, it should be relatively high
-// or, it should be coordinated with the decimation errors
-// we really just want to preserve the integrity of the mesh, we should avoid creating small edges or angles
-const bool Debug_surf_eval = false;
-bool debug_splits = false;
-
-// will compute intersection between a segment and slice of a plane
-// output is the intersection point
-bool intersect_segment_and_plane_slice(CartVect & from, CartVect & to,
-    CartVect & p1, CartVect & p2, CartVect & Dir, CartVect & normPlane,
-    CartVect & intx_point, double & parPos)
-{