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

[luis at geodynamics.org]

Author: luis
Date: 2008-04-08 17:35:18 -0700 (Tue, 08 Apr 2008)
New Revision: 11770

Modified:
   cs/benchmark/cigma/trunk/src/VtkReader.cpp
   cs/benchmark/cigma/trunk/src/VtkReader.h
Log:
Reminder to implement reader functions for vtk rectilinear grids


Modified: cs/benchmark/cigma/trunk/src/VtkReader.cpp
===================================================================
--- cs/benchmark/cigma/trunk/src/VtkReader.cpp	2008-04-09 00:35:15 UTC (rev 11769)
+++ cs/benchmark/cigma/trunk/src/VtkReader.cpp	2008-04-09 00:35:18 UTC (rev 11770)
@@ -24,10 +24,12 @@
     sgrid = 0;
 
     vtk_reader = 0;
+    vtu_reader = 0;
     vts_reader = 0;
-    vtu_reader = 0;
+    vtr_reader = 0;
+    pvtu_reader = 0;
     pvts_reader = 0;
-    pvtu_reader = 0;
+    pvtr_reader = 0;
 }
 
 VtkReader::~VtkReader()
@@ -76,6 +78,16 @@
             return -1;
         }
     }
+    else if (ext == ".vtu")
+    {
+        vtu_reader = vtkXMLUnstructuredGridReader::New();
+        vtu_reader->SetFileName(filename);
+        vtu_reader->Update();
+
+        dataset = vtu_reader->GetOutputAsDataSet();
+        pointset = vtkPointSet::SafeDownCast(dataset);
+        ugrid = vtkUnstructuredGrid::SafeDownCast(dataset);
+    }
     else if (ext == ".vts")
     {
         vts_reader = vtkXMLStructuredGridReader::New();
@@ -85,21 +97,18 @@
         dataset = vts_reader->GetOutputAsDataSet();
         sgrid = vtkStructuredGrid::SafeDownCast(dataset);
     }
-    else if (ext == ".vtu")
+    else if (ext == ".vtr")
     {
-        vtu_reader = vtkXMLUnstructuredGridReader::New();
-        vtu_reader->SetFileName(filename);
-        vtu_reader->Update();
+        vtr_reader = vtkXMLRectilinearGridReader::New();
+        vtr_reader->SetFileName(filename);
+        vtr_reader->Update();
 
-        dataset = vtu_reader->GetOutputAsDataSet();
-        pointset = vtkPointSet::SafeDownCast(dataset);
-        ugrid = vtkUnstructuredGrid::SafeDownCast(dataset);
+        //dataset = vtr_reader->GetOutputAsDataset();
+        //rgrid = vtkRectilinearGrid::SafeDownCast(dataset);
     }
     else
     {
-        cerr << "Unsupported VTK file type. "
-             << "Use only .vtk, .vts, or .vtu formats."
-             << endl;
+        cerr << "Unsupported VTK file type (" << ext << ")" << endl;
         return -1;
     }
 
@@ -114,16 +123,22 @@
         this->vtk_reader = 0;
     }
     
+    if (this->vtu_reader)
+    {
+        this->vtu_reader->Delete();
+        this->vtu_reader = 0;
+    }
+
     if (this->vts_reader)
     {
         this->vts_reader->Delete();
         this->vts_reader = 0;
     }
 
-    if (this->vtu_reader)
+    if (this->vtr_reader)
     {
-        this->vtu_reader->Delete();
-        this->vtu_reader = 0;
+        this->vtr_reader->Delete();
+        this->vtr_reader = 0;
     }
 
     return 0;

Modified: cs/benchmark/cigma/trunk/src/VtkReader.h
===================================================================
--- cs/benchmark/cigma/trunk/src/VtkReader.h	2008-04-09 00:35:15 UTC (rev 11769)
+++ cs/benchmark/cigma/trunk/src/VtkReader.h	2008-04-09 00:35:18 UTC (rev 11770)
@@ -4,15 +4,18 @@
 #include "Reader.h"
 
 #include "vtkDataSetReader.h"
+#include "vtkXMLUnstructuredGridReader.h"
 #include "vtkXMLStructuredGridReader.h"
-#include "vtkXMLUnstructuredGridReader.h"
+#include "vtkXMLRectilinearGridReader.h"
+#include "vtkXMLPUnstructuredGridReader.h"
 #include "vtkXMLPStructuredGridReader.h"
-#include "vtkXMLPUnstructuredGridReader.h"
+#include "vtkXMLPRectilinearGridReader.h"
 
 #include "vtkDataSet.h"
 #include "vtkPointSet.h"
+#include "vtkUnstructuredGrid.h"
 #include "vtkStructuredGrid.h"
-#include "vtkUnstructuredGrid.h"
+#include "vtkRectilinearGrid.h"
 
 
 
@@ -45,14 +48,16 @@
     vtkPointSet *pointset;
     vtkUnstructuredGrid *ugrid;
     vtkStructuredGrid *sgrid;
+    vtkRectilinearGrid *rgrid;
 
 public:
     vtkDataSetReader *vtk_reader;
+    vtkXMLUnstructuredGridReader *vtu_reader;
     vtkXMLStructuredGridReader *vts_reader;
-    vtkXMLUnstructuredGridReader *vtu_reader;
+    vtkXMLRectilinearGridReader *vtr_reader;
+    vtkXMLPUnstructuredGridReader *pvtu_reader;
     vtkXMLPStructuredGridReader *pvts_reader;
-    vtkXMLPUnstructuredGridReader *pvtu_reader;
-
+    vtkXMLPRectilinearGridReader *pvtr_reader;
 };