[MOAB-dev] r4428 - in MOAB/trunk/src: . parallel

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2011-01-11 10:14:37 -0600 (Tue, 11 Jan 2011)
New Revision: 4428

Modified:
   MOAB/trunk/src/FileOptions.cpp
   MOAB/trunk/src/FileOptions.hpp
   MOAB/trunk/src/parallel/ReadParallel.cpp
Log:
if PARALLEL=BCAST_DELETE, don't check that all reader options were valid for the non-IO processors because they never call into the actual reader

Modified: MOAB/trunk/src/FileOptions.cpp
===================================================================
--- MOAB/trunk/src/FileOptions.cpp	2011-01-11 16:13:41 UTC (rev 4427)
+++ MOAB/trunk/src/FileOptions.cpp	2011-01-11 16:14:37 UTC (rev 4428)
@@ -371,6 +371,12 @@
   return std::find( mSeen.begin(), mSeen.end(), false ) == mSeen.end();
 }
 
+void FileOptions::mark_all_seen() const
+{
+  mSeen.clear();
+  mSeen.resize( mOptions.size(), true );
+}
+
 ErrorCode FileOptions::get_unseen_option( std::string& name ) const
 {
   std::vector<bool>::iterator i = std::find( mSeen.begin(), mSeen.end(), false );

Modified: MOAB/trunk/src/FileOptions.hpp
===================================================================
--- MOAB/trunk/src/FileOptions.hpp	2011-01-11 16:13:41 UTC (rev 4427)
+++ MOAB/trunk/src/FileOptions.hpp	2011-01-11 16:14:37 UTC (rev 4428)
@@ -201,6 +201,9 @@
   /** Check if all options have been looked at */
   bool all_seen() const;
   
+  /** Mark all options as seen.  USed for non-root procs during bcast-delete read */
+  void mark_all_seen() const;
+  
   /** Get first unseen option */
   ErrorCode get_unseen_option( std::string& value ) const;
   

Modified: MOAB/trunk/src/parallel/ReadParallel.cpp
===================================================================
--- MOAB/trunk/src/parallel/ReadParallel.cpp	2011-01-11 16:13:41 UTC (rev 4427)
+++ MOAB/trunk/src/parallel/ReadParallel.cpp	2011-01-11 16:14:37 UTC (rev 4428)
@@ -223,7 +223,7 @@
 
   if (print_parallel) pa_vec.push_back(PA_PRINT_PARALLEL);
   
-  return load_file(file_names, num_files, file_set, parallel_mode, 
+  result = load_file(file_names, num_files, file_set, parallel_mode, 
                    partition_tag_name,
                    partition_tag_vals, distrib, 
                    partition_by_rank, pa_vec, opts,
@@ -231,6 +231,10 @@
                    reader_rank, cputime, 
                    resolve_dim, shared_dim,
                    ghost_dim, bridge_dim, num_layers, addl_ents);
+