Changeset 11940

Timestamp:

04/05/12 14:52:39 (13 years ago)

Author:

Eric.Larour

Message:

Fixed bug: do not use the transpose anymore

File:

• issm/trunk-jpl/src/c/toolkits/petsc/patches/PetscMatrixToMatlabMatrix.cpp (modified) (4 diffs)

issm/trunk-jpl/src/c/toolkits/petsc/patches/PetscMatrixToMatlabMatrix.cpp

@@ -25 +25 @@
 
 
-int PetscMatrixToMatlabMatrix(mxArray** pdataref,Mat matrix){
+int PetscMatrixToMatlabMatrix(mxArray** pdataref,Mat tmatrix){
 
         int i,j,k;
@@ -31 +31 @@
         /*output: */
         mxArray* dataref=NULL;
-        mxArray* tdataref=NULL;
         int    rows,cols;
 
@@ -50 +49 @@
         int*    idxm=NULL;
         int*    idxn=NULL;
+        Mat     matrix=NULL;
 
+        
+        /*First off, we need to transpose the matrix using the Petsc API. We tried using the transpose operation from 
+         * Matlab, but this ends up creating issues with lost pointers and references: */
+        MatTranspose(tmatrix,MAT_INITIAL_MATRIX,&matrix);
+
+        /*Some needed information: */
         MatGetType(matrix,&type);
         MatGetSize(matrix,&rows,&cols);
@@ -128 +134 @@
 
                 dataref = mxCreateDoubleMatrix(0,0,mxREAL);
-                mxSetM(dataref,rows);
-                mxSetN(dataref,cols);
+                mxSetM(dataref,cols);
+                mxSetN(dataref,rows);
                 mxSetPr(dataref,(double*)matrix_ptr);   
         }
 
-
-        /*Transpose matrcol_indes: */
-        mexCallMATLAB(1,&tdataref,1,&dataref, "transpose");
-
+        /*Free ressources:*/
+        MatFree(&matrix);
 
         /*Assign output pointers: */
-        *pdataref=tdataref;
+        *pdataref=dataref;
 
         return 1;