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

[luis at geodynamics.org]

Author: luis
Date: 2008-12-17 02:33:44 -0800 (Wed, 17 Dec 2008)
New Revision: 13771

Modified:
   cs/cigma/trunk/src/io_exo_reader.cpp
   cs/cigma/trunk/src/io_exo_reader.h
   cs/cigma/trunk/src/io_text_reader.cpp
   cs/cigma/trunk/src/io_vtk_reader.h
Log:
Skeleton for ExodusII file reader

Modified: cs/cigma/trunk/src/io_exo_reader.cpp
===================================================================
--- cs/cigma/trunk/src/io_exo_reader.cpp	2008-12-17 10:33:41 UTC (rev 13770)
+++ cs/cigma/trunk/src/io_exo_reader.cpp	2008-12-17 10:33:44 UTC (rev 13771)
@@ -1,4 +1,125 @@
 #include "ExodusII_Reader.h"
+
+
 using namespace cigma;
-// ----------------------------------------------------------------------------
-// ----------------------------------------------------------------------------
+
+ExodusII_Reader::ExodusII_Reader()
+{
+}
+
+
+ExodusII_Reader::~ExodusII_Reader()
+{
+}
+
+
+int ExodusII_Reader::open(const char *filename, const char *mode)
+{
+    TRI_LOG_STR("ExodusII_Reader::open()");
+    TRI_LOG(filename);
+    TRI_LOG(mode);
+
+    this->filename = filename;
+
+    FooBar reader
+    if (reader)
+    {
+        this->filename = filename;
+        this->reader->Update();
+        this->dataset = reader->GetOutput();
+    }
+}
+
+
+int ExodusII_Reader::close()
+{
+}
+
+
+int ExodusII_Reader::getDataset(const char *loc, double **data, int *num, int *dim)
+{
+    TRI_LOG_STR("ExodusII_Reader::getDataset()");
+}
+
+
+int ExodusII_Reader::getCoordinates(const char *loc, double **coordinates, int *nno, int *nsd)
+{
+    TRI_LOG_STR("ExodusII_Reader::getCoordinates()");
+}
+
+
+int ExodusII_Reader::getConnectivity(const char *loc, int **connectivity, int *nel, int *ndofs)
+{
+    TRI_LOG_STR("ExodusII_Reader::getConnectivity()");
+}
+
+
+
+void ExodusII_Reader::getIntArray(const char *loc, cigma::array<int>& A)
+{
+    TRI_LOG_STR("ExodusII_Reader::getIntArray()");
+}
+
+
+void ExodusII_Reader::getLongArray(const char *loc, cigma::array<long>& A)
+{
+    TRI_LOG_STR("ExodusII_Reader::getIntArray()");
+}
+
+
+void ExodusII_Reader::getFloatArray(const char *loc, cigma::array<float>& A)
+{
+    TRI_LOG_STR("ExodusII_Reader::getIntArray()");
+}
+
+
+void ExodusII_Reader::getDoubleArray(const char *loc, cigma::array<double>& A)
+{
+    TRI_LOG_STR("ExodusII_Reader::getIntArray()");
+}
+
+
+
+shared_ptr<NodeCoordinates> ExodusII_Reader::getNodeCoordinates(const char *loc)
+{
+    shared_ptr<nc_array> nc;
+    return nc;
+}
+
+
+shared_ptr<ElementBlock> ExodusII_Reader::getElementBlock(const char *loc)
+{
+    shared_ptr<eb_array> eb;
+    return eb;
+}
+
+
+shared_ptr<MeshPart> ExodusII_Reader::getMeshPart(const char *loc)
+{
+    shared_ptr<MeshPart> mesh;
+    return mesh;
+}
+
+
+shared_ptr<Quadrature> ExodusII_Reader::getQuadrature(const char *loc)
+{
+    shared_ptr<Quadrature> Q;
+    return Q;
+}
+
+
+shared_ptr<FE> ExodusII_Reader::getFE(const char *loc)
+{
+    shared_ptr<FE> fe;
+    return fe;
+}
+
+
+shared_ptr<DofHandler> ExodusII_Reader::getDofHandler(const char *loc)
+{
+    shared_ptr<DofHandler> dh;
+    return dh;
+}
+
+
+

Modified: cs/cigma/trunk/src/io_exo_reader.h
===================================================================
--- cs/cigma/trunk/src/io_exo_reader.h	2008-12-17 10:33:41 UTC (rev 13770)
+++ cs/cigma/trunk/src/io_exo_reader.h	2008-12-17 10:33:44 UTC (rev 13771)
@@ -1,15 +1,64 @@
 #ifndef __CIGMA_EXODUSII_READER_H__
 #define __CIGMA_EXODUSII_READER_H__
 
+#include "io_file_reader.h"
+
 namespace cigma
 {
     class ExodusII_Reader;
 }
 
+
+#ifdef HAVE_VTK
+
+#include "vtkExodusIIReader.h"
+
+
 class cigma::ExodusII_Reader : public cigma::FileReader
 {
 public:
     ExodusII_Reader();
     ~ExodusII_Reader();
+
+    ReaderType getReaderType() { return EXO_FILE_READER; }
+
+    int open(const char *filename, const char *mode);
+    int close();
+
+    int getDataset(const char *loc, double **data, int *num, int *dim);
+    int getCoordinates(const char *loc, double **coordinates, int *nno, int *nsd);
+    int getConnectivity(const char *loc, int **connectivity, int *nel, int *ndofs);
+
+    void getIntArray(const char *loc, cigma::array<int>& A);
+    void getLongArray(const char *loc, cigma::array<long>& A);
+    void getFloatArray(const char *loc, cigma::array<float>& A);
+    void getDoubleArray(const char *loc, cigma::array<double>& A);
+
+    boost::shared_ptr<NodeCoordinates> getNodeCoordinates(const char *loc);
+    boost::shared_ptr<ElementBlock> getElementBlock(const char *loc);
+    boost::shared_ptr<MeshPart> getMeshPart(const char *loc);
+    boost::shared_ptr<Quadrature> getQuadrature(const char *loc);
+    boost::shared_ptr<FE> getFE(const char *loc);
+    boost::shared_ptr<DofHandler> getDofHandler(const char *loc);
+
+public:
+    std::string filename;
+
 };
-#endif
+
+
+#else
+
+/* If HAVE_VTK is not defined, we subclass NullReader */
+#include "io_null_reader.h"
+class cigma::ExodusII_Reader : public cigma::NullReader
+{
+public:
+    ExodusII_Reader();
+    ExodusII_Reader();
+    ReaderType getReaderType() { return EXO_FILE_READER; }
+};
+
+#endif /* HAVE_VTK */
+
+#endif /* __CIGMA_EXODUSII_READER_H__ */

Modified: cs/cigma/trunk/src/io_text_reader.cpp
===================================================================
--- cs/cigma/trunk/src/io_text_reader.cpp	2008-12-17 10:33:41 UTC (rev 13770)
+++ cs/cigma/trunk/src/io_text_reader.cpp	2008-12-17 10:33:44 UTC (rev 13771)
@@ -49,6 +49,7 @@
 
 int TextReader::close()
 {
+    TRI_LOG_STR("TextReader::close()");
     if (fp != NULL)
     {
         fclose(fp);

Modified: cs/cigma/trunk/src/io_vtk_reader.h
===================================================================
--- cs/cigma/trunk/src/io_vtk_reader.h	2008-12-17 10:33:41 UTC (rev 13770)
+++ cs/cigma/trunk/src/io_vtk_reader.h	2008-12-17 10:33:44 UTC (rev 13771)
@@ -77,6 +77,7 @@
 #include "io_null_reader.h"
 class cigma::VtkReader : public cigma::NullReader
 {
+public:
     VtkReader();
     ~VtkReader();
     ReaderType getReaderType() { return VTK_FILE_READER; }