Changeset 13242


Ignore:
Timestamp:
09/04/12 14:57:50 (13 years ago)
Author:
Mathieu Morlighem
Message:

NEW: added support for writing BamgMesh and BamgGeom (to be completed)

Location:
issm/trunk-jpl/src/c
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/c/matlab/io/WriteMatlabData.cpp

    r13227 r13242  
    99#endif
    1010
     11#include <mex.h>
    1112#include "../../include/include.h"
    1213#include "../../shared/shared.h"
    1314#include "./matlabio.h"
    14 
    15 #include <mex.h>
    16 
    1715
    1816/*Primitive data types*/

  • issm/trunk-jpl/src/c/matlab/io/matlabio.h

    r13227 r13242  
    1212#endif
    1313
     14#include <mex.h>
    1415#include "../../classes/classes.h"
    1516#include "../../Container/Container.h"
    1617#include "../../include/include.h"
    17 
    18 #include <mex.h>
    1918
    2019void WriteData(mxArray** pdataref,SeqMat<double>* matrix);

  • issm/trunk-jpl/src/c/python/io/WritePythonData.cpp

    r13226 r13242  
    2020#include "../../EnumDefinitions/EnumDefinitions.h"
    2121
    22 
     22/*Primitive data types*/
    2323/*FUNCTION WriteData(PyObject* py_tuple,int index,int integer){{{*/
    2424void WriteData(PyObject* py_tuple, int index, int integer){
    … …  
    3333
    3434}/*}}}*/
    35 /*FUNCTION WriteData(PyObject* tuple,int index,SeqMat<double>* matrix){{{*/
    36 void WriteData(PyObject* tuple,int index,SeqMat<double>* matrix){
     35/*FUNCTION WriteData(PyObject* py_tuple,int index, double* matrix, int M, int N){{{*/
     36void WriteData(PyObject* tuple, int index, double* matrix, int M,int N){
     37
     38        npy_intp dims[2]={0,0};
     39        PyObject* array=NULL;
     40
     41        dims[0]=(npy_intp)M;
     42        dims[1]=(npy_intp)N;
     43        array=PyArray_SimpleNewFromData(2,dims,NPY_DOUBLE,matrix);
     44
     45        PyTuple_SetItem(tuple, index, array);
     46}/*}}}*/
     47
     48/*ISSM objects*/
     49/*FUNCTION WriteData(PyObject* py_tuple,int index,BamgGeom* bamggeom){{{*/
     50void WriteData(PyObject* py_tuple,int index,BamgGeom* bamggeom){
     51
     52        _error_("not implemented yes, see ../../matlab/io/WriteMatlabData.cpp");
     53}
     54/*}}}*/
     55/*FUNCTION WriteData(PyObject* py_tuple,int index,BamgMesh* bamgmesh){{{*/
     56void WriteData(PyObject* py_tuple,int index,BamgMesh* bamgmesh){
     57
     58        _error_("not implemented yes, see ../../matlab/io/WriteMatlabData.cpp");
     59}
     60/*}}}*/
     61/*FUNCTION WriteData(PyObject* py_tuple,int index,SeqMat<double>* matrix){{{*/
     62void WriteData(PyObject* py_tuple,int index,SeqMat<double>* matrix){
    3763       
    3864        int M,N;
    … …  
    4773        array=PyArray_SimpleNewFromData(2,dims,NPY_DOUBLE,buffer);
    4874       
    49         PyTuple_SetItem(tuple, index, array);
     75        PyTuple_SetItem(py_tuple, index, array);
    5076
    5177}/*}}}*/
    … …  
    6490       
    6591        PyTuple_SetItem(tuple, index, array);
    66 
    67 
    6892}
    6993/*}}}*/
    70 /*FUNCTION WriteData(PyObject* py_tuple,int index, double* matrix, int M, int N){{{*/
    71 void WriteData(PyObject* tuple, int index, double* matrix, int M,int N){
    72        
    73         npy_intp dims[2]={0,0};
    74         PyObject* array=NULL;
    75        
    76         dims[0]=(npy_intp)M;
    77         dims[1]=(npy_intp)N;
    78         array=PyArray_SimpleNewFromData(2,dims,NPY_DOUBLE,matrix);
    79        
    80         PyTuple_SetItem(tuple, index, array);
    81 
    82 }/*}}}*/

  • issm/trunk-jpl/src/c/python/io/pythonio.h

    r13226 r13242  
    1212#endif
    1313
    14 
    1514#include "../../classes/classes.h"
    1615#include "../../Container/Container.h"
    1716#include "../../include/include.h"
    1817
    19 class DataSet;
    20 class Parameters;
     18void WriteData(PyObject* py_tuple,int index, double* matrix, int M,int N);
     19void WriteData(PyObject* py_tuple,int index, int integer);
     20void WriteData(PyObject* py_tuple,int index, char* string);
     21void WriteData(PyObject* py_tuple,int index, SeqMat<double>* matrix);
     22void WriteData(PyObject* py_tuple,int index, SeqVec<double>* vector);
     23void WriteData(PyObject* py_tuple,int index, BamgGeom* bamggeom);
     24void WriteData(PyObject* py_tuple,int index, BamgMesh* bamgmesh);
    2125
    22 //void WriteData(PyObject* py_tuple,DataSet* dataset);
    23 //void WriteData(PyObject* py_tuple,int*    matrix, int M,int N);
    24 //void WriteData(PyObject* py_tuple,double* vector, int M);
    25 //void WriteData(PyObject* py_tuple,int integer);
    26 //void WriteData(PyObject* py_tuple,bool boolean);
    27 //void WriteData(PyObject* py_tuple,double scalar);
    28 //void WriteData(DataHandle* py_tuple,Parameters* parameters);
    29 void WriteData(PyObject* py_tuple, int index, double* matrix, int M,int N);
    30 void WriteData(PyObject* py_tuple, int index, int integer);
    31 void WriteData(PyObject* py_tuple, int index, char* string);
    32 void WriteData(PyObject* py_tuple, int index, SeqMat<double>* matrix);
    33 void WriteData(PyObject* py_tuple, int index, SeqVec<double>* vector);
    34 
    35 //void FetchData(DataSet** pdataset,PyObject* py_ref);
    36 //void FetchData(double** pmatrix,int* pnumel,int* pndims,int** psize,PyObject* py_ref);
    37 //void FetchData(int** pmatrix,int* pM,int *pN,PyObject* py_ref);
    38 //void FetchData(bool** pmatrix,int* pM,int *pN,PyObject* py_ref);
    39 //void FetchData(bool** pmatrix,int* pnumel,int* pndims,int** psize,PyObject* py_ref);
    40 //void FetchData(Matrix** pmatrix,PyObject* py_ref);
    41 //void FetchData(int** pvector,int* pM,PyObject* py_ref);
    42 //void FetchData(float** pvector,int* pM,PyObject* py_ref);
    43 //void FetchData(bool** pvector,int* pM,PyObject* py_ref);
    44 //void FetchData(Vector** pvector,PyObject* py_ref);
    45 //void FetchData(char** pmatrix,int* pnumel,int* pndims,int** psize,PyObject* py_ref);
    46 //void FetchData(Parameters** pparameters, DataHandle py_ref);
    4726void FetchData(double** pvector,int* pM,PyObject* py_ref);
    4827void FetchData(double** pmatrix,int* pM,int *pN,PyObject* py_array);
Note: See TracChangeset for help on using the changeset viewer.