[MOAB-dev] r2784 - MOAB/trunk

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2009-03-31 08:30:24 -0500 (Tue, 31 Mar 2009)
New Revision: 2784

Modified:
   MOAB/trunk/MBCore.cpp
   MOAB/trunk/ReadNCDF.cpp
Log:
fix test failures

Modified: MOAB/trunk/MBCore.cpp
===================================================================
--- MOAB/trunk/MBCore.cpp	2009-03-30 23:39:05 UTC (rev 2783)
+++ MOAB/trunk/MBCore.cpp	2009-03-31 13:30:24 UTC (rev 2784)
@@ -354,7 +354,8 @@
                                 const int num_blocks )
 {
   MBEntityHandle file_set;
-  return load_file( file_name, file_set, 0, MATERIAL_SET_TAG_NAME, block_id_list, num_blocks );
+  const char* name = block_id_list ? MATERIAL_SET_TAG_NAME : 0;
+  return load_file( file_name, file_set, 0, name, block_id_list, num_blocks );
 }
 
 MBErrorCode MBCore::load_file( const char* file_name,

Modified: MOAB/trunk/ReadNCDF.cpp
===================================================================
--- MOAB/trunk/ReadNCDF.cpp	2009-03-30 23:39:05 UTC (rev 2783)
+++ MOAB/trunk/ReadNCDF.cpp	2009-03-31 13:30:24 UTC (rev 2784)
@@ -438,7 +438,7 @@
 {
   MBErrorCode status;
 
-  if (!strcmp( set_tag_name, MATERIAL_SET_TAG_NAME )) {
+  if (blocks_to_load && !strcmp( set_tag_name, MATERIAL_SET_TAG_NAME )) {
     readMeshIface->report_error( "Exodus reader supports subset read only by block ID." );
     return MB_UNSUPPORTED_OPERATION;
   }