Context Navigation

petscpatches.h

Timestamp:

05/01/12 17:28:47 (13 years ago)

Author:

cborstad

Message:

merged trunk-jpl into branch through revision 12167

Location:

issm/branches/trunk-jpl-damage

Files:

Property svn:ignore

-              old
+              new
 config.status
 configure
-doxygen
 ISSM.paf
 ISSM.ppf
 ISSM.ppf_cache
 libtool
-list
 Makefile
 Makefile.in
 stamp-h1
 svn-commit*
-nightlylog

Property svn:mergeinfo changed
/issm/trunk merged: 11526,11533,11681-11682,11710,11778-11779,11995
/issm/trunk-jpl merged: 11992-11994,11996-12003,12005-12113,12115-12161,12163-12166

-              r12004
+              r12168
 class Parameters;
-#if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
-#include "mex.h"
-int MatlabMatrixToPetscMatrix(Mat* matrix,int* prows,int* pcols, const mxArray* mxmatrix);
-int MatlabVectorToPetscVector(Vec* pvector,int* pvector_rows,const mxArray* mxvector);
-int PetscMatrixToMatlabMatrix(mxArray** pdataref,Mat matrix);
-int PetscVectorToMatlabVector(mxArray** pdataref,Vec vector);
-#endif
 Vec NewVec(int size,bool fromlocalsize=false);
 …
 MatType ISSMToPetscMatrixType(MatrixType type);
+void PetscMatrixToDoubleMatrix(double** pmatrix, int* prows, int* pcols,Mat matrix);
+void PetscVectorToDoubleVector(double** pvector, int* prows, Vec vector);
 #endif

Note: See TracChangeset for help on using the changeset viewer.

/issm/trunk	merged: 11526,11533,11681-11682,11710,11778-11779,11995
/issm/trunk-jpl	merged: 11992-11994,11996-12003,12005-12113,12115-12161,12163-12166