[MOAB-dev] commit/MOAB: danwu: PARTITION=<partitionTagName> is no longer a read option, should always use the partition set tag returned by ParallelComm::partition_tag(), with the tag name PARALLEL_PARTITION.

[commits-noreply at bitbucket.org]

1 new commit in MOAB:

https://bitbucket.org/fathomteam/moab/commits/1e621082b5d1/
Changeset:   1e621082b5d1
Branch:      master
User:        danwu
Date:        2013-08-29 19:56:52
Summary:     PARTITION=<partitionTagName> is no longer a read option, should always use the partition set tag returned by ParallelComm::partition_tag(), with the tag name PARALLEL_PARTITION.

Affected #:  2 files

diff --git a/src/io/ReadNC.cpp b/src/io/ReadNC.cpp
index 5adc52d..eee8a9e 100644
--- a/src/io/ReadNC.cpp
+++ b/src/io/ReadNC.cpp
@@ -57,7 +57,6 @@ ErrorCode ReadNC::load_file(const char* file_name, const EntityHandle* file_set,
   // is set too, with the same data, duplicated
   mpFileIdTag = file_id_tag;
 
-  std::string partition_tag_name;
   rval = parse_options(opts, var_names, tstep_nums, tstep_vals);
   ERRORR(rval, "Trouble parsing option string.");
 
@@ -167,13 +166,7 @@ ErrorCode ReadNC::load_file(const char* file_name, const EntityHandle* file_set,
     myPcomm->partition_sets().insert(partn_set);
 
     // Write partition tag name on partition set
-    Tag part_tag;
-    rval = mbImpl->tag_get_handle(partitionTagName.c_str(), 1, MB_TYPE_INTEGER, part_tag);
-    if (MB_SUCCESS != rval) {
-      // Fall back to the partition tag
-      part_tag = myPcomm->partition_tag();
-    }
-
+    Tag part_tag = myPcomm->partition_tag();
     int dum_rank = myPcomm->proc_config().proc_rank();
     rval = mbImpl->tag_set_data(part_tag, &partn_set, 1, &dum_rank);
     if (MB_SUCCESS != rval)

diff --git a/src/io/ReadNC.hpp b/src/io/ReadNC.hpp
index 6776b45..41c866a 100644
--- a/src/io/ReadNC.hpp
+++ b/src/io/ReadNC.hpp
@@ -207,7 +207,6 @@ private:
   bool noMesh;
   bool noVars;
   bool spectralMesh;
-  std::string partitionTagName;
   int gatherSetRank;
 
   //! Helper class instance

Repository URL: https://bitbucket.org/fathomteam/moab/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.