[MOAB-dev] r4760 - in MOAB/trunk: config itaps/imesh src src/io src/io/mhdf/example src/moab src/parallel test/perf tools tools/dagmc tools/mbcoupler

[tautges at mcs.anl.gov]

Author: tautges
Date: 2011-04-20 16:41:01 -0500 (Wed, 20 Apr 2011)
New Revision: 4760

Modified:
   MOAB/trunk/config/compiler.m4
   MOAB/trunk/itaps/imesh/MOAB_iMeshP_unit_tests.cpp
   MOAB/trunk/itaps/imesh/iMesh_MOAB.cpp
   MOAB/trunk/itaps/imesh/partest.cpp
   MOAB/trunk/src/BitPage.cpp
   MOAB/trunk/src/BitPage.hpp
   MOAB/trunk/src/DenseTag.cpp
   MOAB/trunk/src/DualTool.cpp
   MOAB/trunk/src/FBEngine.cpp
   MOAB/trunk/src/Factory.cpp
   MOAB/trunk/src/MergeMesh.cpp
   MOAB/trunk/src/MeshSet.hpp
   MOAB/trunk/src/TagCompare.hpp
   MOAB/trunk/src/VarLenSparseTag.cpp
   MOAB/trunk/src/VarLenTag.hpp
   MOAB/trunk/src/WriteUtil.cpp
   MOAB/trunk/src/io/ReadHDF5.cpp
   MOAB/trunk/src/io/ReadIDEAS.cpp
   MOAB/trunk/src/io/ReadNASTRAN.cpp
   MOAB/trunk/src/io/ReadNC.cpp
   MOAB/trunk/src/io/ReadNC.hpp
   MOAB/trunk/src/io/ReadNCDF.cpp
   MOAB/trunk/src/io/ReadSmf.cpp
   MOAB/trunk/src/io/ReadSms.cpp
   MOAB/trunk/src/io/ReadTetGen.cpp
   MOAB/trunk/src/io/Tqdcfr.cpp
   MOAB/trunk/src/io/WriteHDF5.cpp
   MOAB/trunk/src/io/WriteNCDF.cpp
   MOAB/trunk/src/io/WriteSLAC.cpp
   MOAB/trunk/src/io/WriteSTL.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/example/validate.c
   MOAB/trunk/src/moab/GeomUtil.hpp
   MOAB/trunk/src/moab/ScdInterface.hpp
   MOAB/trunk/src/parallel/ParallelComm.cpp
   MOAB/trunk/src/parallel/ReadParallel.cpp
   MOAB/trunk/src/parallel/WriteHDF5Parallel.cpp
   MOAB/trunk/src/parallel/crystal.c
   MOAB/trunk/src/parallel/errmem.c
   MOAB/trunk/src/parallel/gs.c
   MOAB/trunk/src/parallel/sort_imp.c
   MOAB/trunk/src/parallel/transfer.c
   MOAB/trunk/test/perf/perf.cpp
   MOAB/trunk/test/perf/point_in_elem.cpp
   MOAB/trunk/test/perf/seqperf.cpp
   MOAB/trunk/tools/ProgOptions.hpp
   MOAB/trunk/tools/convert.cpp
   MOAB/trunk/tools/dagmc/DagMC.cpp
   MOAB/trunk/tools/dagmc/dagmc_preproc.cpp
   MOAB/trunk/tools/dagmc/quads_to_tris_driver.cpp
   MOAB/trunk/tools/depth.cpp
   MOAB/trunk/tools/gsets.cc
   MOAB/trunk/tools/makeops.cpp
   MOAB/trunk/tools/mbcoupler/Coupler.cpp
   MOAB/trunk/tools/mbmem.cpp
   MOAB/trunk/tools/parse.cpp
   MOAB/trunk/tools/propagate_tags.cpp
   MOAB/trunk/tools/size.cpp
   MOAB/trunk/tools/skin.cpp
   MOAB/trunk/tools/surfplot.cpp
Log:
Changes to remove lots of warnings produced by Intel compilers.  

These changes have been tested with debug/optimized, serial and parallel builds.
But, I still may have missed some platform issues, so I'm crossing my fingers here.



Modified: MOAB/trunk/config/compiler.m4
===================================================================
--- MOAB/trunk/config/compiler.m4	2011-04-20 21:29:37 UTC (rev 4759)
+++ MOAB/trunk/config/compiler.m4	2011-04-20 21:41:01 UTC (rev 4760)
@@ -358,7 +358,7 @@
   Intel:*)
     FATHOM_CXX_32BIT=-m32
     FATHOM_CXX_64BIT=-m64
-    FATHOM_CXX_SPECIAL="$EXTRA_INTEL_FLAGS -wd981 -wd383"
+    FATHOM_CXX_SPECIAL="$EXTRA_INTEL_FLAGS -wd981 -wd383 -wd1572 -wd2259"
     ;;
   VisualAge:*)
     FATHOM_CXX_32BIT=-q32
@@ -482,7 +482,7 @@
   Intel:*)
     FATHOM_CC_32BIT=-m32
     FATHOM_CC_64BIT=-m64
-    FATHOM_CC_SPECIAL="$EXTRA_INTEL_FLAGS -wd981 -wd383"
+    FATHOM_CC_SPECIAL="$EXTRA_INTEL_FLAGS -wd981 -wd383 -wd1572"
     ;;
   GNU:mips*)
     FATHOM_CC_32BIT="-mips32 -mabi=32"

Modified: MOAB/trunk/itaps/imesh/MOAB_iMeshP_unit_tests.cpp
===================================================================
--- MOAB/trunk/itaps/imesh/MOAB_iMeshP_unit_tests.cpp	2011-04-20 21:29:37 UTC (rev 4759)
+++ MOAB/trunk/itaps/imesh/MOAB_iMeshP_unit_tests.cpp	2011-04-20 21:41:01 UTC (rev 4760)
@@ -319,30 +319,6 @@
   return err;
 }
 
-static int get_intersection( iMesh_Instance imesh,
-                             iBase_EntitySetHandle set1,
-                             iBase_EntitySetHandle set2,
-                             iBase_EntityType type,
-                             iMesh_EntityTopology topo,
-                             std::vector<iBase_EntityHandle>& entities )
-{
-  std::vector<iBase_EntityHandle> l1, l2;
-  int err;
-  err = get_entities( imesh, set1, type, topo, l1 );
-  if (err)
-    return err;
-  err = get_entities( imesh, set2, type, topo, l2 );
-  if (err)
-    return err;
-  
-  std::sort( l1.begin(), l1.end() );
-  std::sort( l2.begin(), l2.end() );
-  std::set_intersection( l1.begin(), l1.end(),
-                         l2.begin(), l2.end(),