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

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2011-05-09 12:13:56 -0500 (Mon, 09 May 2011)
New Revision: 4808

Modified:
   MOAB/trunk/src/io/WriteHDF5.cpp
   MOAB/trunk/src/io/WriteHDF5.hpp
   MOAB/trunk/src/parallel/WriteHDF5Parallel.cpp
   MOAB/trunk/src/parallel/WriteHDF5Parallel.hpp
Log:
rename poorly named struct and members (no functional change)

Modified: MOAB/trunk/src/io/WriteHDF5.cpp
===================================================================
--- MOAB/trunk/src/io/WriteHDF5.cpp	2011-05-09 15:35:03 UTC (rev 4807)
+++ MOAB/trunk/src/io/WriteHDF5.cpp	2011-05-09 17:13:56 UTC (rev 4808)
@@ -555,7 +555,7 @@
                                         int user_dimension )
 {
   ErrorCode result;
-  std::list<SparseTag>::const_iterator t_itor;
+  std::list<TagDesc>::const_iterator t_itor;
   std::list<ExportSet>::iterator ex_itor;
   EntityHandle elem_count, max_id;
   double init_time, gather_time, create_time, node_time, element_time, set_time, tag_time, total_time;
@@ -1788,7 +1788,7 @@
   return MB_SUCCESS;
 }
 
-ErrorCode WriteHDF5::write_tag( const SparseTag& tag_data )
+ErrorCode WriteHDF5::write_tag( const TagDesc& tag_data )
 {
   std::string name;
   ErrorCode rval = iFace->tag_get_name( tag_data.tag_id, name );
@@ -1809,7 +1809,7 @@
   if (MB_SUCCESS != rval)
     return error(rval);
 
-  if (array_len == MB_VARIABLE_LENGTH && tag_data.write) {
+  if (array_len == MB_VARIABLE_LENGTH && tag_data.write_sparse) {
     dbgOut.printf( 2, "Writing sparse data for var-len tag: \"%s\"\n", name.c_str() );
     rval = write_var_len_tag( tag_data, name, moab_type, hdf5_type, elem_size );
   }
@@ -1817,12 +1817,12 @@
     int data_len = elem_size;
     if (moab_type != MB_TYPE_BIT)
       data_len *= array_len;
-    if (tag_data.write) {
+    if (tag_data.write_sparse) {
       dbgOut.printf( 2, "Writing sparse data for tag: \"%s\"\n", name.c_str() );
       rval = write_sparse_tag( tag_data, name, moab_type, hdf5_type, data_len );
     }
-    for (size_t i = 0; MB_SUCCESS == rval && i < tag_data.denseList.size(); ++i) {
-      const ExportSet* set = find( tag_data.denseList[i] );
+    for (size_t i = 0; MB_SUCCESS == rval && i < tag_data.dense_list.size(); ++i) {
+      const ExportSet* set = find( tag_data.dense_list[i] );
       assert(0 != set);
       debug_barrier();
       dbgOut.printf( 2, "Writing dense data for tag: \"%s\" on group \"%s\"\n", name.c_str(), set->name() );
@@ -1834,7 +1834,7 @@
   return MB_SUCCESS == rval ? MB_SUCCESS : error(rval);
 }