[MOAB-dev] commit/MOAB: danwu: Renamed PARTITION_METHOD=TRIVIAL_PARTITION to PARTITION_METHOD=TRIVIAL in all ucd unit tests. Also removed code inside NCHelperHOMME and NCHelperMPAS constructors that tests NODAL_PARTITION option.

[commits-noreply at bitbucket.org]

1 new commit in MOAB:

https://bitbucket.org/fathomteam/moab/commits/b06aff66c570/
Changeset:   b06aff66c570
Branch:      master
User:        danwu
Date:        2013-08-16 17:45:38
Summary:     Renamed PARTITION_METHOD=TRIVIAL_PARTITION to PARTITION_METHOD=TRIVIAL in all ucd unit tests. Also removed code inside NCHelperHOMME and NCHelperMPAS constructors that tests NODAL_PARTITION option.

Affected #:  6 files

diff --git a/src/io/NCHelperHOMME.cpp b/src/io/NCHelperHOMME.cpp
index d6138b2..aabdbde 100644
--- a/src/io/NCHelperHOMME.cpp
+++ b/src/io/NCHelperHOMME.cpp
@@ -25,9 +25,6 @@ _spectralOrder(-1), connectId(-1)
       readNC->readMeshIface->report_error("%s", "Failed to read np global attribute int data.");
     else
       _spectralOrder--; // Spectral order is one less than np
-
-    if (MB_SUCCESS == opts.match_option("PARTITION_METHOD", "NODAL_PARTITION"))
-      readNC->partMethod = -1;
   }
 }
 

diff --git a/src/io/NCHelperMPAS.cpp b/src/io/NCHelperMPAS.cpp
index 9af4571..eedb525 100644
--- a/src/io/NCHelperMPAS.cpp
+++ b/src/io/NCHelperMPAS.cpp
@@ -21,8 +21,6 @@ NCHelperMPAS::NCHelperMPAS(ReadNC* readNC, int fileId, const FileOptions& opts,
 , maxCellEdges(MAX_EDGES_PER_CELL)
 , numCellGroups(0)
 {
-  if (MB_SUCCESS == opts.match_option("PARTITION_METHOD", "NODAL_PARTITION"))
-    readNC->partMethod = -1;
 }
 
 bool NCHelperMPAS::can_read_file(ReadNC* readNC)

diff --git a/test/io/read_mpas_nc.cpp b/test/io/read_mpas_nc.cpp
index ffd168b..d442577 100644
--- a/test/io/read_mpas_nc.cpp
+++ b/test/io/read_mpas_nc.cpp
@@ -265,7 +265,7 @@ ErrorCode get_options(std::string &opts)
 {
 #ifdef USE_MPI
   // Use parallel options
-  opts = std::string(";;PARALLEL=READ_PART;PARTITION_METHOD=TRIVIAL_PARTITION");
+  opts = std::string(";;PARALLEL=READ_PART;PARTITION_METHOD=TRIVIAL");
   return MB_SUCCESS;
 #else
   opts = std::string(";;");

diff --git a/test/io/read_ucd_nc.cpp b/test/io/read_ucd_nc.cpp
index f2aed36..bd16ec4 100644
--- a/test/io/read_ucd_nc.cpp
+++ b/test/io/read_ucd_nc.cpp
@@ -249,7 +249,7 @@ ErrorCode get_options(std::string& opts)
 {
 #ifdef USE_MPI
   // Use parallel options
-  opts = std::string(";;PARALLEL=READ_PART;PARTITION_METHOD=TRIVIAL_PARTITION");
+  opts = std::string(";;PARALLEL=READ_PART;PARTITION_METHOD=TRIVIAL");
   return MB_SUCCESS;
 #else
   opts = std::string(";;");

diff --git a/test/parallel/mpastrvpart.cpp b/test/parallel/mpastrvpart.cpp
index 386b126..0999aa0 100644
--- a/test/parallel/mpastrvpart.cpp
+++ b/test/parallel/mpastrvpart.cpp
@@ -32,7 +32,7 @@ int main(int argc, char* argv[])
 
 void test_read_parallel_mpas_trivial()
 {
-  partition_method = std::string(";PARTITION_METHOD=TRIVIAL_PARTITION;PARALLEL_RESOLVE_SHARED_ENTS");
+  partition_method = std::string(";PARTITION_METHOD=TRIVIAL;PARALLEL_RESOLVE_SHARED_ENTS");
 
   test_read_parallel(1280, true, 1920, true);
 }
@@ -106,17 +106,17 @@ void test_multiple_loads_of_same_file()
   CHECK_ERR(rval);
 
   // Read first only header information, no mesh, no variable
-  std::string opts("PARALLEL=READ_PART;PARTITION;NOMESH;VARIABLE=;PARTITION_METHOD=TRIVIAL_PARTITION");
+  std::string opts("PARALLEL=READ_PART;PARTITION;NOMESH;VARIABLE=;PARTITION_METHOD=TRIVIAL");
   rval = mb.load_file(example, &file_set, opts.c_str());
   CHECK_ERR(rval);
 
   // Create mesh, no variable
-  opts="PARALLEL=READ_PART;PARTITION;PARALLEL_RESOLVE_SHARED_ENTS;PARTITION_METHOD=TRIVIAL_PARTITION;VARIABLE=";
+  opts="PARALLEL=READ_PART;PARTITION;PARALLEL_RESOLVE_SHARED_ENTS;PARTITION_METHOD=TRIVIAL;VARIABLE=";
   rval = mb.load_file(example, &file_set, opts.c_str());
   CHECK_ERR(rval);
 
   // Read variable ke at timestep 0, no mesh
-  opts = "PARALLEL=READ_PART;PARTITION;PARTITION_METHOD=TRIVIAL_PARTITION;NOMESH;VARIABLE=ke;TIMESTEP=0";
+  opts = "PARALLEL=READ_PART;PARTITION;PARTITION_METHOD=TRIVIAL;NOMESH;VARIABLE=ke;TIMESTEP=0";
   rval = mb.load_file(example, &file_set, opts.c_str());
   CHECK_ERR(rval);
 }

diff --git a/test/parallel/ucdtrvpart.cpp b/test/parallel/ucdtrvpart.cpp
index 17b478f..720df36 100644
--- a/test/parallel/ucdtrvpart.cpp
+++ b/test/parallel/ucdtrvpart.cpp
@@ -34,13 +34,13 @@ int main(int argc, char* argv[])
 
 void test_read_parallel_ucd_trivial()
 {
-  partition_method = std::string(";PARTITION_METHOD=TRIVIAL_PARTITION;PARALLEL_RESOLVE_SHARED_ENTS");
+  partition_method = std::string(";PARTITION_METHOD=TRIVIAL;PARALLEL_RESOLVE_SHARED_ENTS");
   test_read_parallel(3458, true);
 }
   
 void test_read_parallel_ucd_trivial_spectral()
 {
-  partition_method = std::string(";PARTITION_METHOD=TRIVIAL_PARTITION;SPECTRAL_MESH;PARALLEL_RESOLVE_SHARED_ENTS");
+  partition_method = std::string(";PARTITION_METHOD=TRIVIAL;SPECTRAL_MESH;PARALLEL_RESOLVE_SHARED_ENTS");
   test_read_parallel(3458, false);
 }
 
@@ -141,17 +141,17 @@ void test_multiple_loads_of_same_file()
   CHECK_ERR(rval);
 
   // Read first only header information, no mesh, no variable
-  std::string opts("PARALLEL=READ_PART;PARTITION;NOMESH;VARIABLE=;PARTITION_METHOD=TRIVIAL_PARTITION");
+  std::string opts("PARALLEL=READ_PART;PARTITION;NOMESH;VARIABLE=;PARTITION_METHOD=TRIVIAL");
   rval = mb.load_file(example, &file_set, opts.c_str());
   CHECK_ERR(rval);
 
-  opts = "PARALLEL=READ_PART;PARTITION;PARALLEL_RESOLVE_SHARED_ENTS;PARTITION_METHOD=TRIVIAL_PARTITION;VARIABLE=";
+  opts = "PARALLEL=READ_PART;PARTITION;PARALLEL_RESOLVE_SHARED_ENTS;PARTITION_METHOD=TRIVIAL;VARIABLE=";
   // Create gather set in processor 1
   opts += std::string(";GATHER_SET=1");
   rval = mb.load_file(example, &file_set, opts.c_str());
   CHECK_ERR(rval);
 
-  opts = "PARALLEL=READ_PART;PARTITION;PARTITION_METHOD=TRIVIAL_PARTITION;NOMESH;VARIABLE=T;TIMESTEP=0";
+  opts = "PARALLEL=READ_PART;PARTITION;PARTITION_METHOD=TRIVIAL;NOMESH;VARIABLE=T;TIMESTEP=0";
   rval = mb.load_file(example, &file_set, opts.c_str());
   CHECK_ERR(rval);

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.