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

[luis at geodynamics.org]

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

Modified:
   cs/cigma/trunk/src/io_file_reader.h
Log:
Added more virtual methods to FileReader class

Modified: cs/cigma/trunk/src/io_file_reader.h
===================================================================
--- cs/cigma/trunk/src/io_file_reader.h	2008-12-17 10:33:17 UTC (rev 13757)
+++ cs/cigma/trunk/src/io_file_reader.h	2008-12-17 10:33:19 UTC (rev 13758)
@@ -7,8 +7,15 @@
 
 #include "Common.h"
 #include "Filesystem.h"
+#include "core_array.h"
+#include "NodeCoordinates.h"
+#include "ElementBlock.h"
+#include "MeshPart.h"
+#include "Quadrature.h"
+#include "DofHandler.h"
+#include "Cell.h"
+#include "FE.h"
 
-
 namespace cigma
 {
     class FileReader;
@@ -28,16 +35,25 @@
     virtual int close() = 0;
 
     virtual int getDataset(const char *loc, double **data, int *num, int *dim) = 0;
-    //virtual int getDataset(const char *loc, float **data, int *num, int *dim) = 0;
-    //virtual int getDataset(const char *loc, int **data, int *num, int *dim) = 0;
-
     virtual int getCoordinates(const char *loc, double **coordinates, int *nno, int *nsd) = 0;
     virtual int getConnectivity(const char *loc, int **connectivity, int *nel, int *ndofs) = 0;
-    //virtual int getDofs(const char *loc, double **dofs, int *nno, int *ndofs) = 0;
 
+    virtual void getIntArray(const char *loc, cigma::array<int>& A) = 0;
+    virtual void getLongArray(const char *loc, cigma::array<long>& A) = 0;
+    virtual void getFloatArray(const char *loc, cigma::array<float>& A) = 0;
+    virtual void getDoubleArray(const char *loc, cigma::array<double>& A) = 0;
+
+    virtual boost::shared_ptr<NodeCoordinates> getNodeCoordinates(const char *loc) = 0;
+    virtual boost::shared_ptr<ElementBlock> getElementBlock(const char *loc) = 0;
+    virtual boost::shared_ptr<MeshPart> getMeshPart(const char *loc) = 0;
+    virtual boost::shared_ptr<Quadrature> getQuadrature(const char *loc) = 0;
+    virtual boost::shared_ptr<FE> getFE(const char *loc) = 0;
+    virtual boost::shared_ptr<DofHandler> getDofHandler(const char *loc) = 0;
+
     static boost::shared_ptr<FileReader> New(std::string filename, std::string mode);
 
 public:
+
     typedef enum {
         NULL_FILE_READER,
         HDF5_FILE_READER,