Changeset 12022

Timestamp:

04/17/12 07:57:42 (13 years ago)

Author:

Mathieu Morlighem

Message:

moved MODULEBOOT to ISSMBOOT to avoid conflict with mex

Location:

issm/trunk-jpl/src/c

Files:

• Makefile.am (modified) (1 diff)
• include/macros.h (modified) (1 diff)
• matlab/include/matlab_macros.h (modified) (1 diff)
• matlab/io/WriteMatlabData.cpp (modified) (1 diff)
• solutions/issm.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/Makefile.am

@@ -16 +16 @@
 #Core sources{{{1
 core_sources = ./issm.h\
-                                ./issm-binding.h\
-                                ./include/macros.h\
+                                        ./issm-binding.h\
+                                        ./include/macros.h\
                                         ./include/typedefs.h\
                                         ./include/types.h\

issm/trunk-jpl/src/c/include/macros.h

@@ -40 +40 @@
 #endif
 /*}}}*/
-/* MODULEBOOT/MODULEEND {{{1*/
+/* ISSMBOOT/ISSMEND {{{1*/
 
 /*The following macros hide the error exception handling in a matlab module. Just put 
- * MODULEBOOT(); and MODULEEND(); at the beginning and end of a module, and c++ exceptions 
+ * ISSMBOOT(); and ISSMEND(); at the beginning and end of a module, and c++ exceptions 
  * will be trapped. Really nifty!*/
 
-#define MODULEBOOT(); \
+#define ISSMBOOT(); \
         try{
 
-#define MODULEEND(); }\
+#define ISSMEND(); }\
         catch(ErrorException &exception){\
                 exception.Report(); \

issm/trunk-jpl/src/c/matlab/include/matlab_macros.h

@@ -20 +20 @@
  * will be trapped. Really nifty!*/
 
-//Module Boot //{{{
 #define MODULEBOOT(); ModuleBoot(); \
         try{

issm/trunk-jpl/src/c/matlab/io/WriteMatlabData.cpp

@@ -27 +27 @@
                 
                 #ifdef _HAVE_PETSC_
-                PetscMatrixToDoubleMatrix(&tmatrix_ptr,&rows,&cols,matrix->matrix);
+                PetscMatrixToDoubleMatrix(&matrix_ptr,&rows,&cols,matrix->matrix);
                 #else
                 matrix_ptr=matrix->matrix->ToSerial();

issm/trunk-jpl/src/c/solutions/issm.cpp

@@ -35 +35 @@
         int      ierr;
 
-        MODULEBOOT();
+        ISSMBOOT();
 
         /*Initialize environments: Petsc, MPI, etc...: */
@@ -141 +141 @@
         
         /*end module: */
-        MODULEEND();
+        ISSMEND();
 
         return 0; //unix success return;
 }
-