[MOAB-dev] r4887 - in MOAB/trunk: doc src src/io src/moab src/parallel src/parallel/moab test

[tautges at mcs.anl.gov]

Author: tautges
Date: 2011-05-26 17:02:14 -0500 (Thu, 26 May 2011)
New Revision: 4887

Modified:
   MOAB/trunk/doc/metadata_info.doc
   MOAB/trunk/src/ScdInterface.cpp
   MOAB/trunk/src/io/ReadCCMIO.cpp
   MOAB/trunk/src/io/ReadSms.cpp
   MOAB/trunk/src/moab/HomXform.hpp
   MOAB/trunk/src/moab/ScdInterface.hpp
   MOAB/trunk/src/parallel/ParallelComm.cpp
   MOAB/trunk/src/parallel/ReadParallel.cpp
   MOAB/trunk/src/parallel/moab/ParallelComm.hpp
   MOAB/trunk/test/scdseq_test.cpp
Log:
Structured mesh changes: going from marking structured boxes with BOX_MIN[3] and BOX_MAX[3] to marking
them with BOX_DIMS[6], where BOX_DIMS[0..2] are the min corner parameters and BOX_DIMS[3..5] are
the max corner parameters.  Also changed what's included in the structured sets to better reflect how 
the boxes were set up.

Also the debug output from ParallelComm is changed; see ParallelComm.cpp for the meaning of various values
of the DEBUG_PIO option.

Specific changes:
test/scdseq_test.cpp: changed to use new ScdBox functions.
ScdInterface.[c,h]pp: changes to narrow interface to corner parameters
HomXform.hpp: added argument to one of the constructors, to allow initialization from 3-member int array
ParallelComm.cpp: extensive changes to debugging output
ReadParallel.cpp: turn on debug output in ParallelComm if DEBUG_PIO option is present
metadata_info.doc: changes in tags on NC data, as discussed with Xiabing
ReadSms.cpp, ReadHDF5.cpp: changes to remove warnings.

Passes make check serial and parallel.


Modified: MOAB/trunk/doc/metadata_info.doc
===================================================================
(Binary files differ)

Modified: MOAB/trunk/src/ScdInterface.cpp
===================================================================
--- MOAB/trunk/src/ScdInterface.cpp	2011-05-26 21:05:39 UTC (rev 4886)
+++ MOAB/trunk/src/ScdInterface.cpp	2011-05-26 22:02:14 UTC (rev 4887)
@@ -18,8 +18,7 @@
 ScdInterface::ScdInterface(Core *impl, bool boxes) 
         : mbImpl(impl), 
           searchedBoxes(false),
-          boxMinTag(0),
-          boxMaxTag(0),
+          boxDimsTag(0),
           boxSetTag(0)
 {
   if (boxes) find_boxes(scdBoxes);
@@ -59,9 +58,9 @@
 ErrorCode ScdInterface::find_boxes(Range &scd_boxes) 
 {
   ErrorCode rval = MB_SUCCESS;
-  box_min_tag();
+  box_dims_tag();
   if (!searchedBoxes) {
-    rval = mbImpl->get_entities_by_type_and_tag(0, MBENTITYSET, &boxMinTag, NULL, 1, 
+    rval = mbImpl->get_entities_by_type_and_tag(0, MBENTITYSET, &boxDimsTag, NULL, 1, 
                                                 scdBoxes, Interface::UNION);
     searchedBoxes = true;
     if (MB_SUCCESS != rval) return rval;
@@ -206,35 +205,25 @@
   scdBoxes.insert(scd_set);
 
     // tag the set with parameter extents
-  rval = mbImpl->tag_set_data(box_min_tag(), &scd_set, 1, low.hom_coord());
+  int boxdims[6];
+  for (int i = 0; i < 3; i++) boxdims[i] = low[i];
+  for (int i = 0; i < 3; i++) boxdims[3+i] = high[i];
+  rval = mbImpl->tag_set_data(box_dims_tag(), &scd_set, 1, boxdims);
   if (MB_SUCCESS != rval) return rval;
 
-  rval = mbImpl->tag_set_data(box_max_tag(), &scd_set, 1, high.hom_coord());
-  if (MB_SUCCESS != rval) return rval;
-
   return rval;
 }
 
-Tag ScdInterface::box_min_tag(bool create_if_missing) 
+Tag ScdInterface::box_dims_tag(bool create_if_missing) 
 {
-  if (boxMinTag || !create_if_missing) return boxMinTag;