[MOAB-dev] r4209 - MOAB/trunk/src/parallel

[tautges at mcs.anl.gov]

Author: tautges
Date: 2010-10-09 09:26:29 -0500 (Sat, 09 Oct 2010)
New Revision: 4209

Modified:
   MOAB/trunk/src/parallel/ParallelComm.cpp
   MOAB/trunk/src/parallel/gs.c
   MOAB/trunk/src/parallel/gs.h
   MOAB/trunk/src/parallel/transfer.c
   MOAB/trunk/src/parallel/transfer.h
Log:
Changing gs names to moab_gs, to avoid name conflicts with similar functions in Nek.



Modified: MOAB/trunk/src/parallel/ParallelComm.cpp
===================================================================
--- MOAB/trunk/src/parallel/ParallelComm.cpp	2010-10-08 21:49:29 UTC (rev 4208)
+++ MOAB/trunk/src/parallel/ParallelComm.cpp	2010-10-09 14:26:29 UTC (rev 4209)
@@ -2905,16 +2905,16 @@
   
 */
     // call gather-scatter to get shared ids & procs
-  gs_data *gsd;
+  moab_gs_data *gsd;
   assert(sizeof(ulong_) == sizeof(EntityHandle));
   if (sizeof(int) != sizeof(ulong_)) {
     std::vector<long> lgid_data(gid_data.size());
     std::copy(gid_data.begin(), gid_data.end(), lgid_data.begin());
-    gsd = gs_data_setup(skin_ents[0].size(), &lgid_data[0], 
+    gsd = moab_gs_data_setup(skin_ents[0].size(), &lgid_data[0], 
                         (ulong_*)&handle_vec[0], 2, 1, 1, cd);
   }
   else {
-    gsd = gs_data_setup(skin_ents[0].size(), (long*)&gid_data[0], 
+    gsd = moab_gs_data_setup(skin_ents[0].size(), (long*)&gid_data[0], 
                         (ulong_*)&handle_vec[0], 2, 1, 1, cd);
   }
   
@@ -3012,7 +3012,7 @@
   result = create_iface_pc_links();
   RRA("Trouble creating interface parent/child links.");
 
-  gs_data_free(gsd);
+  moab_gs_data_free(gsd);
 
 #ifdef DEBUG_MPE
   MPE_Log_event(RESOLVE_END, procConfig.proc_rank(), "Exiting resolve_shared_ents.");

Modified: MOAB/trunk/src/parallel/gs.c
===================================================================
--- MOAB/trunk/src/parallel/gs.c	2010-10-08 21:49:29 UTC (rev 4208)
+++ MOAB/trunk/src/parallel/gs.c	2010-10-09 14:26:29 UTC (rev 4209)
@@ -112,7 +112,7 @@
   nonlocal_info *nlinfo;
   MPI_Comm comm;
 #endif
-} gs_data;
+} moab_gs_data;
 
 #define OP_ADD 1
 #define OP_MUL 2
@@ -366,7 +366,7 @@
    Combined Execution
   --------------------------------------------------------------------------*/