[MOAB-dev] r4271 - in MOAB/trunk: itaps/imesh src/parallel src/parallel/moab test test/oldinc test/parallel

[tautges at mcs.anl.gov]

Author: tautges
Date: 2010-11-17 09:53:31 -0600 (Wed, 17 Nov 2010)
New Revision: 4271

Modified:
   MOAB/trunk/itaps/imesh/iMeshP_MOAB.cpp
   MOAB/trunk/src/parallel/ParallelComm.cpp
   MOAB/trunk/src/parallel/ReadParallel.cpp
   MOAB/trunk/src/parallel/ReadParallel.hpp
   MOAB/trunk/src/parallel/moab/ParallelComm.hpp
   MOAB/trunk/test/MBTest.cpp
   MOAB/trunk/test/oldinc/test_oldinc.cpp
   MOAB/trunk/test/parallel/parallel_unit_tests.cpp
   MOAB/trunk/test/parallel/pcomm_serial.cpp
   MOAB/trunk/test/parallel/pcomm_unit.cpp
   MOAB/trunk/test/parallel/scdtest.cpp
Log:
Adding capability to request exchange of lower-dimensional adjacencies along with ghost
entities; specified as extra integer on the end of the ghost.bridge.layers tuple, 
e.g. "PARALLEL_GHOSTS=3.0.1.2", where the 2 specifies that faces adjacent to ghost entities should also
be exchanged.  Allowed values are 1 (just edges), 2 (just faces), or 3 (edges and faces).

scdtest, pcomm_serial, pcomm_unit, parallel_unit_tests, iMeshP_MOAB: added parameter to 
exchange_ghost_cells and a few other functions
 
MBTest: adding a test on range subsetting by dimension
test_oldinc.cpp: nop to eliminate compiler warning

Passes make check in serial and parallel (except for that iMeshP test that's been failing)




Modified: MOAB/trunk/itaps/imesh/iMeshP_MOAB.cpp
===================================================================
--- MOAB/trunk/itaps/imesh/iMeshP_MOAB.cpp	2010-11-16 18:44:16 UTC (rev 4270)
+++ MOAB/trunk/itaps/imesh/iMeshP_MOAB.cpp	2010-11-17 15:53:31 UTC (rev 4271)
@@ -1558,7 +1558,7 @@
   
   ParallelComm* pcomm = PCOMM;
   ErrorCode rval;
-  rval = pcomm->exchange_ghost_cells( ghost_dim, bridge_dim, num_layers, true );
+  rval = pcomm->exchange_ghost_cells( ghost_dim, bridge_dim, num_layers, 0, true );
   CHKERR(rval,"ghost exchange failed");
   RETURN(iBase_SUCCESS);
 }

Modified: MOAB/trunk/src/parallel/ParallelComm.cpp
===================================================================
--- MOAB/trunk/src/parallel/ParallelComm.cpp	2010-11-16 18:44:16 UTC (rev 4270)
+++ MOAB/trunk/src/parallel/ParallelComm.cpp	2010-11-17 15:53:31 UTC (rev 4271)
@@ -4016,7 +4016,7 @@
 }
 
 ErrorCode ParallelComm::exchange_ghost_cells(int ghost_dim, int bridge_dim,
-                                                 int num_layers,
+                                             int num_layers, int addl_ents,
                                                  bool store_remote_handles,
                                                  bool wait_all)
 {
@@ -4092,7 +4092,7 @@
   tuple_list entprocs;
   int dum_ack_buff;
   result = get_sent_ents(is_iface, bridge_dim, ghost_dim, num_layers,
-                         sent_ents, allsent, entprocs);
+                         addl_ents, sent_ents, allsent, entprocs);
   RRA("get_sent_ents failed.");
   
   std::cout << "allsent ents compactness (size) = " << allsent.compactness() << " (" 
@@ -4654,8 +4654,8 @@
 }
 
 ErrorCode ParallelComm::get_sent_ents(const bool is_iface, 
-                                          const int bridge_dim, const int ghost_dim,
-                                          const int num_layers,
+                                      const int bridge_dim, const int ghost_dim,
+                                      const int num_layers, const int addl_ents,
                                           Range *sent_ents, Range &allsent,
                                       tuple_list &entprocs) 
 {
@@ -4670,7 +4670,7 @@
        proc_it != buffProcs.end(); proc_it++, ind++) {
     if (!is_iface) {
       result = get_ghosted_entities(bridge_dim, ghost_dim, buffProcs[ind],