[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/c8eab030ba30/
Changeset:   c8eab030ba30
Branch:      error_handling_enhancement
User:        danwu
Date:        2014-02-14 19:18:55
Summary:     Merged master into error_handling_enhancement
Affected #:  6 files

diff --git a/.gitignore b/.gitignore
index e60d5d8..8061732 100644
--- a/.gitignore
+++ b/.gitignore
@@ -80,7 +80,6 @@ itaps/imesh/ScdMeshF77
 itaps/imesh/ScdMeshF90
 itaps/imesh/testc_cbind
 *.la
-*.la
 *.lai
 lib
 lib/*
@@ -130,13 +129,11 @@ test/cropvol_test
 test/dual/dual_test
 test/elem_eval_test
 test/file_options_test
+test/*.h5m
 test/*.g
-test/*.g
-test/*.gen
 test/*.gen
 test/geom_util_test
 test/gttool_test
-test/gttool_test
 test/h5file/dump_sets
 test/h5file/h5legacy
 test/h5file/h5partial
@@ -154,6 +151,8 @@ test/io/*.g
 test/io/gmsh_test
 test/io/ideas_test
 test/io/nastran_test
+test/io/read_cgm_basic_test
+test/io/read_cgm_load_test
 test/io/read_cgm_test
 test/io/read_mpas_nc
 test/io/read_nc
@@ -237,20 +236,24 @@ tools/mbconvert
 tools/mbcoupler/*.h5m
 tools/mbcoupler/*.g
 tools/mbcoupler/tests/
+tools/mbcslam/advection
 tools/mbcslam/case1_test
+tools/mbcslam/create_dp
+tools/mbcslam/cslam_par_test
+tools/mbcslam/diffusion
 tools/mbcslam/intersect1.h5m
 tools/mbcslam/intx1.vtk
+tools/mbcslam/intx_imesh
 tools/mbcslam/intx_in_plane_test
+tools/mbcslam/intx_mpas
 tools/mbcslam/intx_on_sphere_test
 tools/mbcslam/intx.vtk
 tools/mbcslam/lagr.h5m
+tools/mbcslam/lagrIni.h5m
 tools/mbcslam/spectral.vtk
 tools/mbcslam/spec_visu_test
 tools/mbcslam/spherical_area_test
-tools/mbcslam/cslam_par_test
-tools/mbcslam/create_dp
-tools/mbcslam/diffusion
-tools/mbcslam/intx_imesh
+tools/mbcslam/polyWithEdges.vtk
 tools/mbcslam/proj1
 tools/mbdepth
 tools/mbgsets

diff --git a/examples/StructuredMeshSimple.cpp b/examples/StructuredMeshSimple.cpp
index 25aa08f..bd21dd1 100644
--- a/examples/StructuredMeshSimple.cpp
+++ b/examples/StructuredMeshSimple.cpp
@@ -25,6 +25,9 @@
 #include "moab/ScdInterface.hpp"
 #include "moab/ProgOptions.hpp"
 #include "moab/CN.hpp"
+#ifdef USE_MPI
+#include "moab_mpi.h"
+#endif
 #include <iostream>
 #include <vector>
 
@@ -34,6 +37,10 @@ int main(int argc, char **argv)
 {
   int N = 10, dim = 3;
 
+#ifdef USE_MPI
+  MPI_Init(&argc, &argv);
+#endif
+
   ProgOptions opts;
   opts.addOpt<int>(std::string("dim,d"), std::string("Dimension of mesh (default=3)"),
                    &dim);
@@ -105,6 +112,10 @@ int main(int argc, char **argv)
     // 5. Release the structured mesh interface and destroy the MOAB instance
   mb->release_interface(scdiface); // tell MOAB we're done with the ScdInterface
   delete mb;
-  
+
+#ifdef USE_MPI
+  MPI_Finalize();
+#endif
+
   return 0;
 }

diff --git a/examples/makefile b/examples/makefile
index 20843c0..20f2344 100644
--- a/examples/makefile
+++ b/examples/makefile
@@ -26,6 +26,9 @@ SetsNTags: SetsNTags.o ${MOAB_LIBDIR}/libMOAB.la
 LloydRelaxation: LloydRelaxation.o ${MOAB_LIBDIR}/libMOAB.la
 	${MOAB_CXX} -o $@ $< ${MOAB_LIBS_LINK}
 
+structuredmesh : structuredmesh.o ${MOAB_LIBDIR}/libMOAB.la
+	${MOAB_CXX} -o $@ $< ${MOAB_LIBS_LINK} 
+
 StructuredMeshSimple : StructuredMeshSimple.o ${MOAB_LIBDIR}/libMOAB.la
 	${MOAB_CXX} -o $@ $< ${MOAB_LIBS_LINK} 
 
@@ -68,6 +71,6 @@ clean:
 .cpp.o :
 	${MOAB_CXX} ${CXXFLAGS} ${MOAB_CXXFLAGS} ${MOAB_CPPFLAGS} ${MOAB_INCLUDES} -DMESH_DIR=\"${MESH_DIR}\" -c $<
 
- .F90.o :
+.F90.o :
 	${IMESH_FC} ${FCFLAGS} ${IMESH_FCFLAGS} ${MOAB_CPPFLAGS} ${IMESH_INCLUDES} ${IMESH_FCDEFS} -DMESH_DIR=\"${MESH_DIR}\" -c $<
 

diff --git a/examples/structuredmesh.cpp b/examples/structuredmesh.cpp
index 017937d..5ad42fb 100644
--- a/examples/structuredmesh.cpp
+++ b/examples/structuredmesh.cpp
@@ -26,9 +26,9 @@
 
 using namespace moab;
 
-int main(int argv, char **argv) 
+int main(int argc, char **argv) 
 {
-  int N;
+  int I, J, K;
     // progoptions?
   std::cout << "Enter I, J, K... " << std::endl;
   std::cin >> I >> J >> K;

diff --git a/src/TupleList.cpp b/src/TupleList.cpp
index bf08946..113e826 100644
--- a/src/TupleList.cpp
+++ b/src/TupleList.cpp
@@ -50,7 +50,7 @@ void TupleList::buffer::buffer_reserve_(size_t min, const char *file)
       newSize = min;
     void *res = realloc(ptr, newSize);
     if (!res && newSize > 0)
-      fail("%s: allocation of %d bytes failed\n", file, (int) this->buffSize);
+      fail("%s: reallocation of %d bytes failed\n", file, newSize);
     ptr = (char*) res;
     this->buffSize = newSize;
   }

diff --git a/tools/mbcslam/Intx2Mesh.cpp b/tools/mbcslam/Intx2Mesh.cpp
index 311bfd4..22fdc3f 100644
--- a/tools/mbcslam/Intx2Mesh.cpp
+++ b/tools/mbcslam/Intx2Mesh.cpp
@@ -33,6 +33,11 @@ Intx2Mesh::Intx2Mesh(Interface * mbimpl): mb(mbimpl), parcomm(NULL), remote_cell
 Intx2Mesh::~Intx2Mesh()
 {
   // TODO Auto-generated destructor stub
+  if (remote_cells)
+  {
+    delete remote_cells;
+    remote_cells=NULL;
+  }
 }
 void Intx2Mesh::createTags()
 {

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.