Changeset 8913

Timestamp:

07/11/11 17:01:58 (14 years ago)

Author:

Eric.Larour

Message:

FetchData not needed anymore, folded into IoModelFetchData

Location:

issm/trunk/src/c

Files:

• Makefile.am (modified) (2 diffs)
• io/Disk/FetchData.cpp (deleted)
• io/Disk/IoModelFetchData.cpp (modified) (6 diffs)
• io/Disk/diskio.h (modified) (1 diff)

issm/trunk/src/c/Makefile.am

@@ -406 +406 @@
                                         ./io/Disk/pfopen.cpp\
                                         ./io/Disk/pfclose.cpp\
-                                        ./io/Disk/FetchData.cpp\
                                         ./io/Matlab/matlabio.h\
                                         ./io/Matlab/WriteMatlabData.cpp\
@@ -1080 +1079 @@
                                         ./io/Disk/pfopen.cpp\
                                         ./io/Disk/pfclose.cpp\
-                                        ./io/Disk/FetchData.cpp\
                                         ./io/Matlab/matlabio.h\
                                         ./io/Matlab/WriteMatlabData.cpp\

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

@@ -15 +15 @@
 /*FUNCTION IoModelFetchData(double** pmatrix,int* pM,int* pN,FILE* model_handle,char* data_name){{{1*/
 void  IoModelFetchData(double** pmatrix,int* pM,int* pN,FILE* model_handle,char* data_name){
+
+        extern int my_rank;
+        extern int num_procs;
+
+        /*output: */
+        int M,N;
+        double* matrix=NULL;
         
         FILE* fid=NULL;
@@ -22 +29 @@
         
         /*Now fetch: */
-        FetchData(pmatrix,pM,pN,fid);
+
+        /*We have to read a matrix from disk. First read the dimensions of the matrix, then the whole matrix: */
+        /*numberofelements: */
+        if(my_rank==0){  
+                if(fread(&M,sizeof(int),1,fid)!=1) _error_("could not read number of rows for matrix ");
+        }
+
+        MPI_Bcast(&M,1,MPI_INT,0,MPI_COMM_WORLD); 
+
+        if(my_rank==0){  
+                if(fread(&N,sizeof(int),1,fid)!=1) _error_("could not read number of columns for matrix ");
+        }
+        MPI_Bcast(&N,1,MPI_INT,0,MPI_COMM_WORLD); 
+
+        /*Now allocate matrix: */
+        if(M*N){
+                matrix=(double*)xmalloc(M*N*sizeof(double));
+
+                /*Read matrix on node 0, then broadcast: */
+                if(my_rank==0){  
+                        if(fread(matrix,M*N*sizeof(double),1,fid)!=1) _error_("could not read matrix ");
+                }
+                
+                MPI_Bcast(matrix,M*N,MPI_DOUBLE,0,MPI_COMM_WORLD); 
+        }
+
+        /*Assign output pointers: */
+        *pmatrix=matrix;
+        if (pM)*pM=M;
+        if (pN)*pN=N;
 
 }
@@ -29 +65 @@
 void  IoModelFetchData(char** pstring,FILE* model_handle,char* data_name){
 
-        FILE* fid=NULL;
+        extern int my_rank;
+        extern int num_procs;
+        FILE* fid=NULL;
+
+        /*output: */
+        char* string=NULL;
+        int   string_size;
         
         /*Set file pointer to beginning of the data: */
@@ -35 +77 @@
         
         /*Now fetch: */
-        FetchData(pstring,fid);
+        
+        /*We have to read a string from disk. First read the dimensions of the string, then the string: */
+        if(my_rank==0){  
+                if(fread(&string_size,sizeof(int),1,fid)!=1) _error_(" could not read length of string ");
+        }
+
+        MPI_Bcast(&string_size,1,MPI_INT,0,MPI_COMM_WORLD); 
+
+        /*Now allocate string: */
+        if(string_size){
+                string=(char*)xmalloc((string_size+1)*sizeof(char));
+                string[string_size]='\0';
+
+                /*Read string on node 0, then broadcast: */
+                if(my_rank==0){  
+                        if(fread(string,string_size*sizeof(char),1,fid)!=1)_error_("  could not read string ");
+                }
+                MPI_Bcast(string,string_size,MPI_CHAR,0,MPI_COMM_WORLD); 
+        }
+        else{
+                string=(char*)xmalloc(sizeof(char));
+                string[0]='\0';
+        }
+
+
+        /*Assign output pointers: */
+        *pstring=string;
 }
 /*}}}*/
@@ -41 +109 @@
 void  IoModelFetchData(double* pscalar,FILE* model_handle,char* data_name){
 
-        FILE* fid=NULL;
-        
-        /*Set file pointer to beginning of the data: */
-        fid=SetFilePointerToData(model_handle,data_name);
-        
-        /*Now fetch: */
-        FetchData(pscalar,fid);
+
+        extern int my_rank;
+        extern int num_procs;
+        FILE* fid=NULL;
+
+        /*output: */
+        double   scalar;
+        
+        /*Set file pointer to beginning of the data: */
+        fid=SetFilePointerToData(model_handle,data_name);
+        
+        /*We have to read a scalar from disk. First read the dimensions of the scalar, then the scalar: */
+        if(my_rank==0){
+                if(fread(&scalar,sizeof(double),1,fid)!=1)_error_(" could not read scalar ");
+        }
+        MPI_Bcast(&scalar,1,MPI_DOUBLE,0,MPI_COMM_WORLD); 
+
+        /*Assign output pointers: */
+        *pscalar=scalar;
+                 
 }
 /*}}}*/
@@ -53 +134 @@
 void  IoModelFetchData(int* pinteger,FILE* model_handle,char* data_name){
 
-        FILE* fid=NULL;
-        
-        /*Set file pointer to beginning of the data: */
-        fid=SetFilePointerToData(model_handle,data_name);
-        
-        /*Now fetch: */
-        FetchData(pinteger,fid);
+        extern int my_rank;
+        extern int num_procs;
+        FILE* fid=NULL;
+
+        /*output: */
+        int   integer;
+        
+        /*Set file pointer to beginning of the data: */
+        fid=SetFilePointerToData(model_handle,data_name);
+        
+        /*We have to read a integer from disk. First read the dimensions of the integer, then the integer: */
+        if(my_rank==0){  
+                if(fread(&integer,sizeof(int),1,fid)!=1) _error_(" could not read integer ");
+        }
+
+        MPI_Bcast(&integer,1,MPI_INT,0,MPI_COMM_WORLD); 
+
+        /*Assign output pointers: */
+        *pinteger=integer;
+
 }
 /*}}}*/

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

@@ -16 +16 @@
 void  pfclose(FILE* fid,char* filename);
 
-void  FetchData(double** pmatrix, int* pM,int* pN,FILE* fid);
-void  FetchData(char** pstring,FILE* fid);
-void  FetchData(double* pscalar,FILE* fid);
-void  FetchData(int* pinteger,FILE* fid);
-
 void  IoModelFetchData(double** pmatrix,int* pM,int* pN,FILE* model_handle,char* data_name);
 void  IoModelFetchData(char** pstring,FILE* model_handle,char* data_name);