Changeset 11675

Timestamp:

03/09/12 10:05:33 (13 years ago)

Author:

Mathieu Morlighem

Message:

Added support for 'single' matlab format

Location:

issm/trunk-jpl/src/c

Files:

• io/Matlab/FetchMatlabData.cpp (modified) (2 diffs)
• toolkits/petsc/patches/MatlabMatrixToDoubleMatrix.cpp (modified) (6 diffs)

issm/trunk-jpl/src/c/io/Matlab/FetchMatlabData.cpp

@@ -60 +60 @@
                 outmatrix=NULL;
         }
-        else if (mxIsClass(dataref,"double") ){
-
+        else if(mxIsClass(dataref,"double") || mxIsClass(dataref,"single")){
                 /*Check dataref is not pointing to NaN: */
                 if ( mxIsNaN(*(mxGetPr(dataref))) && (mxGetM(dataref)==1) && (mxGetN(dataref)==1) ){
@@ -69 +68 @@
                 }
                 else{
-
                         /*Convert matlab matrix to double* matrix: */
                         MatlabMatrixToDoubleMatrix(&outmatrix,&outmatrix_rows,&outmatrix_cols,dataref);

issm/trunk-jpl/src/c/toolkits/petsc/patches/MatlabMatrixToDoubleMatrix.cpp

@@ -25 +25 @@
 int MatlabMatrixToDoubleMatrix(double** pmatrix,int* pmatrix_rows,int* pmatrix_cols,const mxArray* mxmatrix){
 
-        int rows, cols;
-        double* mxmatrix_ptr=NULL;
-        int ierr;
-        int i,j;
+        int     i,j,count,rows,cols;
+        double *pmxdoublematrix = NULL;
+        float  *pmxsinglematrix = NULL;
 
         /*output: */
@@ -36 +35 @@
         mwIndex*    ir=NULL;
         mwIndex*    jc=NULL;
-        double* pr=NULL;
-        int     count;
-        int     nnz;
-        int     nz;
 
         /*Ok, first check if we are dealing with a sparse or full matrix: */
@@ -45 +40 @@
 
                 /*Dealing with sparse matrix: recover size first: */
-                mxmatrix_ptr=(double*)mxGetPr(mxmatrix);
+                pmxdoublematrix=(double*)mxGetPr(mxmatrix);
                 rows=mxGetM(mxmatrix);
                 cols=mxGetN(mxmatrix);
-                nnz=mxGetNzmax(mxmatrix);
-                nz=(int)((double)nnz/(double)rows);
-
                 matrix=(double*)xcalloc(rows*cols,sizeof(double));
 
                 /*Now, get ir,jc and pr: */
-                pr=mxGetPr(mxmatrix);
                 ir=mxGetIr(mxmatrix);
                 jc=mxGetJc(mxmatrix);
@@ -62 +53 @@
                 for(i=0;i<cols;i++){
                         for(j=0;j<(jc[i+1]-jc[i]);j++){
-                                *(matrix+rows*ir[count]+i)=pr[count];
+                                matrix[rows*ir[count]+i]=pmxdoublematrix[count];
                                 count++;
                         }
@@ -68 +59 @@
 
         }
-        else{
-
-
+        else if(mxIsClass(mxmatrix,"double")){
                 /*Dealing with dense matrix: recover pointer and size: */
-                mxmatrix_ptr=(double*)mxGetPr(mxmatrix);
+                pmxdoublematrix=(double*)mxGetPr(mxmatrix);
                 rows=mxGetM(mxmatrix);
                 cols=mxGetN(mxmatrix);
-
                 
                 /*Create serial matrix: */
@@ -82 +70 @@
                 for(i=0;i<rows;i++){
                         for(j=0;j<cols;j++){
-                                *(matrix+cols*i+j)=*(mxmatrix_ptr+rows*j+i);
+                                matrix[cols*i+j]=(double)pmxdoublematrix[rows*j+i];
                         }
                 }
-                
+        }
+        else if(mxIsClass(mxmatrix,"single")){
+                /*Dealing with dense matrix: recover pointer and size: */
+                pmxsinglematrix=(float*)mxGetPr(mxmatrix);
+                rows=mxGetM(mxmatrix);
+                cols=mxGetN(mxmatrix);
+
+                /*Create serial matrix: */
+                matrix=(double*)xcalloc(rows*cols,sizeof(double));
+
+                for(i=0;i<rows;i++){
+                        for(j=0;j<cols;j++){
+                                matrix[cols*i+j]=(double)pmxsinglematrix[rows*j+i];
+                        }
+                }
+        }
+        else{
+                _error_("Matlab matrix type Not implemented yet");
         }