[MOAB-dev] r3786 - in MOAB/branches/aligned_pack_unpack: itaps/igeom itaps/imesh src src/io src/moab src/parallel src/parallel/moab test/io test/parallel test/perf tools tools/mbcoupler tools/mbperf tools/mbzoltan

[tautges at mcs.anl.gov]

Author: tautges
Date: 2010-04-16 13:44:04 -0500 (Fri, 16 Apr 2010)
New Revision: 3786

Modified:
   MOAB/branches/aligned_pack_unpack/itaps/igeom/iGeom_MOAB.hpp
   MOAB/branches/aligned_pack_unpack/itaps/imesh/iMeshP_MOAB.cpp
   MOAB/branches/aligned_pack_unpack/itaps/imesh/iMesh_MOAB.cpp
   MOAB/branches/aligned_pack_unpack/itaps/imesh/iMesh_MOAB.hpp
   MOAB/branches/aligned_pack_unpack/src/FileOptions.cpp
   MOAB/branches/aligned_pack_unpack/src/MeshSet.cpp
   MOAB/branches/aligned_pack_unpack/src/OrientedBoxTreeTool.cpp
   MOAB/branches/aligned_pack_unpack/src/SequenceData.cpp
   MOAB/branches/aligned_pack_unpack/src/SequenceData.hpp
   MOAB/branches/aligned_pack_unpack/src/SparseTagCollection.hpp
   MOAB/branches/aligned_pack_unpack/src/TagInfo.cpp
   MOAB/branches/aligned_pack_unpack/src/TagInfo.hpp
   MOAB/branches/aligned_pack_unpack/src/VarLenTag.hpp
   MOAB/branches/aligned_pack_unpack/src/io/ReadHDF5.cpp
   MOAB/branches/aligned_pack_unpack/src/io/WriteHDF5.cpp
   MOAB/branches/aligned_pack_unpack/src/moab/Interface.hpp
   MOAB/branches/aligned_pack_unpack/src/parallel/ParallelComm.cpp
   MOAB/branches/aligned_pack_unpack/src/parallel/moab/ParallelComm.hpp
   MOAB/branches/aligned_pack_unpack/test/io/VtkTest.cpp
   MOAB/branches/aligned_pack_unpack/test/parallel/mbparallelcomm_test.cpp
   MOAB/branches/aligned_pack_unpack/test/parallel/pcomm_unit.cpp
   MOAB/branches/aligned_pack_unpack/test/perf/tstt_perf_binding.cpp
   MOAB/branches/aligned_pack_unpack/tools/mbcoupler/ElemUtil.cpp
   MOAB/branches/aligned_pack_unpack/tools/mbcoupler/findpt_test.cpp
   MOAB/branches/aligned_pack_unpack/tools/mbperf/mbperf_iMesh.cpp
   MOAB/branches/aligned_pack_unpack/tools/mbzoltan/MBZoltan.cpp
   MOAB/branches/aligned_pack_unpack/tools/parse.cpp
Log:
Backing up changes.




Modified: MOAB/branches/aligned_pack_unpack/itaps/igeom/iGeom_MOAB.hpp
===================================================================
--- MOAB/branches/aligned_pack_unpack/itaps/igeom/iGeom_MOAB.hpp	2010-04-16 18:42:32 UTC (rev 3785)
+++ MOAB/branches/aligned_pack_unpack/itaps/igeom/iGeom_MOAB.hpp	2010-04-16 18:44:04 UTC (rev 3786)
@@ -63,7 +63,7 @@
     RETURN(iBase_MEMORY_ALLOCATION_FAILED);				\
   }									\
   if ((size) && ((allocated) == 0 || NULL == (array))) {		\
-    array = (type*)malloc((size)*sizeof(type));				\
+    MALLOC(array, (size)*sizeof(type), (type*));                                \
     allocated=(size);							\
     if (NULL == array) {iGeom_processError(iBase_MEMORY_ALLOCATION_FAILED, \
 					   "Couldn't allocate array.");RETURN(iBase_MEMORY_ALLOCATION_FAILED); } \

Modified: MOAB/branches/aligned_pack_unpack/itaps/imesh/iMeshP_MOAB.cpp
===================================================================
--- MOAB/branches/aligned_pack_unpack/itaps/imesh/iMeshP_MOAB.cpp	2010-04-16 18:42:32 UTC (rev 3785)
+++ MOAB/branches/aligned_pack_unpack/itaps/imesh/iMeshP_MOAB.cpp	2010-04-16 18:44:04 UTC (rev 3786)
@@ -882,7 +882,8 @@
   // allocate or check size of adj_entity_indices
   *adj_entity_indices_size = size;
   if (allocated_indices) {
-    *adj_entity_indices = (int*)malloc(sizeof(iBase_EntityHandle)*size);
+    MALLOC(*adj_entity_indices, sizeof(iBase_EntityHandle)*size, int*);
+//    *adj_entity_indices = (int*)malloc(sizeof(iBase_EntityHandle)*size);
     if (!*adj_entity_indices) 
       *err = iBase_MEMORY_ALLOCATION_FAILED;
     else
@@ -916,7 +917,7 @@
     unique_adj = *adj_entity_handles;
   }
   else {
-    unique_adj = (iBase_EntityHandle*)malloc(sizeof(iBase_EntityHandle) * size);
+    MALLOC(unique_adj, sizeof(iBase_EntityHandle) * size, iBase_EntityHandle*);
   }
   std::copy( all_adj_handles, all_adj_handles+size, unique_adj );
   std::sort( unique_adj, unique_adj + size );
@@ -927,8 +928,8 @@
   // and copy the unique handle list into it
   if (*adj_entity_handles != unique_adj) {
     if (!*adj_entity_handles_allocated) {
-      *adj_entity_handles = (iBase_EntityHandle*)malloc(
-                            sizeof(iBase_EntityHandle) * *adj_entity_handles_size);
+      MALLOC(*adj_entity_handles, 
+             sizeof(iBase_EntityHandle) * *adj_entity_handles_size, iBase_EntityHandle*);
       if (!*adj_entity_handles)
         *err = iBase_MEMORY_ALLOCATION_FAILED;
       else

Modified: MOAB/branches/aligned_pack_unpack/itaps/imesh/iMesh_MOAB.cpp
===================================================================