[MOAB-dev] commit/MOAB: danwu: Merged master into error_handling_enhancement

[commits-noreply at bitbucket.org]

1 new commit in MOAB:

https://bitbucket.org/fathomteam/moab/commits/a3362167c873/
Changeset:   a3362167c873
Branch:      error_handling_enhancement
User:        danwu
Date:        2014-02-14 23:36:59
Summary:     Merged master into error_handling_enhancement
Affected #:  4 files

diff --git a/.gitignore b/.gitignore
index 8061732..eb99939 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,10 +31,12 @@ doc/config.tex
 doc/dev.dox
 doc/user/*
 doc/user.dox
-examples/examples.make
 examples/DeformMeshRemap
 examples/DirectAccessNoHoles
+examples/DirectAccessNoHolesF90
 examples/DirectAccessWithHoles
+examples/examples.make
+examples/freem.mod
 examples/FileRead
 examples/GeomSetHierarchy
 examples/GetEntities
@@ -47,11 +49,14 @@ examples/itaps/ListSetsNTagsF90
 examples/itaps/TagIterateC
 examples/itaps/TagIterateF
 examples/KDTree
+examples/LloydRelaxation
 examples/ObbTree
+examples/point_in_elem_search
 examples/PushParMeshIntoMoabF90
 examples/ReduceExchangeTags
 examples/SetsNTags
 examples/SkinMesh
+examples/structuredmesh
 examples/StructuredMeshSimple
 examples/SurfArea
 examples/TestExodusII

diff --git a/examples/makefile b/examples/makefile
index c67a434..8a84899 100644
--- a/examples/makefile
+++ b/examples/makefile
@@ -7,12 +7,12 @@ include ${MOAB_DIR}/lib/iMesh-Defs.inc
 # MESH_DIR is the directory containing mesh files that come with MOAB source
 MESH_DIR="../MeshFiles/unittest"
 
-EXAMPLES = HelloMOAB GetEntities SetsNTags structuredmesh StructuredMeshSimple DirectAccessWithHoles DirectAccessNoHoles 
+EXAMPLES = HelloMOAB GetEntities SetsNTags structuredmesh StructuredMeshSimple DirectAccessWithHoles DirectAccessNoHoles point_in_elem_search DeformMeshRemap
 PAREXAMPLES = HelloParMOAB ReduceExchangeTags LloydRelaxation
-F90EXAMPLES = DirectAccessNoHolesF90 PushParMeshIntoMoabF90
 EXOIIEXAMPLES = TestExodusII
+F90EXAMPLES = DirectAccessNoHolesF90 PushParMeshIntoMoabF90
 
-default: ${EXAMPLES}
+default: ${EXAMPLES} ${PAREXAMPLES} ${EXOIIEXAMPLES} ${F90EXAMPLES}
 
 HelloMOAB : HelloMOAB.o ${MOAB_LIBDIR}/libMOAB.la
 	${MOAB_CXX} -o $@ $< ${MOAB_LIBS_LINK}
@@ -60,7 +60,7 @@ DeformMeshRemap: DeformMeshRemap.o ${MOAB_LIBDIR}/libMOAB.la
 	${MOAB_CXX} -o $@ $< ${MOAB_LIBS_LINK} -lmbcoupler ${MOAB_LIBS_LINK}
 
 clean:
-	rm -rf *.o ${EXAMPLES} ${PAREXAMPLES} ${EXOIIEXAMPLES}
+	rm -rf *.o *.mod ${EXAMPLES} ${PAREXAMPLES} ${EXOIIEXAMPLES} ${F90EXAMPLES}
 
 .cpp.o :
 	${MOAB_CXX} ${CXXFLAGS} ${MOAB_CXXFLAGS} ${MOAB_CPPFLAGS} ${MOAB_INCLUDES} -DMESH_DIR=\"${MESH_DIR}\" -c $<

diff --git a/examples/point_in_elem_search.cpp b/examples/point_in_elem_search.cpp
index ce22928..ddf3f03 100644
--- a/examples/point_in_elem_search.cpp
+++ b/examples/point_in_elem_search.cpp
@@ -53,14 +53,13 @@ int main(int argc, char **argv) {
   SpatialLocator sl(&mb, elems, &tree);
   
     // get the box extents
-  BoundBox box;
   CartVect box_extents, pos;
-  rval = sl.get_bounding_box(box); ERR("Problem getting tree bounding box");
+  BoundBox box = sl.local_box();
   box_extents = box.bMax - box.bMin;
   
     // query at random places in the tree
   CartVect params;
-  bool is_inside;
+  int is_inside = 0;
   int num_inside = 0;
   EntityHandle elem;
   for (int i = 0; i < num_queries; i++) {
@@ -78,9 +77,3 @@ int main(int argc, char **argv) {
   std::cout << "Queries inside box = " << num_inside << "/" << num_queries << " = " 
             << 100.0*((double)num_inside)/num_queries << "%" << std::endl;
 }
-
-    
-  
-  
-  
-

diff --git a/src/moab/SpatialLocator.hpp b/src/moab/SpatialLocator.hpp
index f9a1746..3d29c55 100644
--- a/src/moab/SpatialLocator.hpp
+++ b/src/moab/SpatialLocator.hpp
@@ -135,7 +135,7 @@ namespace moab {
 
         /* locate a point */
       ErrorCode locate_point(const double *pos, 
-                             EntityHandle &ent, double *params, bool *is_inside = NULL,
+                             EntityHandle &ent, double *params, int *is_inside = NULL,
                               const double rel_iter_tol = 1.0e-10, const double abs_iter_tol = 1.0e-10,
                               const double inside_tol = 1.0e-6);
 
@@ -169,12 +169,6 @@ namespace moab {
       
   private:
 
-        /* locate a point */
-      ErrorCode locate_point(const double *pos, 
-                             EntityHandle &ent, double *params, int *is_inside = NULL,
-                              const double rel_iter_tol = 1.0e-10, const double abs_iter_tol = 1.0e-10,
-                              const double inside_tol = 1.0e-6);
-
 #ifdef USE_MPI
         /* MPI_ReduceAll source mesh bounding boxes to get global source mesh bounding box
          */

Repository URL: https://bitbucket.org/fathomteam/moab/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.