Changeset 12004 for issm/branches/trunk-jpl-damage/src/c/toolkits/petsc/patches/petscpatches.h

Timestamp:

04/16/12 16:06:52 (13 years ago)

Author:

cborstad

Message:

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

Location:

issm/branches/trunk-jpl-damage

Files:

• . (modified) (1 prop)
• src/c/toolkits/petsc/patches/petscpatches.h (modified) (2 diffs)

issm/branches/trunk-jpl-damage/src/c/toolkits/petsc/patches/petscpatches.h

@@ -16 +16 @@
 class Parameters;
 
-#ifdef _SERIAL_
+#if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
 #include "mex.h"
 int MatlabMatrixToPetscMatrix(Mat* matrix,int* prows,int* pcols, const mxArray* mxmatrix);
@@ -49 +49 @@
 InsertMode ISSMToPetscInsertMode(InsMode mode);
 NormType ISSMToPetscNormMode(NormMode mode);
+MatType ISSMToPetscMatrixType(MatrixType type);
 
 #endif