Changeset 13375

Timestamp:

09/14/12 15:36:14 (13 years ago)

Author:

Mathieu Morlighem

Message:

NEW: enable to Fetch matlab single vectors

Location:

issm/trunk-jpl/src/c

Files:

• matlab/io/FetchMatlabData.cpp (modified) (4 diffs)
• modules/Solverx/SolverxSeq.cpp (modified) (4 diffs)

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

@@ -72 +72 @@
                 outmatrix=NULL;
         }
-        else if (mxIsClass(dataref,"double") ){
+        else if( mxIsClass(dataref,"double") || 
+                                mxIsClass(dataref,"single") || 
+                                mxIsClass(dataref,"int16") || 
+                                mxIsClass(dataref,"int8") || 
+                                mxIsClass(dataref,"uint8")){
 
                 /*Check dataref is not pointing to NaN: */
@@ -82 +86 @@
                 }
                 else{
-
+                        if(!mxIsClass(dataref,"double") && !mxIsClass(dataref,"single")){
+                                _printLine_("Warning: converting matlab data from '" << mxGetClassName(dataref) << "' to 'double'");
+                        }
                         /*Convert matlab n-dim array to double* matrix: */
                         MatlabNArrayToNArray(&outmatrix,&outmatrix_numel,&outmatrix_ndims,&outmatrix_size,dataref);
@@ -114 +120 @@
                 outmatrix=NULL;
         }
-        else if (mxIsClass(dataref,"double") ){
+        else if( mxIsClass(dataref,"double") || 
+                                mxIsClass(dataref,"single") || 
+                                mxIsClass(dataref,"int16") || 
+                                mxIsClass(dataref,"int8") || 
+                                mxIsClass(dataref,"uint8")){
 
                 /*Check dataref is not pointing to NaN: */
@@ -123 +133 @@
                 }
                 else{
-
+                        if(!mxIsClass(dataref,"double") && !mxIsClass(dataref,"single")){
+                                _printLine_("Warning: converting matlab data from '" << mxGetClassName(dataref) << "' to 'double'");
+                        }
                         /*Convert matlab matrix to double* matrix: */
                         MatlabMatrixToDoubleMatrix(&doublematrix,&outmatrix_rows,&outmatrix_cols,dataref);

issm/trunk-jpl/src/c/modules/Solverx/SolverxSeq.cpp

@@ -25 +25 @@
 void SolverxSeq(SeqVec<IssmDouble>** puf,SeqMat<IssmDouble>* Kff, SeqVec<IssmDouble>* pf, Parameters* parameters){/*{{{*/
 
-        #ifdef _HAVE_GSL_
+#ifdef _HAVE_GSL_
         /*Intermediary: */
         int M,N,N2,s;
@@ -35 +35 @@
         if(N!=N2)_error_("Right hand side vector of size " << N2 << ", when matrix is of size " << M << "-" << N << " !");
         if(M!=N)_error_("Stiffness matrix should be square!");
-        IssmDouble *x  = xNew<IssmDouble>(N);
+        IssmDouble *x  = xNew<IssmDouble>(N);
+
 #ifdef _HAVE_ADOLC_
         SolverxSeq(x,Kff->matrix,pf->vector,N,parameters);
@@ -41 +42 @@
         SolverxSeq(x,Kff->matrix,pf->vector,N);
 #endif
+
         uf=new SeqVec<IssmDouble>(x,N);
         xDelete(x);
@@ -47 +49 @@
         *puf=uf;
 
-        #else
-                _error_("GSL support not compiled in!");
-        #endif
+#else
+        _error_("GSL support not compiled in!");
+#endif
 
 }/*}}}*/