[MOAB-dev] r1801 - in MOAB/trunk: . m4 parallel

[tautges at mcs.anl.gov]

Author: tautges
Date: 2008-05-09 14:38:34 -0500 (Fri, 09 May 2008)
New Revision: 1801

Modified:
   MOAB/trunk/DualTool.cpp
   MOAB/trunk/MBOrientedBoxTreeTool.cpp
   MOAB/trunk/m4/compiler.m4
   MOAB/trunk/parallel/MBParallelData.cpp
Log:
compiler.m4: adding some clauses about IBM BG/P, to avoid confusing with
other types of IBM systems.

DualTool: removing defintion of assert which shouldn't be there.

others: changing names of some variables which were stomping on loop
index vars.  Not sure why these weren't caught by gcc.




Modified: MOAB/trunk/DualTool.cpp
===================================================================
--- MOAB/trunk/DualTool.cpp	2008-05-09 14:39:47 UTC (rev 1800)
+++ MOAB/trunk/DualTool.cpp	2008-05-09 19:38:34 UTC (rev 1801)
@@ -13,8 +13,6 @@
  * 
  */
 
-#define assert(a) if (!(a)) return MB_FAILURE
-
 #include "DualTool.hpp"
 #include "MBRange.hpp"
 // using MBCore for call to check_adjacencies

Modified: MOAB/trunk/MBOrientedBoxTreeTool.cpp
===================================================================
--- MOAB/trunk/MBOrientedBoxTreeTool.cpp	2008-05-09 14:39:47 UTC (rev 1800)
+++ MOAB/trunk/MBOrientedBoxTreeTool.cpp	2008-05-09 19:38:34 UTC (rev 1801)
@@ -690,9 +690,9 @@
       if (MB_SUCCESS != rval)
         return rval;
       
-      double t;
-      if (MBGeomUtil::ray_tri_intersect( coords, point, dir, tolerance, t, ray_length ))
-        intersection_distances_out.push_back(t);
+      double td;
+      if (MBGeomUtil::ray_tri_intersect( coords, point, dir, tolerance, td, ray_length ))
+        intersection_distances_out.push_back(td);
     }
   }
   
@@ -863,12 +863,12 @@
     if (MB_SUCCESS != rval)
       return rval;
 
-    double t;
-    if (MBGeomUtil::ray_tri_intersect( coords, b, m, tol, t, len )) 
+    double td;
+    if (MBGeomUtil::ray_tri_intersect( coords, b, m, tol, td, len )) 
         // NOTE: add_intersection may modify the 'len' member, which
         //       will affect subsequent calls to ray_tri_intersect in 
         //       this loop.
-      add_intersection( t );
+      add_intersection( td );
   }
   return MB_SUCCESS;
 }

Modified: MOAB/trunk/m4/compiler.m4
===================================================================
--- MOAB/trunk/m4/compiler.m4	2008-05-09 14:39:47 UTC (rev 1800)
+++ MOAB/trunk/m4/compiler.m4	2008-05-09 19:38:34 UTC (rev 1801)
@@ -262,9 +262,18 @@
     SNL_CXX_32BIT=-q32
     SNL_CXX_64BIT=-q64
     # Do V5.0 namemangling for compatibility with ACIS, and enable RTTI
-    SNL_CXX_SPECIAL="-qrtti=all -qnamemangling=v5"
-    AR="ar -X 32_64"
-    NM="nm -B -X 32_64"
+    case "$target_vendor" in
+      bgp)
+        SNL_CXX_SPECIAL=""
+        AR="ar"
+        NM="nm -B"
+        ;;
+      *)
+        SNL_CXX_SPECIAL="-qrtti=all -qnamemangling=v5"
+        AR="ar"
+        NM="nm -B -X 32_64"
+        ;;
+    esac
     ;;
   MIPSpro:mips)
     SNL_CXX_32BIT=-n32
@@ -371,10 +380,20 @@
     SNL_CC_SPECIAL="-Wall -pipe"
     ;;
   VisualAge:*)
-    SNL_CC_32BIT=-q32
-    SNL_CC_64BIT=-q64
-    AR="ar -X 32_64"
-    NM="nm -B -X 32_64"
+    case "$target_vendor" in
+      bgp)
+        SNL_CC_32BIT=-q32
+        SNL_CC_64BIT=-q64
+        AR="ar"
+        NM="nm -B"
+        ;;
+      *)
+        SNL_CC_32BIT=-q32
+        SNL_CC_64BIT=-q64
+        AR="ar -X 32_64"
+        NM="nm -B -X 32_64"
+        ;;
+    esac
     ;;
   MIPSpro:mips)
     SNL_CC_32BIT=-n32

Modified: MOAB/trunk/parallel/MBParallelData.cpp
===================================================================
--- MOAB/trunk/parallel/MBParallelData.cpp	2008-05-09 14:39:47 UTC (rev 1800)
+++ MOAB/trunk/parallel/MBParallelData.cpp	2008-05-09 19:38:34 UTC (rev 1801)
@@ -71,13 +71,13 @@
     std::vector<int> proc_tags(proc_sets.size()*tsize/sizeof(int));
     tmp_result = mbImpl->tag_get_data(procs_tag, proc_sets, &proc_tags[0]);
     if (MB_SUCCESS != tmp_result) CONTINUE;
-    int i;
+    int k;
     MBRange::iterator rit;
     
-    for (i = 0, rit = proc_sets.begin(); rit != proc_sets.end(); rit++, i++) {
+    for (k = 0, rit = proc_sets.begin(); rit != proc_sets.end(); rit++, k++) {
       for (int j = 0; j < tsize; j++) {
-        if (my_rank != proc_tags[2*i+j] && proc_tags[2*i+j] >= 0)
-          iface_data.insert(std::pair<int,MBEntityHandle>(proc_tags[2*i+j], *rit));
+        if (my_rank != proc_tags[2*k+j] && proc_tags[2*k+j] >= 0)
+          iface_data.insert(std::pair<int,MBEntityHandle>(proc_tags[2*k+j], *rit));
       }
     }
   }