[MOAB-dev] r4523 - in MOAB/trunk: src src/io src/parallel test/parallel

[tautges at mcs.anl.gov]

Author: tautges
Date: 2011-02-23 17:00:37 -0600 (Wed, 23 Feb 2011)
New Revision: 4523

Modified:
   MOAB/trunk/src/MergeMesh.cpp
   MOAB/trunk/src/io/ReadNC.cpp
   MOAB/trunk/src/io/ReadNC.hpp
   MOAB/trunk/src/parallel/ParallelMergeMesh.cpp
   MOAB/trunk/test/parallel/parmerge.cpp
Log:
test/parallel/parmerge.cpp, src/parallel/ParallelMergeMesh.cpp: more debugging of parallel merge
ReadNC.[c,h]pp: adding other possible names for x/y/z/time.




Modified: MOAB/trunk/src/MergeMesh.cpp
===================================================================
--- MOAB/trunk/src/MergeMesh.cpp	2011-02-23 20:09:04 UTC (rev 4522)
+++ MOAB/trunk/src/MergeMesh.cpp	2011-02-23 23:00:37 UTC (rev 4523)
@@ -26,6 +26,7 @@
   tmp_elems.insert( elems, elems + elems_size);
   moab::ErrorCode result = merge_entities(tmp_elems, merge_tol, do_merge, update_sets,
                                       (moab::Tag)merge_tag);
+
   return result;
 }
 

Modified: MOAB/trunk/src/io/ReadNC.cpp
===================================================================
--- MOAB/trunk/src/io/ReadNC.cpp	2011-02-23 20:09:04 UTC (rev 4522)
+++ MOAB/trunk/src/io/ReadNC.cpp	2011-02-23 23:00:37 UTC (rev 4523)
@@ -563,6 +563,8 @@
     idx = vit-dimNames.begin();
   else if ((vit = std::find(dimNames.begin(), dimNames.end(), "x1")) != dimNames.end()) 
     idx = vit-dimNames.begin();
+  else if ((vit = std::find(dimNames.begin(), dimNames.end(), "x")) != dimNames.end()) 
+    idx = vit-dimNames.begin();
   else ERRORR(MB_FAILURE, "Couldn't find i variable.");
   iDim = idx;
   iMax = dimVals[idx]-1;
@@ -573,6 +575,8 @@
     idx = vit-dimNames.begin();
   else if ((vit = std::find(dimNames.begin(), dimNames.end(), "y1")) != dimNames.end()) 
     idx = vit-dimNames.begin();
+  else if ((vit = std::find(dimNames.begin(), dimNames.end(), "y")) != dimNames.end()) 
+    idx = vit-dimNames.begin();
   else ERRORR(MB_FAILURE, "Couldn't find j variable.");
   jDim = idx;
   jMax = dimVals[idx]-1;
@@ -585,13 +589,21 @@
     kMax = dimVals[idx]-1, kMin = 0, kName = std::string("lev");
     kDim = idx;
   }
+  else if ((vit = std::find(dimNames.begin(), dimNames.end(), "z")) != dimNames.end()) {
+    idx = vit-dimNames.begin();
+    kMax = dimVals[idx]-1, kMin = 0, kName = std::string("z");
+    kDim = idx;
+  }
 
   if ((vit = std::find(dimNames.begin(), dimNames.end(), "time")) != dimNames.end()) 
     idx = vit-dimNames.begin();
+  else if ((vit = std::find(dimNames.begin(), dimNames.end(), "t")) != dimNames.end()) 
+    idx = vit-dimNames.begin();
   else ERRORR(MB_FAILURE, "Couldn't find time variable.");
   tDim = idx;