[MOAB-dev] r4217 - MOAB/trunk/tools/mbcoupler

[smithrm at mcs.anl.gov]

Author: smithrm
Date: 2010-10-13 15:55:04 -0500 (Wed, 13 Oct 2010)
New Revision: 4217

Modified:
   MOAB/trunk/tools/mbcoupler/Coupler.cpp
Log:
o More subset normalization parallel code updates.
o Fixed errors due to name change for gs_transfer.


Modified: MOAB/trunk/tools/mbcoupler/Coupler.cpp
===================================================================
--- MOAB/trunk/tools/mbcoupler/Coupler.cpp	2010-10-13 20:51:18 UTC (rev 4216)
+++ MOAB/trunk/tools/mbcoupler/Coupler.cpp	2010-10-13 20:55:04 UTC (rev 4217)
@@ -29,6 +29,8 @@
 namespace moab {
 
 bool debug = false;
+int pack_tuples(tuple_list* tl, void **ptr);
+void unpack_tuples(void *ptr, tuple_list** tlp);
 
 Coupler::Coupler(Interface *impl,
                      ParallelComm *pc,
@@ -190,7 +192,7 @@
   }
 
     // perform scatter/gather, to gather points to source mesh procs
-  gs_transfer(1, &target_pts, 0, myPc->proc_config().crystal_router());
+  moab_gs_transfer(1, &target_pts, 0, myPc->proc_config().crystal_router());
 
     // after scatter/gather:
     // target_pts.n = # points local proc has to map
@@ -222,7 +224,7 @@
   tuple_list_free(&target_pts);
 
     // send target points back to target procs
-  gs_transfer(1, &source_pts, 0, myPc->proc_config().crystal_router());
+  moab_gs_transfer(1, &source_pts, 0, myPc->proc_config().crystal_router());
 
   // store proc/index tuples in targetPts, and/or pass back to application;
   // the tuple this gets stored to looks like:
@@ -355,7 +357,7 @@
     // remote pts first
   
     // scatter/gather interpolation points
-  gs_transfer(1, tl_tmp, 0, myPc->proc_config().crystal_router());
+  moab_gs_transfer(1, tl_tmp, 0, myPc->proc_config().crystal_router());
 
     // perform interpolation on local source mesh; put results into
     // tl_tmp->vr[i]
@@ -378,7 +380,7 @@
   }
   
     // scatter/gather interpolation data
-  gs_transfer(1, tl_tmp, 0, myPc->proc_config().crystal_router());
+  moab_gs_transfer(1, tl_tmp, 0, myPc->proc_config().crystal_router());
 
   if (!tl) {
       // mapped whole targetPts tuple; put into proper place in interp_vals
@@ -564,8 +566,12 @@
   //  ErrorCode result = MB_SUCCESS;