[cig-commits] r13980 - cs/cigma/trunk/src

[luis at geodynamics.org]

Author: luis
Date: 2009-01-28 09:05:09 -0800 (Wed, 28 Jan 2009)
New Revision: 13980

Modified:
   cs/cigma/trunk/src/io_hdf5_reader.cpp
Log:
Don't throw exception here (allow caller to check mesh->cell_type instead)

Modified: cs/cigma/trunk/src/io_hdf5_reader.cpp
===================================================================
--- cs/cigma/trunk/src/io_hdf5_reader.cpp	2009-01-28 17:05:06 UTC (rev 13979)
+++ cs/cigma/trunk/src/io_hdf5_reader.cpp	2009-01-28 17:05:09 UTC (rev 13980)
@@ -223,13 +223,17 @@
         mesh->connect   = this->getElementBlock(eb.c_str());
         mesh->cell_type = this->getCellType(loc);
 
-        if (mesh->cell_type == Cell::NONE)
+        // XXX: don't throw exception here. the caller can check the cell type.
+        if (false)
         {
-            std::ostringstream stream;
-            stream << "Cell type for mesh '"
-                   << loc << "' in HDF5 file '"
-                   << filename << "' was not specified" << std::ends;
-            throw cigma::Exception("HDF5_Reader::getMeshPart", stream.str());
+            if (mesh->cell_type == Cell::NONE)
+            {
+                std::ostringstream stream;
+                stream << "Cell type for mesh '"
+                       << loc << "' in HDF5 file '"
+                       << filename << "' was not specified" << std::ends;
+                throw cigma::Exception("HDF5_Reader::getMeshPart", stream.str());
+            }
         }
 
         if (true)