[MOAB-dev] r2229 - MOAB/trunk/parallel

[kraftche at mcs.anl.gov]

Author: kraftche
Date: 2008-11-12 21:38:55 -0600 (Wed, 12 Nov 2008)
New Revision: 2229

Modified:
   MOAB/trunk/parallel/ReadParallel.cpp
   MOAB/trunk/parallel/ReadParallel.hpp
Log:
Add default PARALLEL mode if option is specified with no value

Modified: MOAB/trunk/parallel/ReadParallel.cpp
===================================================================
--- MOAB/trunk/parallel/ReadParallel.cpp	2008-11-13 03:38:11 UTC (rev 2228)
+++ MOAB/trunk/parallel/ReadParallel.cpp	2008-11-13 03:38:55 UTC (rev 2229)
@@ -36,7 +36,7 @@
 
 const char* ReadParallel::parallelOptsNames[] = { "NONE", "BCAST", "BCAST_DELETE", 
                                                   "READ_DELETE", "READ_PARALLEL", 
-                                                  "FORMAT", 0 };
+                                                  "FORMAT", "", 0 };
       
 ReadParallel::ReadParallel(MBInterface* impl, 
                            MBParallelComm *pc) 
@@ -72,7 +72,7 @@
   std::string partition_tag_name;
   result = opts.get_option("PARTITION", partition_tag_name);
   if (MB_ENTITY_NOT_FOUND == result || partition_tag_name.empty())
-    partition_tag_name += "PARTITION";
+    partition_tag_name = PARALLEL_PARTITION_TAG_NAME;
 
     // Get partition tag value(s), if any, and whether they're to be
     // distributed or assigned
@@ -148,7 +148,7 @@
         if (!is_reader) pa_vec.push_back(PA_GET_FILESET_ENTS);
 
         break;
-      
+    
     case POPT_BCAST_DELETE:
         if (is_reader) {
           pa_vec.push_back(PA_READ);
@@ -160,6 +160,7 @@
         pa_vec.push_back(PA_DELETE_NONLOCAL);
         break;
 
+    case POPT_DEFAULT:
     case POPT_READ_DELETE:
         pa_vec.push_back(PA_READ);
         pa_vec.push_back(PA_CHECK_GIDS_SERIAL);

Modified: MOAB/trunk/parallel/ReadParallel.hpp
===================================================================
--- MOAB/trunk/parallel/ReadParallel.hpp	2008-11-13 03:38:11 UTC (rev 2228)
+++ MOAB/trunk/parallel/ReadParallel.hpp	2008-11-13 03:38:55 UTC (rev 2229)
@@ -41,7 +41,7 @@
   
   enum ParallelOpts {POPT_NONE=0, POPT_BCAST, POPT_BCAST_DELETE, 
                      POPT_READ_DELETE, POPT_READ_PARALLEL,
-                     POPT_FORMAT, POPT_LAST};
+                     POPT_FORMAT, POPT_DEFAULT};
   
 protected: