[cig-commits] r9302 - cs/benchmark/cigma/trunk/src

[luis at geodynamics.org]

Author: luis
Date: 2008-02-13 06:09:22 -0800 (Wed, 13 Feb 2008)
New Revision: 9302

Modified:
   cs/benchmark/cigma/trunk/src/HdfReader.cpp
   cs/benchmark/cigma/trunk/src/HdfReader.h
   cs/benchmark/cigma/trunk/src/Reader.h
   cs/benchmark/cigma/trunk/src/TextReader.cpp
   cs/benchmark/cigma/trunk/src/TextReader.h
   cs/benchmark/cigma/trunk/src/VtkReader.cpp
   cs/benchmark/cigma/trunk/src/VtkReader.h
Log:
Changed Reader::open() to return an error code


Modified: cs/benchmark/cigma/trunk/src/HdfReader.cpp
===================================================================
--- cs/benchmark/cigma/trunk/src/HdfReader.cpp	2008-02-13 14:09:21 UTC (rev 9301)
+++ cs/benchmark/cigma/trunk/src/HdfReader.cpp	2008-02-13 14:09:22 UTC (rev 9302)
@@ -17,11 +17,12 @@
 // ---------------------------------------------------------------------------
 
 
-void cigma::HdfReader::
+int cigma::HdfReader::
 open(std::string filename)
 {
     file_id = h5io_file_open(filename.c_str(), "r");
     assert(file_id >= 0);
+    return 0; // XXX: change return value instead of using assert
 }
 
 

Modified: cs/benchmark/cigma/trunk/src/HdfReader.h
===================================================================
--- cs/benchmark/cigma/trunk/src/HdfReader.h	2008-02-13 14:09:21 UTC (rev 9301)
+++ cs/benchmark/cigma/trunk/src/HdfReader.h	2008-02-13 14:09:22 UTC (rev 9302)
@@ -27,7 +27,7 @@
     ReaderType getType() { return HDF_READER; }
 
 public:
-    void open(std::string filename);
+    int open(std::string filename);
     void close();
 
 public:

Modified: cs/benchmark/cigma/trunk/src/Reader.h
===================================================================
--- cs/benchmark/cigma/trunk/src/Reader.h	2008-02-13 14:09:21 UTC (rev 9301)
+++ cs/benchmark/cigma/trunk/src/Reader.h	2008-02-13 14:09:22 UTC (rev 9302)
@@ -24,7 +24,7 @@
 
 public:
     virtual ReaderType getType() = 0;
-    virtual void open(std::string filename) = 0;
+    virtual int open(std::string filename) = 0;
     virtual void close() = 0;
 
 public:

Modified: cs/benchmark/cigma/trunk/src/TextReader.cpp
===================================================================
--- cs/benchmark/cigma/trunk/src/TextReader.cpp	2008-02-13 14:09:21 UTC (rev 9301)
+++ cs/benchmark/cigma/trunk/src/TextReader.cpp	2008-02-13 14:09:22 UTC (rev 9302)
@@ -14,10 +14,11 @@
 }
 
 // ---------------------------------------------------------------------------
-void cigma::TextReader::open(std::string filename)
+int cigma::TextReader::open(std::string filename)
 {
     fp = fopen(filename.c_str(), "r");
     assert(fp != NULL);
+    return 0; // XXX: change return value instead of using assert
 }
 
 void cigma::TextReader::close()

Modified: cs/benchmark/cigma/trunk/src/TextReader.h
===================================================================
--- cs/benchmark/cigma/trunk/src/TextReader.h	2008-02-13 14:09:21 UTC (rev 9301)
+++ cs/benchmark/cigma/trunk/src/TextReader.h	2008-02-13 14:09:22 UTC (rev 9302)
@@ -21,7 +21,7 @@
     ReaderType getType() { return TXT_READER; }
 
 public:
-    void open(std::string filename);
+    int open(std::string filename);
     void close();
 
 public:

Modified: cs/benchmark/cigma/trunk/src/VtkReader.cpp
===================================================================
--- cs/benchmark/cigma/trunk/src/VtkReader.cpp	2008-02-13 14:09:21 UTC (rev 9301)
+++ cs/benchmark/cigma/trunk/src/VtkReader.cpp	2008-02-13 14:09:22 UTC (rev 9302)
@@ -28,30 +28,30 @@
 
 // ---------------------------------------------------------------------------
 
-void cigma::VtkReader::open(std::string filename)
+int cigma::VtkReader::open(std::string filename)
 {
-    //int ierr;
+    int ierr;
 
     /* XXX: throw exception if file doesn't exist */
     reader = vtkUnstructuredGridReader::New();
     reader->SetFileName(filename.c_str());
 
 
-    /* detect bad vtk file
+    //* detect bad vtk file
     ierr = reader->OpenVTKFile();
     if (ierr == 0)
     {
-        reader->Delete();
+        //reader->Delete(); // XXX
         reader = 0;
-        return;
+        return -1;
     }
 
-    ierr = reader->ReaderHeader();
+    ierr = reader->ReadHeader();
     if (ierr == 0)
     {
-        reader->Delete();
+        //reader->Delete(); // XXX
         reader = 0;
-        return;
+        return -1;
     } // */
 
 
@@ -61,6 +61,7 @@
     grid = reader->GetOutput();
     //grid->PrintSelf(std::cout, 4);
 
+    return 0;
 }
 
 void cigma::VtkReader::close()

Modified: cs/benchmark/cigma/trunk/src/VtkReader.h
===================================================================
--- cs/benchmark/cigma/trunk/src/VtkReader.h	2008-02-13 14:09:21 UTC (rev 9301)
+++ cs/benchmark/cigma/trunk/src/VtkReader.h	2008-02-13 14:09:22 UTC (rev 9302)
@@ -58,7 +58,7 @@
 
 
 public:
-    void open(std::string filename);
+    int open(std::string filename);
     void close();
 
 public: