Changeset 8906 for issm/trunk


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

WriteDataToDisk not needed anymore.
Took out many prototypes of serial i/o routines that are not needed anymore.

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

Legend:

Unmodified
Added
Removed

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

    r8901 r8906  
    404404                                        ./io/FetchData.cpp\
    405405                                        ./io/WriteData.cpp\
    406                                         ./io/WriteDataToDisk.cpp\
    407406                                        ./io/IoModelFetchData.cpp\
    408407                                        ./io/WriteParams.cpp\
    … …  
    10781077                                        ./io/FetchData.cpp\
    10791078                                        ./io/WriteData.cpp\
    1080                                         ./io/WriteDataToDisk.cpp\
    10811079                                        ./io/IoModelFetchData.cpp\
    10821080                                        ./io/WriteParams.cpp\

  • issm/trunk/src/c/io/IoModelFetchData.cpp

    r8330 r8906  
    124124}
    125125/*}}}*/
    126 
    127 #ifdef _SERIAL_
    128 /***************** **************** **************** **************** **************** **************** **************** **************** **************** ****************
    129                                                                                                           Serial IoModelFetch Data Routines, all overloaded.
    130 **************** **************** **************** **************** **************** **************** **************** **************** **************** *****************/
    131 /*FUNCTION IoModelFetchData(DataSet** pdataset,ConstDataHandle model_handle,char* data_name){{{1*/
    132 void IoModelFetchData(DataSet** pdataset,ConstDataHandle model_handle,char* data_name){
    133 
    134         FetchData(pdataset,mxGetAssignedField(model_handle,0,data_name));
    135 
    136 }
    137 /*}}}*/
    138 /*FUNCTION IoModelFetchData(double** pmatrix,int* pM,int *pN,ConstDataHandle model_handle,char* data_name){{{1*/
    139 void IoModelFetchData(double** pmatrix,int* pM,int *pN,ConstDataHandle model_handle,char* data_name){
    140        
    141         FetchData(pmatrix,pM,pN,mxGetAssignedField(model_handle,0,data_name));
    142 
    143 }
    144 /*}}}*/
    145 /*FUNCTION IoModelFetchData(Mat* pmatrix,ConstDataHandle model_handle,char* data_name){{{1*/
    146 void IoModelFetchData(Mat* pmatrix,ConstDataHandle model_handle,char* data_name){
    147        
    148         FetchData(pmatrix,mxGetAssignedField(model_handle,0,data_name));
    149 
    150 }
    151 /*}}}*/
    152 /*FUNCTION IoModelFetchData(double** pvector,int* pM,ConstDataHandle model_handle,char* data_name){{{1*/
    153 void IoModelFetchData(double** pvector,int* pM,ConstDataHandle model_handle,char* data_name){
    154        
    155         FetchData(pvector,pM,mxGetAssignedField(model_handle,0,data_name));
    156 
    157 }
    158 /*}}}*/
    159 /*FUNCTION IoModelFetchData(Vec* pvector,ConstDataHandle model_handle,char* data_name){{{1*/
    160 void IoModelFetchData(Vec* pvector,ConstDataHandle model_handle,char* data_name){
    161        
    162         FetchData(pvector,mxGetAssignedField(model_handle,0,data_name));
    163 
    164 }
    165 /*}}}*/
    166 /*FUNCTION IoModelFetchData(char** pstring,ConstDataHandle model_handle,char* data_name){{{1*/
    167 void IoModelFetchData(char** pstring,ConstDataHandle model_handle,char* data_name){
    168        
    169         FetchData(pstring,mxGetAssignedField(model_handle,0,data_name));
    170 
    171 }
    172 /*}}}*/
    173 /*FUNCTION IoModelFetchData(double* pscalar,ConstDataHandle model_handle,char* data_name){{{1*/
    174 void IoModelFetchData(double* pscalar,ConstDataHandle model_handle,char* data_name){
    175        
    176         FetchData(pscalar,mxGetAssignedField(model_handle,0,data_name));
    177 
    178 }
    179 /*}}}*/
    180 /*FUNCTION IoModelFetchData(int* pinteger,ConstDataHandle model_handle,char* data_name){{{1*/
    181 void IoModelFetchData(int* pinteger,ConstDataHandle model_handle,char* data_name){
    182 
    183         FetchData(pinteger,mxGetAssignedField(model_handle,0,data_name));
    184 }
    185 /*}}}*/
    186 #endif

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

    r8901 r8906  
    1616void  pfclose(FILE* fid,char* filename);
    1717
     18void  FetchData(double** pmatrix, int* pM,int* pN,FILE* fid);
     19void  FetchData(char** pstring,FILE* fid);
     20void  FetchData(double* pscalar,FILE* fid);
     21void  FetchData(int* pinteger,FILE* fid);
    1822
    19 void FetchData(double** pmatrix, int* pM,int* pN,FILE* fid);
    20 void FetchData(char** pstring,FILE* fid);
    21 void FetchData(double* pscalar,FILE* fid);
    22 void FetchData(int* pinteger,FILE* fid);
    2323void  IoModelFetchData(double** pmatrix,int* pM,int* pN,FILE* model_handle,char* data_name);
    2424void  IoModelFetchData(char** pstring,FILE* model_handle,char* data_name);
    … …  
    2727FILE* SetFilePointerToData(FILE* model_handle,char* data_name);
    2828
    29 
    3029#ifdef _SERIAL_
    31 
    3230void WriteData(mxArray** pdataref,DataSet* dataset);
    3331void WriteData(mxArray** pdataref,Mat matrix);
    … …  
    3937void WriteData(mxArray** pdataref,double scalar);
    4038void WriteData(mxArray** pdataref,char* string);
    41 
    4239void WriteNodeSets(DataHandle* pdataref,NodeSets* nodesets);
    4340void WriteParams(DataHandle* pdataref,Parameters* parameters);
    … …  
    6057void FetchData(int* pinteger,const mxArray* dataref);
    6158void FetchData(bool* pbool,const mxArray* dataref);
    62 
    63 void IoModelFetchData(DataSet** pdataset,ConstDataHandle model_handle,char* data_name);
    64 void IoModelFetchData(double** pmatrix,int* pM,int *pN,ConstDataHandle model_handle,char* data_name);
    65 void IoModelFetchData(Mat* pmatrix,ConstDataHandle model_handle,char* data_name);
    66 void IoModelFetchData(double** pvector,int* pM,ConstDataHandle model_handle,char* data_name);
    67 void IoModelFetchData(Vec* pvector,ConstDataHandle model_handle,char* data_name);
    68 void IoModelFetchData(char** pstring,ConstDataHandle model_handle,char* data_name);
    69 void IoModelFetchData(double* pscalar,ConstDataHandle model_handle,char* data_name);
    70 void IoModelFetchData(int* pinteger,ConstDataHandle model_handle,char* data_name);
    71 
    7259void FetchNodeSets(NodeSets** pnodesets,ConstDataHandle dataref);
    7360void FetchParams(Parameters** pparameters, DataHandle dataref);
    … …  
    7966OptionStruct*   OptionStructParse( char* name, const mxArray* prhs[]);
    8067OptionCell*     OptionCellParse( char* name, const mxArray* prhs[]);
    81 
    8268#endif
    83 
    84 #ifdef _PARALLEL_
    85 void WriteData(int* pdummy,void* data,char* data_type);
    86 void WriteDataToDisk(void* data,int* pM,int* pN,char* datatype,FILE* fid);
    87 #endif
    88 
    89 
    90 
    9169#endif  /* _IO_H_ */
Note: See TracChangeset for help on using the changeset viewer.