[MOAB-dev] r4306 - in MOAB/trunk: doc itaps/imesh src/moab src/parallel test/parallel tools tools/mbzoltan

[tautges at mcs.anl.gov]

Author: tautges
Date: 2010-11-30 17:50:20 -0600 (Tue, 30 Nov 2010)
New Revision: 4306

Added:
   MOAB/trunk/test/parallel/structured3.cpp
   MOAB/trunk/tools/mbzoltan/mbzoltan.cpp
Removed:
   MOAB/trunk/tools/mbperf/
   MOAB/trunk/tools/mbzoltan/main.cpp
Modified:
   MOAB/trunk/doc/MOABv4-UG.doc
   MOAB/trunk/itaps/imesh/iMesh_MOAB.cpp
   MOAB/trunk/src/moab/CN.hpp
   MOAB/trunk/src/parallel/ParallelComm.cpp
   MOAB/trunk/test/parallel/Makefile.am
   MOAB/trunk/tools/Makefile.am
   MOAB/trunk/tools/mbzoltan/Makefile.am
   MOAB/trunk/tools/mbzoltan/mbpart.cpp
Log:
- iMesh_MOAB.cpp: fixed adjacency table information
- src/moab/CN.hpp: changed a few things to short int, to eliminate warnings from super-picky intel compiler
- src/parallel/ParallelComm.cpp: commented out DEBUG_BARRIER, so now a Waitall instead of a barrier is used.
  Also fixed size of status argument to a few Waitall's.
- Removed tools/mbperf, in favor of test/perf.
- deprecated mbpart, changing it to mbzoltan (and removing former mbzoltan code)
- several updates to MOAB v4 UG
- adding test/parallel/structured3.cpp; this is the code that tests for Ticket #35, that I just closed,
  but I want to keep the test around just in case

Passes make check.



Modified: MOAB/trunk/doc/MOABv4-UG.doc
===================================================================
(Binary files differ)

Modified: MOAB/trunk/itaps/imesh/iMesh_MOAB.cpp
===================================================================
--- MOAB/trunk/itaps/imesh/iMesh_MOAB.cpp	2010-11-30 14:45:38 UTC (rev 4305)
+++ MOAB/trunk/itaps/imesh/iMesh_MOAB.cpp	2010-11-30 23:50:20 UTC (rev 4306)
@@ -24,9 +24,13 @@
 MBiMesh::MBiMesh()
     : haveDeletedEntities(false)
 {
-  memset(AdjTable, 0, 16*sizeof(int));
-  for (int i = 0; i < 4; i++) AdjTable[4*i] = AdjTable[i] = 1;
-  AdjTable[15] = 1;
+  int tmp_table[] = {
+      1, 1, 1, 1,
+      1, 0, 2, 2,
+      1, 2, 0, 2,
+      1, 2, 2, 1
+  };
+  memcpy(AdjTable, tmp_table, 16*sizeof(int));
 }
 
 MBiMesh::~MBiMesh() {}

Modified: MOAB/trunk/src/moab/CN.hpp
===================================================================
--- MOAB/trunk/src/moab/CN.hpp	2010-11-30 14:45:38 UTC (rev 4305)
+++ MOAB/trunk/src/moab/CN.hpp	2010-11-30 23:50:20 UTC (rev 4306)
@@ -347,7 +347,7 @@
     //! \param num_entries Number of indicies in permutation array
     //! \param is_reverse Array is reverse permutation
   static inline
-  void setPermutation(const EntityType t, const int dim, int *pvec, 
+  void setPermutation(const EntityType t, const int dim, short int *pvec, 
                       const int num_entries, const bool is_reverse = false);
 
     //! Reset permutation or reverse permutation vector
@@ -475,13 +475,13 @@
 
 inline short int CN::VerticesPerEntity(const EntityType t) 
 {
-  return (MBVERTEX == t ? 1 : mConnectivityMap[t][mConnectivityMap[t][0].topo_dimension-1].num_corners_per_sub_element[0]);
+  return (MBVERTEX == t ? (short int) 1 : mConnectivityMap[t][mConnectivityMap[t][0].topo_dimension-1].num_corners_per_sub_element[0]);
 }
 
 inline short int CN::NumSubEntities(const EntityType t, const int d)
 {
   return (t != MBVERTEX && d > 0 ? mConnectivityMap[t][d-1].num_sub_elements :
-          (d ? -1 : VerticesPerEntity(t)));