Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/matlab/io/WriteMatlabData.cpp
===================================================================
--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/matlab/io/WriteMatlabData.cpp	(revision 13241)
+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/matlab/io/WriteMatlabData.cpp	(revision 13242)
@@ -8,13 +8,11 @@
 #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
 #endif
 
+#include <mex.h>
 #include "../../include/include.h"
 #include "../../shared/shared.h"
 #include "./matlabio.h"
 
-#include <mex.h>
-
-
 /*Primitive data types*/
 /*FUNCTION WriteData(mxArray** pdataref,double* matrix, int M,int N){{{*/
 void WriteData(mxArray** pdataref,double* matrix, int M,int N){
Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/matlab/io/matlabio.h
===================================================================
--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/matlab/io/matlabio.h	(revision 13241)
+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/matlab/io/matlabio.h	(revision 13242)
@@ -11,12 +11,11 @@
 #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
 #endif 
 
+#include <mex.h>
 #include "../../classes/classes.h"
 #include "../../Container/Container.h"
 #include "../../include/include.h"
 
-#include <mex.h>
-
 void WriteData(mxArray** pdataref,SeqMat<double>* matrix);
 void WriteData(mxArray** pdataref,double* matrix, int M,int N);
 void WriteData(mxArray** pdataref,int*    matrix, int M,int N);
Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/python/io/pythonio.h
===================================================================
--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/python/io/pythonio.h	(revision 13241)
+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/python/io/pythonio.h	(revision 13242)
@@ -11,39 +11,18 @@
 #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
 #endif 
 
-
 #include "../../classes/classes.h"
 #include "../../Container/Container.h"
 #include "../../include/include.h"
 
-class DataSet;
-class Parameters;
+void WriteData(PyObject* py_tuple,int index, double* matrix, int M,int N);
+void WriteData(PyObject* py_tuple,int index, int integer);
+void WriteData(PyObject* py_tuple,int index, char* string);
+void WriteData(PyObject* py_tuple,int index, SeqMat<double>* matrix);
+void WriteData(PyObject* py_tuple,int index, SeqVec<double>* vector);
+void WriteData(PyObject* py_tuple,int index, BamgGeom* bamggeom);
+void WriteData(PyObject* py_tuple,int index, BamgMesh* bamgmesh);
 
-//void WriteData(PyObject* py_tuple,DataSet* dataset);
-//void WriteData(PyObject* py_tuple,int*    matrix, int M,int N);
-//void WriteData(PyObject* py_tuple,double* vector, int M);
-//void WriteData(PyObject* py_tuple,int integer);
-//void WriteData(PyObject* py_tuple,bool boolean);
-//void WriteData(PyObject* py_tuple,double scalar);
-//void WriteData(DataHandle* py_tuple,Parameters* parameters);
-void WriteData(PyObject* py_tuple, int index, double* matrix, int M,int N);
-void WriteData(PyObject* py_tuple, int index, int integer);
-void WriteData(PyObject* py_tuple, int index, char* string);
-void WriteData(PyObject* py_tuple, int index, SeqMat<double>* matrix);
-void WriteData(PyObject* py_tuple, int index, SeqVec<double>* vector);
-
-//void FetchData(DataSet** pdataset,PyObject* py_ref);
-//void FetchData(double** pmatrix,int* pnumel,int* pndims,int** psize,PyObject* py_ref);
-//void FetchData(int** pmatrix,int* pM,int *pN,PyObject* py_ref);
-//void FetchData(bool** pmatrix,int* pM,int *pN,PyObject* py_ref);
-//void FetchData(bool** pmatrix,int* pnumel,int* pndims,int** psize,PyObject* py_ref);
-//void FetchData(Matrix** pmatrix,PyObject* py_ref);
-//void FetchData(int** pvector,int* pM,PyObject* py_ref);
-//void FetchData(float** pvector,int* pM,PyObject* py_ref);
-//void FetchData(bool** pvector,int* pM,PyObject* py_ref);
-//void FetchData(Vector** pvector,PyObject* py_ref);
-//void FetchData(char** pmatrix,int* pnumel,int* pndims,int** psize,PyObject* py_ref);
-//void FetchData(Parameters** pparameters, DataHandle py_ref);
 void FetchData(double** pvector,int* pM,PyObject* py_ref);
 void FetchData(double** pmatrix,int* pM,int *pN,PyObject* py_array);
 void FetchData(int** pmatrix,int* pM,int *pN,PyObject* py_matrix);
Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/python/io/WritePythonData.cpp
===================================================================
--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/python/io/WritePythonData.cpp	(revision 13241)
+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/python/io/WritePythonData.cpp	(revision 13242)
@@ -19,7 +19,7 @@
 #include "../../io/io.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"
 
-
+/*Primitive data types*/
 /*FUNCTION WriteData(PyObject* py_tuple,int index,int integer){{{*/
 void WriteData(PyObject* py_tuple, int index, int integer){
 	
@@ -32,8 +32,34 @@
 	PyTuple_SetItem(py_tuple, index, PyUnicode_FromString(string));
 
 }/*}}}*/
-/*FUNCTION WriteData(PyObject* tuple,int index,SeqMat<double>* matrix){{{*/
-void WriteData(PyObject* tuple,int index,SeqMat<double>* matrix){
+/*FUNCTION WriteData(PyObject* py_tuple,int index, double* matrix, int M, int N){{{*/
+void WriteData(PyObject* tuple, int index, double* matrix, int M,int N){
+
+	npy_intp dims[2]={0,0};
+	PyObject* array=NULL;
+
+	dims[0]=(npy_intp)M;
+	dims[1]=(npy_intp)N;
+	array=PyArray_SimpleNewFromData(2,dims,NPY_DOUBLE,matrix);
+
+	PyTuple_SetItem(tuple, index, array);
+}/*}}}*/
+
+/*ISSM objects*/
+/*FUNCTION WriteData(PyObject* py_tuple,int index,BamgGeom* bamggeom){{{*/
+void WriteData(PyObject* py_tuple,int index,BamgGeom* bamggeom){
+
+	_error_("not implemented yes, see ../../matlab/io/WriteMatlabData.cpp");
+}
+/*}}}*/
+/*FUNCTION WriteData(PyObject* py_tuple,int index,BamgMesh* bamgmesh){{{*/
+void WriteData(PyObject* py_tuple,int index,BamgMesh* bamgmesh){
+
+	_error_("not implemented yes, see ../../matlab/io/WriteMatlabData.cpp");
+}
+/*}}}*/
+/*FUNCTION WriteData(PyObject* py_tuple,int index,SeqMat<double>* matrix){{{*/
+void WriteData(PyObject* py_tuple,int index,SeqMat<double>* matrix){
 	
 	int M,N;
 	double* buffer=NULL;
@@ -46,7 +72,7 @@
 	dims[1]=(npy_intp)N;
 	array=PyArray_SimpleNewFromData(2,dims,NPY_DOUBLE,buffer);
 	
-	PyTuple_SetItem(tuple, index, array);
+	PyTuple_SetItem(py_tuple, index, array);
 
 }/*}}}*/
 /*FUNCTION WriteData(PyObject* py_tuple,int index,SeqVec<double>* vector){{{*/
@@ -63,20 +89,5 @@
 	array=PyArray_SimpleNewFromData(1,&dim,NPY_DOUBLE,buffer);
 	
 	PyTuple_SetItem(tuple, index, array);
-
-
 }
 /*}}}*/
-/*FUNCTION WriteData(PyObject* py_tuple,int index, double* matrix, int M, int N){{{*/
-void WriteData(PyObject* tuple, int index, double* matrix, int M,int N){
-	
-	npy_intp dims[2]={0,0};
-	PyObject* array=NULL;
-	
-	dims[0]=(npy_intp)M;
-	dims[1]=(npy_intp)N;
-	array=PyArray_SimpleNewFromData(2,dims,NPY_DOUBLE,matrix);
-	
-	PyTuple_SetItem(tuple, index, array);
-
-}/*}}}*/