[MOAB-dev] r4352 - in MOAB/trunk: . src src/io src/io/mhdf/example src/io/mhdf/src src/moab src/parallel src/parallel/moab test

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2010-12-10 12:51:46 -0600 (Fri, 10 Dec 2010)
New Revision: 4352

Modified:
   MOAB/trunk/
   MOAB/trunk/src/AEntityFactory.cpp
   MOAB/trunk/src/AdaptiveKDTree.cpp
   MOAB/trunk/src/BSPTree.cpp
   MOAB/trunk/src/CN.cpp
   MOAB/trunk/src/Core.cpp
   MOAB/trunk/src/DualTool.cpp
   MOAB/trunk/src/HigherOrderFactory.cpp
   MOAB/trunk/src/MeshSet.hpp
   MOAB/trunk/src/OrientedBox.cpp
   MOAB/trunk/src/OrientedBoxTreeTool.cpp
   MOAB/trunk/src/Range.cpp
   MOAB/trunk/src/SequenceManager.cpp
   MOAB/trunk/src/Skinner.cpp
   MOAB/trunk/src/SweptElementData.cpp
   MOAB/trunk/src/SweptElementSeq.cpp
   MOAB/trunk/src/TagCompare.hpp
   MOAB/trunk/src/Util.cpp
   MOAB/trunk/src/WriteUtil.cpp
   MOAB/trunk/src/io/ExoIIUtil.cpp
   MOAB/trunk/src/io/FileTokenizer.cpp
   MOAB/trunk/src/io/ReadABAQUS.cpp
   MOAB/trunk/src/io/ReadHDF5.cpp
   MOAB/trunk/src/io/ReadHDF5Dataset.cpp
   MOAB/trunk/src/io/ReadHDF5VarLen.cpp
   MOAB/trunk/src/io/ReadIDEAS.cpp
   MOAB/trunk/src/io/ReadMCNP5.cpp
   MOAB/trunk/src/io/ReadNASTRAN.cpp
   MOAB/trunk/src/io/ReadSTL.cpp
   MOAB/trunk/src/io/ReadSmf.cpp
   MOAB/trunk/src/io/ReadVtk.cpp
   MOAB/trunk/src/io/SMF_State.cpp
   MOAB/trunk/src/io/Tqdcfr.cpp
   MOAB/trunk/src/io/WriteGMV.cpp
   MOAB/trunk/src/io/WriteSmf.cpp
   MOAB/trunk/src/io/WriteTemplate.cpp
   MOAB/trunk/src/io/WriteVtk.cpp
   MOAB/trunk/src/io/mhdf/example/info.c
   MOAB/trunk/src/io/mhdf/src/tags.c
   MOAB/trunk/src/io/mhdf/src/util.h
   MOAB/trunk/src/moab/CN.hpp
   MOAB/trunk/src/moab_mpe.h
   MOAB/trunk/src/parallel/ParallelComm.cpp
   MOAB/trunk/src/parallel/moab/ParallelComm.hpp
   MOAB/trunk/test/TagTest.cpp
Log:
fix some of the warnings from Intel compiler and fix bug getting entities by dense tag value


Property changes on: MOAB/trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /MOAB/branches/jk-direct-tag:4069-4327
   + /MOAB/branches/Version4.0:4351
/MOAB/branches/jk-direct-tag:4069-4327

Modified: MOAB/trunk/src/AEntityFactory.cpp
===================================================================
--- MOAB/trunk/src/AEntityFactory.cpp	2010-12-10 18:47:13 UTC (rev 4351)
+++ MOAB/trunk/src/AEntityFactory.cpp	2010-12-10 18:51:46 UTC (rev 4352)
@@ -248,11 +248,10 @@
       // multiple entities found - look for direct adjacencies
     if (0 != source_entity) {
       
-      const EntityHandle *adj_vec, *adj_iter;
       int num_adjs;
       for (dum = 0; dum < temp_vec_size; dum++) {
         result = get_adjacencies(temp_vec[dum], adj_vec, num_adjs);
-        if ((adj_iter = std::find(adj_vec, (adj_vec+num_adjs), source_entity)) != (adj_vec+num_adjs)) {
+        if (std::find(adj_vec, (adj_vec+num_adjs), source_entity) != (adj_vec+num_adjs)) {
             // found it, return it
           target_entity = temp_vec[dum];
           break;
@@ -1177,8 +1176,8 @@
       // get the adjacencies for source_dim+1 to target_dim-1, and the adjacencies from
       // those to target_dim
     std::copy(start_ent_dp1, start_ent_td, range_inserter(tmp_ents));
-    ErrorCode result = thisMB->get_adjacencies(tmp_ents, target_dimension, false,
-                                                 target_ents, Interface::UNION);
+    result = thisMB->get_adjacencies(tmp_ents, target_dimension, false,
+                                       target_ents, Interface::UNION);
     if (MB_SUCCESS != result) return result;
     
       // now copy the explicit adjacencies to target_dimension

Modified: MOAB/trunk/src/AdaptiveKDTree.cpp
===================================================================
--- MOAB/trunk/src/AdaptiveKDTree.cpp	2010-12-10 18:47:13 UTC (rev 4351)
+++ MOAB/trunk/src/AdaptiveKDTree.cpp	2010-12-10 18:51:46 UTC (rev 4352)
@@ -972,8 +972,8 @@
                                          val );
       if (MB_SUCCESS != r)
         return r;
-      const size_t diff = p_count - both.size();
-      if (left.size() == diff || right.size() == diff)
+      const size_t sdiff = p_count - both.size();
+      if (left.size() == sdiff || right.size() == sdiff)
         continue;