Changeset 13395 for issm/trunk/src/c/matlab/io/MatlabMatrixToMatrix.cpp

Timestamp:

09/19/12 09:32:34 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 13393

Location:

issm/trunk

Files:

• . (modified) (2 props)
• src (modified) (1 prop)
• src/c/matlab/io/MatlabMatrixToMatrix.cpp (modified) (2 diffs)

issm/trunk

@@ +1 @@
+projects
 autom4te.cache
 aclocal.m4

@@ +1 @@
+projects
 autom4te.cache
 aclocal.m4

issm/trunk/src/c/matlab/io/MatlabMatrixToMatrix.cpp

@@ -14 +14 @@
 #include <string.h>
 #include "./matlabio.h"
-#include "../../objects/objects.h"
+#include "../../classes/classes.h"
 #include "../../shared/shared.h"
 #include "../../Container/Container.h"
@@ -22 +22 @@
 /*}}}*/
 
-Matrix* MatlabMatrixToMatrix(const mxArray* mxmatrix){
+Matrix<double>* MatlabMatrixToMatrix(const mxArray* mxmatrix){
 
         int dummy;
-        Matrix* matrix=NULL;
+        Matrix<double>* matrix=NULL;
 
         /*allocate matrix object: */
-        matrix=new Matrix();
+        matrix=new Matrix<double>();
 
         #ifdef _HAVE_PETSC_
-        MatlabMatrixToPetscMatrix(&matrix->matrix,NULL,NULL,mxmatrix);
+        matrix->pmatrix=MatlabMatrixToPetscMat(mxmatrix);
         #else
-        matrix->matrix=MatlabMatrixToSeqMat(mxmatrix);
+        matrix->smatrix=MatlabMatrixToSeqMat(mxmatrix);
         #endif
         

@@ +1 @@
+projects
 autom4te.cache
 aclocal.m4