[MOAB-dev] r1956 - in MOAB/trunk: parallel tools/mbcoupler

[tautges at mcs.anl.gov]

Author: tautges
Date: 2008-06-29 17:13:28 -0500 (Sun, 29 Jun 2008)
New Revision: 1956

Modified:
   MOAB/trunk/parallel/ReadParallel.cpp
   MOAB/trunk/tools/mbcoupler/MBCoupler.cpp
Log:
Turning off debug output in ReadParallel; switching to Jason's point interpolation within hex.


Modified: MOAB/trunk/parallel/ReadParallel.cpp
===================================================================
--- MOAB/trunk/parallel/ReadParallel.cpp	2008-06-29 21:21:04 UTC (rev 1955)
+++ MOAB/trunk/parallel/ReadParallel.cpp	2008-06-29 22:13:28 UTC (rev 1956)
@@ -14,7 +14,7 @@
 #include <algorithm>
 #include <assert.h>
 
-const bool debug = true;
+const bool debug = false;
 
 #define RR(a) if (MB_SUCCESS != result) {                               \
       dynamic_cast<MBCore*>(mbImpl)->get_error_handler()->set_last_error(a); \

Modified: MOAB/trunk/tools/mbcoupler/MBCoupler.cpp
===================================================================
--- MOAB/trunk/tools/mbcoupler/MBCoupler.cpp	2008-06-29 21:21:04 UTC (rev 1955)
+++ MOAB/trunk/tools/mbcoupler/MBCoupler.cpp	2008-06-29 22:13:28 UTC (rev 1956)
@@ -425,7 +425,7 @@
       //test to find out in which hex the point is
 		
       // get natural coordinates
-    MBElemUtil::nat_coords_trilinear_hex2(&coords_vert[0], MBCartVect(xyz), 
+    MBElemUtil::nat_coords_trilinear_hex(&coords_vert[0], MBCartVect(xyz), 
                                          tmp_nat_coords, 1e-10);
     if (-1.0 <= tmp_nat_coords[0] && tmp_nat_coords[0] <= 1.0 &&
         -1.0 <= tmp_nat_coords[1] && tmp_nat_coords[1] <= 1.0 &&