[MOAB-dev] r4090 - in MOAB/trunk: src/parallel test/parallel

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2010-08-16 12:07:09 -0500 (Mon, 16 Aug 2010)
New Revision: 4090

Modified:
   MOAB/trunk/src/parallel/ParallelComm.cpp
   MOAB/trunk/test/parallel/Makefile.am
Log:
revert unintneded checkins

Modified: MOAB/trunk/src/parallel/ParallelComm.cpp
===================================================================
--- MOAB/trunk/src/parallel/ParallelComm.cpp	2010-08-16 17:05:10 UTC (rev 4089)
+++ MOAB/trunk/src/parallel/ParallelComm.cpp	2010-08-16 17:07:09 UTC (rev 4090)
@@ -2740,7 +2740,6 @@
   ErrorCode result;
   Range proc_ents;
       // get the entities in the partition sets
-if (0 == rank()) std::cerr << "Getting partitioned entities" << std::endl;
   for (Range::iterator rit = partitionSets.begin(); rit != partitionSets.end(); rit++) {
     Range tmp_ents;
     result = mbImpl->get_entities_by_handle(*rit, tmp_ents, true);
@@ -2753,13 +2752,16 @@
     if (proc_ents.empty()) 
       return MB_ENTITY_NOT_FOUND;
 
-    resolve_dim = mbImpl->dimension_from_handle(proc_ents.back()); 
+    resolve_dim = mbImpl->dimension_from_handle(*proc_ents.rbegin()); 
   }
 
     // proc_ents should all be of same dimension
-  if (resolve_dim > shared_dim && !proc_ents.all_of_dimension(resolve_dim)) {
-    Range::iterator upper = proc_ents.upper_bound(CN::TypeDimensionMap[resolve_dim-1].second);
-    proc_ents.erase(proc_ents.begin(), upper);
+  if (resolve_dim > shared_dim &&
+      mbImpl->dimension_from_handle(*proc_ents.rbegin()) !=
+      mbImpl->dimension_from_handle(*proc_ents.begin())) {
+    Range::iterator lower = proc_ents.lower_bound(CN::TypeDimensionMap[0].first),
+      upper = proc_ents.upper_bound(CN::TypeDimensionMap[resolve_dim-1].second);
+    proc_ents.erase(lower, upper);
   }
   
     // must call even if we don't have any entities, to make sure
@@ -2779,9 +2781,8 @@
   MPE_Log_event(RESOLVE_START, procConfig.proc_rank(), "Entering resolve_shared_ents.");
 #endif
 
-  double t0 = MPI_Wtime();
   ErrorCode result;
-  if (debug) std::cerr << MPI_Wtime()-t0 << ": Resolving shared entities." << std::endl;
+  if (debug) std::cerr << "Resolving shared entities." << std::endl;
 
   if (-1 == shared_dim) {
     if (0 == resolve_dim) {
@@ -2821,7 +2822,6 @@
   }
 
     // find the skin
-if (0 == rank()) std::cerr << MPI_Wtime()-t0 << ": Skinning partitioned entities" << std::endl;
   Skinner skinner(mbImpl);
   result = skinner.find_skin(skin_ents[skin_dim+1], false, skin_ents[skin_dim],