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

Timestamp:

03/13/12 19:59:59 (13 years ago)

Author:

Eric.Larour

Message:

Completed separation of Petsc from ISSM. Matrix and Vector
are now the vehicles for Mat and Vec objects when running with
Petsc, or double* when running with a custom made type of matrix (still
to be finished).

File:

• issm/trunk-jpl/src/c/io/Matlab/FetchMatlabData.cpp (modified) (2 diffs)

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

@@ -276 +276 @@
 }
 /*}}}*/
-/*FUNCTION FetchMatlabData(Mat* pmatrix,const mxArray* dataref){{{1*/
-void FetchMatlabData(Mat* pmatrix,const mxArray* dataref){
-        
-        Mat outmatrix=NULL;
-        int dummy=0;
-
-        if (mxIsClass(dataref,"double") ){
-
-                /*Check dataref is not pointing to NaN: */
-                if ( mxIsNaN(*(mxGetPr(dataref))) && (mxGetM(dataref)==1) && (mxGetN(dataref)==1) ){
-                        outmatrix=NULL;
-                }
-                else{
-
-                        /*Convert matlab matrix to petsc matrix: */
-                        MatlabMatrixToPetscMatrix(&outmatrix,&dummy,&dummy,dataref);
-                }
-        }
-        else{
-                /*This is an error: we don't have the correct input!: */
-                _error_("Input parameter of class %s not supported yet",mxGetClassName(dataref));
-        }
-
-        /*Assign output pointers:*/
-        *pmatrix=outmatrix;
-}
-/*}}}*/
 /*FUNCTION FetchMatlabData(Matrix** pmatrix,const mxArray* dataref){{{1*/
 void FetchMatlabData(Matrix** pmatrix,const mxArray* dataref){
@@ -451 +424 @@
         *pvector=outvector;
         if (pM)*pM=outvector_rows;
-}
-/*}}}*/
-/*FUNCTION FetchMatlabData(Vec* pvector,const mxArray* dataref){{{1*/
-void FetchMatlabData(Vec* pvector,const mxArray* dataref){
-
-        Vec vector=NULL;
-        int dummy;
-
-        if(mxIsEmpty(dataref)){
-                /*Nothing to pick up. Just initialize matrix pointer to NULL: */
-                vector=NULL;
-        }
-        else if (mxIsClass(dataref,"double") ){
-
-                /*Convert matlab vector to petsc vector: */
-                MatlabVectorToPetscVector(&vector,&dummy,dataref);
-        }
-        else{
-                /*This is an error: we don't have the correct input!: */
-                _error_("Input parameter of class %s not supported yet",mxGetClassName(dataref));
-        }
-
-        /*Assign output pointers:*/
-        *pvector=vector;
 }
 /*}}}*/