Changeset 1881 for issm/trunk/src/c/io/io.h

Timestamp:

08/25/09 13:04:05 (16 years ago)

Author:

Eric.Larour

Message:

Model and FemModel are now classes in their own right.
This changes the cores quite a bit.

File:

• issm/trunk/src/c/io/io.h (modified) (2 diffs)

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

@@ -8 +8 @@
 #include "../objects/NodeSets.h"
 #include "../DataSet/DataSet.h"
+#include "../include/types.h"
 
-/*Define abstract type for I/O: */
-#ifdef _SERIAL_
-#include <mex.h>
-typedef const mxArray* ConstDataHandle;  //serially, we are reading data from a matlab array.
-typedef mxArray* DataHandle;  
-#else 
-typedef FILE* ConstDataHandle; //in parallel, we are reading data from a file.
-typedef FILE* DataHandle; 
-#endif
-
+class DataSet;
 
 void FetchData(void** pdata,int* pM,int* pN,ConstDataHandle data_handle,char* data_type,char* sub_data_type);
@@ -45 +37 @@
 /*File I/O: */
 FILE* pfopen(char* filename,char* format);
-void* pfclose(FILE* fid,char* filename);
+void  pfclose(FILE* fid,char* filename);
 
 #endif  /* _IMDB_H */