Changeset 13231

Timestamp:

09/04/12 09:54:32 (13 years ago)

Author:

Mathieu Morlighem

Message:

CHG: removing PetscInitialize and PetscFinalize from matlab and python modules

Location:

issm/trunk-jpl/src/c

Files:

• matlab/include/matlab_macros.h (modified) (2 diffs)
• shared/Wrapper/ModuleBoot.cpp (modified) (1 diff)

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

@@ -19 +19 @@
 /*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 
- * will be trapped. Really nifty!*/
-//exception.Report(); 
+ * will be trapped*/
+#define MODULEBOOT(); try{ 
 
-#define MODULEBOOT(); ModuleBoot(); \
-        try{
-
-#define MODULEEND(); ModuleEnd(); }\
+#define MODULEEND(); }\
         catch(ErrorException &exception){\
                 mexErrMsgTxt("ISSM Error"); \
@@ -35 +32 @@
                 mexErrMsgTxt("An unexpected error occurred");\
         }
-//}}}
+/*}}}*/
 /* WRAPPER {{{*/
 #define WRAPPER(modulename,...) void mexFunction(int nlhs, mxArray* plhs[], int nrhs, const mxArray* prhs[]) 
-
 /*}}}*/
 /* CHECKARGUMENTS {{{*/

issm/trunk-jpl/src/c/shared/Wrapper/ModuleBoot.cpp

@@ -11 +11 @@
 #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
 #endif
-
 
 int ModuleBoot(void){