[MOAB-dev] r5897 - in MOAB/trunk: src/io src/parallel src/parallel/moab test/parallel

[iulian at mcs.anl.gov]

Author: iulian
Date: 2012-12-05 09:45:14 -0600 (Wed, 05 Dec 2012)
New Revision: 5897

Removed:
   MOAB/trunk/test/parallel/ucdnodpart.cpp
Modified:
   MOAB/trunk/src/io/ReadNC.cpp
   MOAB/trunk/src/io/ReadNC.hpp
   MOAB/trunk/src/parallel/ParallelComm.cpp
   MOAB/trunk/src/parallel/moab/ParallelComm.hpp
   MOAB/trunk/test/parallel/Makefile.am
Log:
remove nodal partition option, there is not enough support for it :(


Modified: MOAB/trunk/src/io/ReadNC.cpp
===================================================================
--- MOAB/trunk/src/io/ReadNC.cpp	2012-12-05 04:30:38 UTC (rev 5896)
+++ MOAB/trunk/src/io/ReadNC.cpp	2012-12-05 15:45:14 UTC (rev 5897)
@@ -37,7 +37,7 @@
   mbImpl(impl), CPU_WORD_SIZE(-1), IO_WORD_SIZE(-1), fileId(-1), tMin(-1), tMax(-1), iDim(-1), jDim(-1), tDim(-1), iCDim(-1),
   jCDim(-1), numUnLim(-1), mCurrentMeshHandle(0), startVertex(0), startElem(0), mGlobalIdTag(0), mpFileIdTag(NULL), max_line_length(-1),
   max_str_length(-1), vertexOffset(0), dbgOut(stderr), isParallel(false), partMethod(-1), camType(NOT_CAM), isCf(false),
-  spectralOrder(-1), npMesh(false), 
+  spectralOrder(-1),
 #ifdef USE_MPI
   myPcomm(NULL), 
 #endif
@@ -202,14 +202,8 @@
     ERRORR(rval, "Mesh characteristics didn't match from last read.\n");
   }
   else if (!noMesh) {
-    if (-1 == partMethod && false) // not sure what to do with this...
-      rval = create_np_verts_quads(opts, tmp_set, quads);
-    else if (CAM_SE == camType) {
-      if (npMesh)
-        rval = create_np_verts_quads(opts, tmp_set, quads);
-      else
-        rval = create_ucd_verts_quads(spectralMesh, opts, tmp_set, quads);
-    }
+    if (CAM_SE == camType)
+      rval = create_ucd_verts_quads(spectralMesh, opts, tmp_set, quads);
     else
       rval = create_verts_quads(scdi, tmp_set, quads);
     ERRORR(rval, "Trouble creating vertices and quads.");
@@ -228,16 +222,6 @@
     rval = mbImpl->get_entities_by_dimension(tmp_set, 0, local_verts);
     if (MB_FAILURE == rval)
       return rval;
-
-#ifdef USE_MPI
-    if (npMesh && isParallel)
-    {
-      // in parallel, for npMesh, we really need only owned vertices, which are contiguous!
-      // this is the whole point of nodal partition :)
-      rval = myPcomm->filter_pstatus(local_verts, PSTATUS_NOT_OWNED, PSTATUS_NOT);
-      ERRORR(rval, "Trouble getting owned verts in set.");
-    }
-#endif
     std::vector<int> gids(local_verts.size());
     // !IMPORTANT : this has to be the GLOBAL_ID tag
     rval=mbImpl->tag_get_data(mGlobalIdTag, local_verts, &gids[0]);
@@ -285,25 +269,6 @@
 
     myPcomm->partition_sets().insert(partn_set);