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

[vijaysm at mcs.anl.gov]

Author: vijaysm
Date: 2013-01-22 15:04:22 -0600 (Tue, 22 Jan 2013)
New Revision: 5950

Modified:
   MOAB/trunk/src/io/ReadGCRM.cpp
   MOAB/trunk/src/io/ReadNC.cpp
   MOAB/trunk/src/io/ReadNC.hpp
   MOAB/trunk/src/io/WriteHDF5.hpp
   MOAB/trunk/src/moab/CartVect.hpp
   MOAB/trunk/src/parallel/ReadParallel.cpp
   MOAB/trunk/src/parallel/TupleList.cpp
   MOAB/trunk/src/parallel/WriteHDF5Parallel.cpp
Log:
Miscellaneous fixes.

1) Declare a virtual destructor for CartVect.
2) Removing unusued variable warning by commenting out appropriate function args.
3) Fixing preprocessor #if being used erroneously.
4) Fix incorrect formatting type specifiers.
5) No need to check (var>=0) if var is an unsigned int. This results in verbose warnings.
6) VALGRIND_MAKE_VEC_UNDEFINED is necessary if compiled with valgrind. So move this outside the
   #ifdef VALGRIND block in src/parallel/WriteHDF5Parallel.cpp. Need to check if this does not
   lead to any memory faults in existing tests.



Modified: MOAB/trunk/src/io/ReadGCRM.cpp
===================================================================
--- MOAB/trunk/src/io/ReadGCRM.cpp	2013-01-22 19:01:10 UTC (rev 5949)
+++ MOAB/trunk/src/io/ReadGCRM.cpp	2013-01-22 21:04:22 UTC (rev 5950)
@@ -72,15 +72,17 @@
 #endif
 }
 
-ErrorCode ReadGCRM::load_file( const char* file_name,
-                               const EntityHandle* file_set,
-                               const FileOptions& opts,
-                               const SubsetList* subset_list,
+ErrorCode ReadGCRM::load_file( const char* /* file_name */,
+                               const EntityHandle* /* file_set*/,
+                               const FileOptions& /* opts */,
+                               const SubsetList* /* subset_list */,
                                const Tag* /*file_id_tag*/) 
 {
     // guarantee failure for now
   return MB_FAILURE;
-  
+ 
+  /* VSM: Temporarily commenting out all the relevant code until the above guaranteed failure is fixed */
+  /*  
   if (subset_list) {
       // see src/moab/ReaderIface.hpp, definition of SubsetList struct; this basically specifies
       // an integer tag and tag values for sets to read on this proc, or a part number and total # parts
@@ -141,6 +143,7 @@
   }
   
   return result;
+  */
 }
 
 ErrorCode ReadGCRM::read_vertices(int num_verts, EntityHandle &start_vertex, Range &read_ents) 

Modified: MOAB/trunk/src/io/ReadNC.cpp
===================================================================
--- MOAB/trunk/src/io/ReadNC.cpp	2013-01-22 19:01:10 UTC (rev 5949)
+++ MOAB/trunk/src/io/ReadNC.cpp	2013-01-22 21:04:22 UTC (rev 5950)
@@ -1263,7 +1263,7 @@
   }
 
   if (!vdatas.empty()) {
-#if PNETCDF_FILE
+#ifdef PNETCDF_FILE
     if (camType == CAM_SE) // in serial, we will use the old read, everything is contiguous
       // in parallel, we will use async read in pnetcdf
       // the other mechanism is not working, forget about it
@@ -1618,7 +1618,7 @@
   return rval;