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

[luis at geodynamics.org]

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

Modified:
   cs/cigma/trunk/src/io_null_reader.cpp
   cs/cigma/trunk/src/io_null_reader.h
Log:
Conforming NullReader to the FileReader interface

Modified: cs/cigma/trunk/src/io_null_reader.cpp
===================================================================
--- cs/cigma/trunk/src/io_null_reader.cpp	2008-12-17 10:33:24 UTC (rev 13761)
+++ cs/cigma/trunk/src/io_null_reader.cpp	2008-12-17 10:33:26 UTC (rev 13762)
@@ -1,4 +1,5 @@
 #include "io_null_reader.h"
+using namespace boost;
 using namespace cigma;
 
 // ----------------------------------------------------------------------------
@@ -6,11 +7,81 @@
 NullReader::NullReader() {}
 NullReader::~NullReader() {}
 
-int NullReader::open(const char *filename, const char *mode) { return -1; }
-int NullReader::close() { return -1; }
+int NullReader::open(const char *filename, const char *mode)
+{
+    return -1;
+}
 
-int NullReader::getDataset(const char *loc, double **data, int *num, int *dim)             { return -1; }
-int NullReader::getCoordinates(const char *loc, double **coordinates, int *nno, int *nsd)  { return -1; }
-int NullReader::getConnectivity(const char *loc, int **connectivity, int *nel, int *ndofs) { return -1; }
+int NullReader::close()
+{
+    return -1;
+}
 
+int NullReader::getDataset(const char *loc, double **data, int *num, int *dim)
+{
+    return -1;
+}
+
+int NullReader::getCoordinates(const char *loc, double **coordinates, int *nno, int *nsd)
+{
+    return -1;
+}
+
+int NullReader::getConnectivity(const char *loc, int **connectivity, int *nel, int *ndofs)
+{
+    return -1;
+}
+
+void NullReader::getIntArray(const char *loc, cigma::array<int>& A)
+{
+}
+
+void NullReader::getLongArray(const char *loc, cigma::array<long>& A)
+{
+}
+
+void NullReader::getFloatArray(const char *loc, cigma::array<float>& A)
+{
+}
+
+void NullReader::getDoubleArray(const char *loc, cigma::array<double>& A)
+{
+}
+
+shared_ptr<NodeCoordinates> NullReader::getNodeCoordinates(const char *loc)
+{
+    shared_ptr<NodeCoordinates> nc;
+    return nc;
+}
+
+shared_ptr<ElementBlock> NullReader::getElementBlock(const char *loc)
+{
+    shared_ptr<ElementBlock> eb;
+    return eb;
+}
+
+shared_ptr<MeshPart> NullReader::getMeshPart(const char *loc)
+{
+    shared_ptr<MeshPart> mesh;
+    return mesh;
+}
+
+shared_ptr<Quadrature> NullReader::getQuadrature(const char *loc)
+{
+    shared_ptr<Quadrature> Q;
+    return Q;
+}
+
+shared_ptr<FE> NullReader::getFE(const char *loc)
+{
+    shared_ptr<FE> fe;
+    return fe;
+}
+
+shared_ptr<DofHandler> NullReader::getDofHandler(const char *loc)
+{
+    shared_ptr<DofHandler> dofs;
+    return dofs;
+}
+
 // ----------------------------------------------------------------------------

Modified: cs/cigma/trunk/src/io_null_reader.h
===================================================================
--- cs/cigma/trunk/src/io_null_reader.h	2008-12-17 10:33:24 UTC (rev 13761)
+++ cs/cigma/trunk/src/io_null_reader.h	2008-12-17 10:33:26 UTC (rev 13762)
@@ -23,6 +23,18 @@
     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);
 };
 
 #endif