[MOAB-dev] r5733 - in MOAB/trunk: src/parallel src/parallel/moab test/parallel tools/dagmc

[xbxu at mcs.anl.gov]

Author: xbxu
Date: 2012-09-12 15:25:34 -0500 (Wed, 12 Sep 2012)
New Revision: 5733

Modified:
   MOAB/trunk/src/parallel/ParallelMergeMesh.cpp
   MOAB/trunk/src/parallel/TupleList.cpp
   MOAB/trunk/src/parallel/gs.cpp
   MOAB/trunk/src/parallel/moab/TupleList.hpp
   MOAB/trunk/src/parallel/moab/gs.hpp
   MOAB/trunk/test/parallel/parallel_hdf5_test.cc
   MOAB/trunk/tools/dagmc/test_geom.cc
Log:
o change type name real to realType which is complained by pgi
compiler;

o update test_geom test to use a bigger epsilon number, the result
computed by pgi compiler is bigger than the old epsilon number which
will fail the test.

o now make check will pass when using pgi compiler.


Modified: MOAB/trunk/src/parallel/ParallelMergeMesh.cpp
===================================================================
--- MOAB/trunk/src/parallel/ParallelMergeMesh.cpp	2012-09-10 16:48:00 UTC (rev 5732)
+++ MOAB/trunk/src/parallel/ParallelMergeMesh.cpp	2012-09-12 20:25:34 UTC (rev 5733)
@@ -655,7 +655,7 @@
     a_val = a*mr;
     b_val = b*mr;
     for(unsigned long i=0; i< mr;i++){
-      real t =tup.vr_rd[a_val];
+      realType t =tup.vr_rd[a_val];
       tup.vr_wr[a_val] = tup.vr_rd[b_val];
       tup.vr_wr[b_val] = t; 
       a_val++;

Modified: MOAB/trunk/src/parallel/TupleList.cpp
===================================================================
--- MOAB/trunk/src/parallel/TupleList.cpp	2012-09-10 16:48:00 UTC (rev 5732)
+++ MOAB/trunk/src/parallel/TupleList.cpp	2012-09-12 20:25:34 UTC (rev 5733)
@@ -116,11 +116,11 @@
     } else
       vul = NULL;
     if (max*mr > 0) {
-      size = max*mr*sizeof(real);
+      size = max*mr*sizeof(realType);
       void *resr = malloc(size);
       if(!resr && max*ml > 0) 
 	fail("%s: allocation of %d bytes failed\n",__FILE__,(int)size);
-      vr=(real*) resr;
+      vr=(realType*) resr;
     } else
       vr = NULL;
 
@@ -165,13 +165,13 @@
       vul = (ulong*) resu;
     }
     if (vr || (max*mr > 0)){
-      size = max*mr*sizeof(real);
+      size = max*mr*sizeof(realType);
       void *resr = realloc(vr, size);
       if(!resr && max*mr > 0){
 	fail("%s: allocation of %d bytes failed\n",__FILE__,(int)size);
 	return moab::MB_MEMORY_ALLOCATION_FAILED;
       }
-      vr = (real*) resr;
+      vr = (realType*) resr;
     }
 
     //Set read variables
@@ -295,7 +295,7 @@
     return -1;	// If the value wasn't present or an invalid key was given
   }