Changeset 15506


Ignore:
Timestamp:
07/18/13 12:05:15 (12 years ago)
Author:
Mathieu Morlighem
Message:

NEW: allow vectors to be row vectors instead of column vectors

File:
1 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk-jpl/src/wrappers/matlab/io/FetchMatlabData.cpp

    r15335 r15506  
    269269
    270270        /*Check that it is a vector*/
    271         if(M>0){
    272                 if(N!=1) _error_("input vector of size " << M << "x" << N << " should have only one column");
     271        if(M!=1 && N!=1){
     272                _error_("input vector of size " << M << "x" << N << " should have only one column");
    273273        }
    274274
     
    294294
    295295                /*Convert matlab vector to double*  vector: */
    296                 MatlabVectorToDoubleVector(&doublevector,&outvector_rows,dataref);
     296                FetchData(&doublevector,&outvector_rows,dataref);
    297297
    298298                /*Convert double vector into integer vector: */
     
    326326
    327327                /*Convert matlab vector to double*  vector: */
    328                 MatlabVectorToDoubleVector(&doublevector,&outvector_rows,dataref);
     328                FetchData(&doublevector,&outvector_rows,dataref);
    329329
    330330                /*Convert double vector into integer vector: */
     
    358358
    359359                /*Convert matlab vector to double*  vector: */
    360                 MatlabVectorToDoubleVector(&doublevector,&outvector_rows,dataref);
     360                FetchData(&doublevector,&outvector_rows,dataref);
    361361
    362362                /*Convert double vector into float vector: */
Note: See TracChangeset for help on using the changeset viewer.