Changeset 8901


Ignore:
Timestamp:
07/11/11 15:43:34 (14 years ago)
Author:
Eric.Larour
Message:

New matlab toolkit.
Moved MatlabNArrayToNArray there.

Location:
issm/trunk/src/c
Files:
3 added
3 deleted
3 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk/src/c/Makefile.am

    r8803 r8901  
    398398                                        ./toolkits/metis/metisincludes.h\
    399399                                        ./toolkits/triangle/triangleincludes.h\
     400                                        ./toolkits/matlab/matlabincludes.h\
     401                                        ./toolkits/matlab/MatlabNArrayToNArray.cpp\
    400402                                        ./toolkits.h\
    401403                                        ./io/io.h\
    … …  
    407409                                        ./io/FetchParams.cpp\
    408410                                        ./io/OptionParse.cpp\
    409                                         ./io/MatlabNArrayToNArray.cpp\
    410411                                        ./io/pfopen.cpp\
    411412                                        ./io/pfclose.cpp\

  • issm/trunk/src/c/io/io.h

    r8330 r8901  
    8080OptionCell*     OptionCellParse( char* name, const mxArray* prhs[]);
    8181
    82 int MatlabNArrayToNArray(double** pmatrix,int* pmatrix_numel,int* pmatrix_ndims,int** pmatrix_size,const mxArray* mxmatrix);
    83 int MatlabNArrayToNArray(bool** pmatrix,int* pmatrix_numel,int* pmatrix_ndims,int** pmatrix_size,const mxArray* mxmatrix);
    84 int MatlabNArrayToNArray(char** pmatrix,int* pmatrix_numel,int* pmatrix_ndims,int** pmatrix_size,const mxArray* mxmatrix);
    85 
    8682#endif
    8783
    8884#ifdef _PARALLEL_
    89 
    90 
    9185void WriteData(int* pdummy,void* data,char* data_type);
    9286void WriteDataToDisk(void* data,int* pM,int* pN,char* datatype,FILE* fid);
    93 
    94 
    9587#endif
    9688

  • issm/trunk/src/c/toolkits/toolkits.h

    r8285 r8901  
    1010#include "./metis/metisincludes.h"
    1111#include "./triangle/triangleincludes.h"
     12#include "./matlab/matlabincludes.h"
    1213
    1314#endif
Note: See TracChangeset for help on using the changeset viewer.