[MOAB-dev] r4888 - in MOAB/trunk: src/io src/moab tools/dagmc

[tautges at mcs.anl.gov]

Author: tautges
Date: 2011-05-26 22:41:08 -0500 (Thu, 26 May 2011)
New Revision: 4888

Modified:
   MOAB/trunk/src/io/ReadNC.cpp
   MOAB/trunk/src/io/ReadNC.hpp
   MOAB/trunk/src/moab/Range.hpp
   MOAB/trunk/tools/dagmc/DagMC.cpp
   MOAB/trunk/tools/dagmc/quads_to_tris_driver.cpp
Log:
Adding option to select 2d partition method instead of 1d partition method that's the default.
Also moved option processing, and fixed a few compiler warnings.




Modified: MOAB/trunk/src/io/ReadNC.cpp
===================================================================
--- MOAB/trunk/src/io/ReadNC.cpp	2011-05-26 22:02:14 UTC (rev 4887)
+++ MOAB/trunk/src/io/ReadNC.cpp	2011-05-27 03:41:08 UTC (rev 4888)
@@ -34,7 +34,7 @@
           iDim(-1), jDim(-1), kDim(-1), tDim(-1), numUnLim(-1), mCurrentMeshHandle(0),
           startVertex(0), startElem(0), mGlobalIdTag(0), 
           max_line_length(-1), max_str_length(-1), vertexOffset(0), dbgOut(stderr),
-          isParallel(false)
+          isParallel(false), use2DPartition(false)
 #ifdef USE_MPI
         , myPcomm(NULL)
 #endif
@@ -98,12 +98,6 @@
                                 MB_TYPE_INTEGER, mGlobalIdTag, &dum_val);
   }
   
-  int tmpval;
-  if (MB_SUCCESS == opts.get_int_option("DEBUG_IO", 1, tmpval)) {
-    dbgOut.set_verbosity(tmpval);
-    dbgOut.set_prefix("NC ");
-  }
-  
   bool nomesh = false;
   std::string partition_tag_name;
   rval = parse_options(opts, var_names, tstep_nums, tstep_vals, nomesh, partition_tag_name);
@@ -186,6 +180,12 @@
                                 bool &nomesh,
                                 std::string &partition_tag_name) 
 {
+  int tmpval;
+  if (MB_SUCCESS == opts.get_int_option("DEBUG_IO", 1, tmpval)) {
+    dbgOut.set_verbosity(tmpval);
+    dbgOut.set_prefix("NC ");
+  }
+  
   opts.get_strs_option("VARIABLE", var_names ); 
   opts.get_ints_option("TIMESTEP", tstep_nums); 
   opts.get_reals_option("TIMEVAL", tstep_vals);
@@ -231,6 +231,10 @@
   }
   const int rank = myPcomm->proc_config().proc_rank();
   dbgOut.set_rank(rank);
+
+  if (MB_SUCCESS == opts.get_null_option("2D_PARTITION"))
+    use2DPartition = true;
+  
 #endif
 
   return MB_SUCCESS;
@@ -700,11 +704,15 @@