Changeset 15506

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:

• issm/trunk-jpl/src/wrappers/matlab/io/FetchMatlabData.cpp (modified) (4 diffs)

issm/trunk-jpl/src/wrappers/matlab/io/FetchMatlabData.cpp ¶

@@ -269 +269 @@
 
         /*Check that it is a vector*/
-        if(M>0){
-                if(N!=1) _error_("input vector of size " << M << "x" << N << " should have only one column");
+        if(M!=1 && N!=1){
+                _error_("input vector of size " << M << "x" << N << " should have only one column");
         }
 
@@ -294 +294 @@
 
                 /*Convert matlab vector to double*  vector: */
-                MatlabVectorToDoubleVector(&doublevector,&outvector_rows,dataref);
+                FetchData(&doublevector,&outvector_rows,dataref);
 
                 /*Convert double vector into integer vector: */
@@ -326 +326 @@
 
                 /*Convert matlab vector to double*  vector: */
-                MatlabVectorToDoubleVector(&doublevector,&outvector_rows,dataref);
+                FetchData(&doublevector,&outvector_rows,dataref);
 
                 /*Convert double vector into integer vector: */
@@ -358 +358 @@
 
                 /*Convert matlab vector to double*  vector: */
-                MatlabVectorToDoubleVector(&doublevector,&outvector_rows,dataref);
+                FetchData(&doublevector,&outvector_rows,dataref);
 
                 /*Convert double vector into float vector: */