[MOAB-dev] r4555 - in MOAB/trunk/src: . io

[tautges at mcs.anl.gov]

Author: tautges
Date: 2011-03-09 00:22:24 -0600 (Wed, 09 Mar 2011)
New Revision: 4555

Modified:
   MOAB/trunk/src/ScdInterface.cpp
   MOAB/trunk/src/io/ReadNC.cpp
Log:
ScdInterface: fixing a paste-o spotted by Iulian; also changing tag types to
  sparse, we'll likely have very few blocks of structured mesh in any mesh.

ReadNC: change handling of timestep data so if only a single timestep is there
  it gets read in.



Modified: MOAB/trunk/src/ScdInterface.cpp
===================================================================
--- MOAB/trunk/src/ScdInterface.cpp	2011-03-09 06:11:03 UTC (rev 4554)
+++ MOAB/trunk/src/ScdInterface.cpp	2011-03-09 06:22:24 UTC (rev 4555)
@@ -183,7 +183,7 @@
   if (MB_SUCCESS != rval) return rval;
 
     // tag the set with the box
-  rval = mbImpl->tag_set_data(box_set_tag(), &scd_set, 1, low.hom_coord());
+  rval = mbImpl->tag_set_data(box_set_tag(), &scd_set, 1, &new_box);
   if (MB_SUCCESS != rval) return rval;
 
   return MB_SUCCESS;
@@ -211,7 +211,7 @@
 {
   if (boxMinTag || !create_if_missing) return boxMinTag;
 
-  ErrorCode rval = mbImpl->tag_create("BOX_MIN", 3*sizeof(int), MB_TAG_DENSE, 
+  ErrorCode rval = mbImpl->tag_create("BOX_MIN", 3*sizeof(int), MB_TAG_SPARSE, 
                                       MB_TYPE_OPAQUE, boxMinTag, NULL, true);
   if (MB_SUCCESS != rval) return 0;
   return boxMinTag;
@@ -221,7 +221,7 @@
 {
   if (boxMaxTag || !create_if_missing) return boxMaxTag;
 
-  ErrorCode rval = mbImpl->tag_create("BOX_MAX", 3*sizeof(int), MB_TAG_DENSE, 
+  ErrorCode rval = mbImpl->tag_create("BOX_MAX", 3*sizeof(int), MB_TAG_SPARSE, 
                                       MB_TYPE_OPAQUE, boxMaxTag, NULL, true);
   if (MB_SUCCESS != rval) return 0;
   return boxMaxTag;
@@ -231,7 +231,7 @@
 {
   if (boxSetTag || !create_if_missing) return boxSetTag;
 
-  ErrorCode rval = mbImpl->tag_create("__BOX_SET", 3*sizeof(int), MB_TAG_DENSE, 
+  ErrorCode rval = mbImpl->tag_create("__BOX_SET", sizeof(ScdBox*), MB_TAG_SPARSE, 
                                       MB_TYPE_OPAQUE, boxSetTag, NULL, true);
   if (MB_SUCCESS != rval) return 0;
   return boxSetTag;

Modified: MOAB/trunk/src/io/ReadNC.cpp
===================================================================
--- MOAB/trunk/src/io/ReadNC.cpp	2011-03-09 06:11:03 UTC (rev 4554)
+++ MOAB/trunk/src/io/ReadNC.cpp	2011-03-09 06:22:24 UTC (rev 4555)
@@ -343,7 +343,9 @@
     for (mit = varInfo.begin(); mit != varInfo.end(); mit++) {
       VarData vd = (*mit).second;
       std::vector<int> tmp_v;
-      tmp_v.push_back(tDim);
+      if (-1 != tMin &&