Changeset 12878 for issm/branches/trunk-jpl-damage/src/c/matlab/io/MatlabMatrixToMatrix.cpp

Timestamp:

08/02/12 17:13:12 (13 years ago)

Author:

cborstad

Message:

merged trunk-jpl into trunk-jpl-damage through revision 12877

Location:

issm/branches/trunk-jpl-damage

Files:

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

issm/branches/trunk-jpl-damage/src/c/matlab/io/MatlabMatrixToMatrix.cpp

@@ -3 +3 @@
 
 /*Headers:*/
-/*{{{1*/
+/*{{{*/
 #ifdef HAVE_CONFIG_H
         #include <config.h>
@@ -14 +14 @@
 #include <string.h>
 #include "./matlabio.h"
-#include "../../objects/objects.h"
+#include "../../classes/classes.h"
 #include "../../shared/shared.h"
 #include "../../Container/Container.h"
@@ -31 +31 @@
 
         #ifdef _HAVE_PETSC_
-        MatlabMatrixToPetscMatrix(&matrix->matrix,NULL,NULL,mxmatrix);
+        matrix->pmatrix=MatlabMatrixToPetscMat(mxmatrix);
         #else
-        matrix->matrix=MatlabMatrixToSeqMat(mxmatrix);
+        matrix->smatrix=MatlabMatrixToSeqMat(mxmatrix);
         #endif