Changeset 4205

Timestamp:

06/24/10 16:17:42 (15 years ago)

Author:

Mathieu Morlighem

Message:

Added check so that only column vector are supported

File:

• issm/trunk/src/c/toolkits/petsc/patches/MatlabVectorToDoubleVector.cpp (modified) (3 diffs)

issm/trunk/src/c/toolkits/petsc/patches/MatlabVectorToDoubleVector.cpp

@@ -28 +28 @@
 int MatlabVectorToDoubleVector(double** pvector,int* pvector_rows,const mxArray* mxvector){
 
-        int rows, cols;
+        int rows,cols,size;
         double* mxvector_ptr=NULL;
         int ierr;
@@ -52 +52 @@
                 cols=mxGetN(mxvector);
                 nnz=mxGetNzmax(mxvector);
+                
+                /*Check that input is actualy a vector*/
+                if (cols!=1) ISSMERROR("input vector of size %ix%i should have only one column",rows,cols);
+
                 nz=(int)((double)nnz/(double)rows);
 
@@ -78 +82 @@
                 cols=mxGetN(mxvector);
 
+                /*Check that input is actualy a vector*/
+                if (cols!=1) ISSMERROR("input vector of size %ix%i should have only one column",rows,cols);
+
                 /*allocate and memcpy*/
                 vector=(double*)xmalloc(rows*sizeof(double));