[MOAB-dev] r4002 - MOAB/trunk/src/io

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2010-06-09 13:03:03 -0500 (Wed, 09 Jun 2010)
New Revision: 4002

Modified:
   MOAB/trunk/src/io/ReadCGM.cpp
Log:
remove bogus error message about '-t' flag

Modified: MOAB/trunk/src/io/ReadCGM.cpp
===================================================================
--- MOAB/trunk/src/io/ReadCGM.cpp	2010-06-07 18:12:52 UTC (rev 4001)
+++ MOAB/trunk/src/io/ReadCGM.cpp	2010-06-09 18:03:03 UTC (rev 4002)
@@ -179,21 +179,12 @@
   // Get CGM file type
   const char* file_type = 0;
   file_type = get_geom_file_type( cgm_file_name );
-  if (!file_type) {
-    std::cerr << cgm_file_name << " : unknown file type, try '-t'" << std::endl;
+  if (!file_type || !strcmp(file_type ,"CUBIT")) 
     return MB_FAILURE;
-  }
-  else if(!strcmp(file_type ,"CUBIT"))
-  {
-    std::cerr << cgm_file_name << " : CUB files are currently not supported." << std::endl;
-    return MB_FAILURE;
-   }
-  else {
-    s = GeometryQueryTool::instance()->import_solid_model( cgm_file_name, file_type );
-  }
 
+  s = GeometryQueryTool::instance()->import_solid_model( cgm_file_name, file_type );
   if (CUBIT_SUCCESS != s) {
-    std::cerr << "Failed to read '" << cgm_file_name << "' of type '" << file_type << "'" << std::endl;
+    readUtilIface->report_error( "%s: Failed to read file of type \"%s\"", cgm_file_name, file_type );
     return MB_FAILURE;
   }