Changeset 13531

Timestamp:

10/04/12 10:42:48 (12 years ago)

Author:

Eric.Larour

Message:

CHG: the IssmBoot and IssmEnd have nothing to do with ISSM booting and finializing, but more with
exception trapping. Renamed them accordingly.

Location:

issm/trunk-jpl/src/c

Files:

• include/macros.h (modified) (1 diff)
• solutions/issm.cpp (modified) (2 diffs)
• solutions/kriging.cpp (modified) (2 diffs)

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

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

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

@@ -45 +45 @@
         IssmPDouble Solution_time, Memory_use, Current_flops;
 
-        IssmBoot();
-
+        /*Initialize exception trapping: */
+        ExceptionTrapBegin();
+
+        /*Initialize environment (MPI, PETSC, MUMPS, etc ...)*/
         EnvironmentInit(argc,argv);
         
@@ -234 +236 @@
         #endif
 
-        /*end module: */
-        IssmEnd();
+        /*Finalize exception trapping: */
+        ExceptionTrapEnd();
 
         return 0; //unix success return;

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

@@ -36 +36 @@
         IssmDouble *error       = NULL;
 
-        IssmBoot();
+        /*Initialize exception trapping: */
+        ExceptionTrapBegin();
 
+        /*Initialize environment (MPI, PETSC, MUMPS, etc ...)*/
         EnvironmentInit(argc,argv);
 
@@ -97 +99 @@
 #endif
 
-        /*end module: */
-        IssmEnd();
+        /*Finalize exception trapping: */
+        ExceptionTrapEnd();
 
         return 0; //unix success return;