Changeset 12168 for issm/branches/trunk-jpl-damage/src/c/objects/Bamg/BamgMesh.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:

• . (modified) (2 props)
• src/c/objects/Bamg/BamgMesh.h (modified) (2 diffs)

issm/branches/trunk-jpl-damage

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

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

issm/branches/trunk-jpl-damage/src/c/objects/Bamg/BamgMesh.h

@@ -4 +4 @@
 #ifndef _BAMGMESH_H_
 #define _BAMGMESH_H_
-
-#if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
-#include <mex.h>
-#endif
 
 class BamgMesh{
@@ -51 +47 @@
 
                 BamgMesh();
-                #if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
-                BamgMesh(mxArray* matlab_struct);
-                #endif
                 ~BamgMesh();
-
-                #if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
-                void SetMatlabStructureFields(mxArray** matlab_struct);
-                void SetMatlabStructureField(mxArray* matlab_struct,const char* fieldname,int fieldrows,int fieldcols,double* fieldpointer);
-                #endif
-
 };
 

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