Index: ../trunk-jpl/src/c/include/macros.h
===================================================================
--- ../trunk-jpl/src/c/include/macros.h	(revision 14913)
+++ ../trunk-jpl/src/c/include/macros.h	(revision 14914)
@@ -1,70 +0,0 @@
-/* \file macros.h
- * \brief: global macros used in the whole code
- */
-
-/*Header {{{*/
-#ifndef _MACROS_H_
-#define _MACROS_H_
-
-#include <iostream>
-#include <sstream>
-#include <iomanip>
-#include "./typedefs.h"
-
-#ifdef HAVE_CONFIG_H
-	#include <config.h>
-#else
-#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
-#endif
-/*}}}*/
-
-/*Exceptions: */
-/* _assert_ {{{*/
-/*Assertion macro: do nothing if macro _ISSM_DEBUG_ undefined*/
-#ifdef _ISSM_DEBUG_ 
-#define _assert_(statement)\
-  if (!(statement)) _error_("Assertion \""<<#statement<<"\" failed, please report bug to "<<PACKAGE_BUGREPORT)
-#else
-#define _assert_(ignore)\
-  ((void) 0)
-#endif
-/*}}}*/
-/* _error_ {{{*/
-/*new Error exception macro*/
-#ifdef _INTEL_WIN_
-#define _error_(StreamArgs)\
-   do{std::ostringstream aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy; \
-   aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy << StreamArgs << std::ends; \
-   throw ErrorException(aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy.str());}while(0)
-#else
-#define _error_(StreamArgs)\
-	do{std::ostringstream aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy; \
-   aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy << StreamArgs << std::ends; \
-   throw ErrorException(__FILE__,__func__,__LINE__,aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy.str());}while(0)
-#endif
-/*}}}*/
-/* ExceptionTrapBegin/ExceptionTrapEnd {{{*/
-
-/*The following macros hide the error exception handling in a matlab module. Just put 
- * ExceptionTrapBegin(); and ExceptionTrapEnd(); at the beginning and end of a module, and c++ exceptions 
- * will be trapped. Really nifty!*/
-
-#define ExceptionTrapBegin(); \
-	try{
-
-#define ExceptionTrapEnd(); }\
-	catch(ErrorException &exception){\
-		exception.Report();\
-		return 0;\
-	}\
-	catch (exception& e) {\
-		_printf_(true,"Standard exception: %s\n",e.what());\
-		return 0;\
-	}\
-	catch(...){\
-		_printf_(true,"An unexpected error occurred");\
-		return 0;\
-	}
-/*}}}*/
-
-#endif
Index: ../trunk-jpl/src/c/include/include.h
===================================================================
--- ../trunk-jpl/src/c/include/include.h	(revision 14913)
+++ ../trunk-jpl/src/c/include/include.h	(revision 14914)
@@ -5,7 +5,6 @@
 #ifndef _INCLUDEGLOBAL_H_
 #define  _INCLUDEGLOBAL_H_
 
-#include "./macros.h"
 #include "./typedefs.h"
 #include "./types.h"
 
Index: ../trunk-jpl/src/c/shared/Exceptions/exceptions.h
===================================================================
--- ../trunk-jpl/src/c/shared/Exceptions/exceptions.h	(revision 14913)
+++ ../trunk-jpl/src/c/shared/Exceptions/exceptions.h	(revision 14914)
@@ -6,16 +6,75 @@
  * own exceptions
  */
 
-#ifndef MY_EXCEPTIONS_H_
-#define MY_EXCEPTIONS_H_
+#ifndef _MY_EXCEPTIONS_H_
+#define _MY_EXCEPTIONS_H_
 
 #include <exception>
 #include <string>
+#include <iostream>
+#include <sstream>
+#include <iomanip>
+
 using namespace std;
 
-/*We derive our classes from the c++ exception class: */
-class ErrorException: public exception {
+#ifdef HAVE_CONFIG_H
+	#include <config.h>
+#else
+#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
+#endif
 
+/*macros: */
+/* _assert_ {{{*/
+/*Assertion macro: do nothing if macro _ISSM_DEBUG_ undefined*/
+#ifdef _ISSM_DEBUG_ 
+#define _assert_(statement)\
+  if (!(statement)) _error_("Assertion \""<<#statement<<"\" failed, please report bug to "<<PACKAGE_BUGREPORT)
+#else
+#define _assert_(ignore)\
+  ((void) 0)
+#endif
+/*}}}*/
+/* _error_ {{{*/
+/*new Error exception macro*/
+#ifdef _INTEL_WIN_
+#define _error_(StreamArgs)\
+   do{std::ostringstream aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy; \
+   aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy << StreamArgs << std::ends; \
+   throw ErrorException(aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy.str());}while(0)
+#else
+#define _error_(StreamArgs)\
+	do{std::ostringstream aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy; \
+   aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy << StreamArgs << std::ends; \
+   throw ErrorException(__FILE__,__func__,__LINE__,aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy.str());}while(0)
+#endif
+/*}}}*/
+/* ExceptionTrapBegin/ExceptionTrapEnd {{{*/
+
+/*The following macros hide the error exception handling in a matlab module. Just put 
+ * ExceptionTrapBegin(); and ExceptionTrapEnd(); at the beginning and end of a module, and c++ exceptions 
+ * will be trapped. Really nifty!*/
+
+#define ExceptionTrapBegin(); \
+	try{
+
+#define ExceptionTrapEnd(); }\
+	catch(ErrorException &exception){\
+		exception.Report();\
+		return 0;\
+	}\
+	catch (exception& e) {\
+		_printf_(true,"Standard exception: %s\n",e.what());\
+		return 0;\
+	}\
+	catch(...){\
+		_printf_(true,"An unexpected error occurred");\
+		return 0;\
+	}
+/*}}}*/
+
+/*ISSM exception class: */
+class ErrorException: public exception { /*{{{*/
+
 	string   what_str;
 	string   function_name;
 	string   file_name;
@@ -31,6 +90,10 @@
 	const char* PythonReport() const;
 
 };
+/*}}}*/
 
 char* exprintf(const char* format,...);
+
 #endif
+
+
Index: ../trunk-jpl/src/c/shared/Numerics/Synchronize.sh
===================================================================
--- ../trunk-jpl/src/c/shared/Numerics/Synchronize.sh	(revision 14913)
+++ ../trunk-jpl/src/c/shared/Numerics/Synchronize.sh	(revision 14914)
@@ -26,7 +26,6 @@
 #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
 #endif
 #include "./Verbosity.h"
-#include "../../include/macros.h"
 #include "../Exceptions/exceptions.h"
 /*}}}*/
 
Index: ../trunk-jpl/src/c/shared/Numerics/Verbosity.cpp
===================================================================
--- ../trunk-jpl/src/c/shared/Numerics/Verbosity.cpp	(revision 14913)
+++ ../trunk-jpl/src/c/shared/Numerics/Verbosity.cpp	(revision 14914)
@@ -15,7 +15,6 @@
 #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
 #endif
 #include "./Verbosity.h"
-#include "../../include/macros.h"
 #include "../Exceptions/exceptions.h"
 /*}}}*/
 
Index: ../trunk-jpl/src/c/shared/Sorting/binary_search.cpp
===================================================================
--- ../trunk-jpl/src/c/shared/Sorting/binary_search.cpp	(revision 14913)
+++ ../trunk-jpl/src/c/shared/Sorting/binary_search.cpp	(revision 14914)
@@ -8,7 +8,6 @@
 #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
 #endif
 
-#include "../../include/macros.h"
 #include "../Exceptions/exceptions.h"
 #include <stdio.h>
 
Index: ../trunk-jpl/src/c/shared/Elements/PrintArrays.cpp
===================================================================
--- ../trunk-jpl/src/c/shared/Elements/PrintArrays.cpp	(revision 14913)
+++ ../trunk-jpl/src/c/shared/Elements/PrintArrays.cpp	(revision 14914)
@@ -1,6 +1,5 @@
 
 #include "./elements.h"
-#include "../../include/macros.h"
 using namespace std;
 
 void printarray(IssmPDouble* array,int lines,int cols){
Index: ../trunk-jpl/src/c/io/Comm/IssmComm.cpp
===================================================================
--- ../trunk-jpl/src/c/io/Comm/IssmComm.cpp	(revision 14913)
+++ ../trunk-jpl/src/c/io/Comm/IssmComm.cpp	(revision 14914)
@@ -10,7 +10,6 @@
 
 #include "./IssmComm.h"
 #include "../../include/types.h"
-#include "../../include/macros.h"
 #include "../../shared/Exceptions/exceptions.h"
 
 void IssmComm::SetComm(COMM incomm){ /*{{{*/
Index: ../trunk-jpl/src/c/toolkits/mumps/MpiDenseMumpsSolve.cpp
===================================================================
--- ../trunk-jpl/src/c/toolkits/mumps/MpiDenseMumpsSolve.cpp	(revision 14913)
+++ ../trunk-jpl/src/c/toolkits/mumps/MpiDenseMumpsSolve.cpp	(revision 14914)
@@ -10,7 +10,6 @@
 #endif
 
 #include "../../include/types.h"
-#include "../../include/macros.h"
 #include "../../shared/MemOps/MemOps.h"
 #include "../../shared/Exceptions/exceptions.h"
 #include "../../io/Comm/Comm.h"
Index: ../trunk-jpl/src/c/toolkits/issm/IssmVec.h
===================================================================
--- ../trunk-jpl/src/c/toolkits/issm/IssmVec.h	(revision 14913)
+++ ../trunk-jpl/src/c/toolkits/issm/IssmVec.h	(revision 14914)
@@ -16,7 +16,6 @@
 #include "../../EnumDefinitions/EnumDefinitions.h"
 #include "../../shared/Exceptions/exceptions.h"
 #include "../../shared/MemOps/MemOps.h"
-#include "../../include/macros.h"
 #include "./IssmToolkitUtils.h"
 #include <math.h>
 /*}}}*/
Index: ../trunk-jpl/src/c/toolkits/issm/IssmDenseMat.h
===================================================================
--- ../trunk-jpl/src/c/toolkits/issm/IssmDenseMat.h	(revision 14913)
+++ ../trunk-jpl/src/c/toolkits/issm/IssmDenseMat.h	(revision 14914)
@@ -20,7 +20,6 @@
 #include "../../shared/Exceptions/exceptions.h"
 #include "../../shared/MemOps/MemOps.h"
 #include "../../io/Print/Print.h"
-#include "../../include/macros.h"
 #include "../../toolkits/gsl/gslincludes.h"
 
 #include <math.h>
Index: ../trunk-jpl/src/c/toolkits/issm/IssmMat.h
===================================================================
--- ../trunk-jpl/src/c/toolkits/issm/IssmMat.h	(revision 14913)
+++ ../trunk-jpl/src/c/toolkits/issm/IssmMat.h	(revision 14914)
@@ -15,7 +15,6 @@
 
 #include "../../shared/Exceptions/exceptions.h"
 #include "../../shared/MemOps/MemOps.h"
-#include "../../include/macros.h"
 #include "../../classes/ToolkitOptions.h"
 #include "../../io/Comm/Comm.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"
Index: ../trunk-jpl/src/c/toolkits/issm/IssmToolkitUtils.cpp
===================================================================
--- ../trunk-jpl/src/c/toolkits/issm/IssmToolkitUtils.cpp	(revision 14913)
+++ ../trunk-jpl/src/c/toolkits/issm/IssmToolkitUtils.cpp	(revision 14914)
@@ -12,7 +12,6 @@
 
 #include "../../shared/MemOps/MemOps.h"
 #include "../../io/Comm/Comm.h"
-#include "../../include/macros.h"
 #include "../../classes/ToolkitOptions.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"
 #include "../../shared/Exceptions/exceptions.h"
Index: ../trunk-jpl/src/c/toolkits/issm/IssmAbsVec.h
===================================================================
--- ../trunk-jpl/src/c/toolkits/issm/IssmAbsVec.h	(revision 14913)
+++ ../trunk-jpl/src/c/toolkits/issm/IssmAbsVec.h	(revision 14914)
@@ -20,7 +20,6 @@
 
 #include "../../shared/Exceptions/exceptions.h"
 #include "../../shared/MemOps/MemOps.h"
-#include "../../include/macros.h"
 #include <math.h>
 
 /*}}}*/
Index: ../trunk-jpl/src/c/toolkits/issm/IssmMpiVec.h
===================================================================
--- ../trunk-jpl/src/c/toolkits/issm/IssmMpiVec.h	(revision 14913)
+++ ../trunk-jpl/src/c/toolkits/issm/IssmMpiVec.h	(revision 14914)
@@ -19,7 +19,6 @@
 
 #include "../../shared/Exceptions/exceptions.h"
 #include "../../shared/MemOps/MemOps.h"
-#include "../../include/macros.h"
 #include "../../io/io.h"
 #ifdef _HAVE_MPI_
 #include "../mpi/mpiincludes.h"
Index: ../trunk-jpl/src/c/toolkits/issm/IssmMpiDenseMat.h
===================================================================
--- ../trunk-jpl/src/c/toolkits/issm/IssmMpiDenseMat.h	(revision 14913)
+++ ../trunk-jpl/src/c/toolkits/issm/IssmMpiDenseMat.h	(revision 14914)
@@ -19,7 +19,6 @@
 
 #include "../../shared/Exceptions/exceptions.h"
 #include "../../shared/MemOps/MemOps.h"
-#include "../../include/macros.h"
 #include "../../Container/DataSet.h"
 #include "../../io/Comm/Comm.h"
 #include "../../classes/objects/Bucket.h"
Index: ../trunk-jpl/src/c/toolkits/issm/IssmSeqVec.h
===================================================================
--- ../trunk-jpl/src/c/toolkits/issm/IssmSeqVec.h	(revision 14913)
+++ ../trunk-jpl/src/c/toolkits/issm/IssmSeqVec.h	(revision 14914)
@@ -19,7 +19,6 @@
 #include "../../shared/Exceptions/exceptions.h"
 #include "../../io/Print/Print.h"
 #include "../../shared/MemOps/MemOps.h"
-#include "../../include/macros.h"
 #include <math.h>
 
 /*}}}*/
Index: ../trunk-jpl/src/c/toolkits/issm/IssmAbsMat.h
===================================================================
--- ../trunk-jpl/src/c/toolkits/issm/IssmAbsMat.h	(revision 14913)
+++ ../trunk-jpl/src/c/toolkits/issm/IssmAbsMat.h	(revision 14914)
@@ -20,7 +20,6 @@
 
 #include "../../shared/Exceptions/exceptions.h"
 #include "../../shared/MemOps/MemOps.h"
-#include "../../include/macros.h"
 #include "./IssmAbsVec.h"
 
 /*}}}*/
Index: ../trunk-jpl/src/c/Makefile.am
===================================================================
--- ../trunk-jpl/src/c/Makefile.am	(revision 14913)
+++ ../trunk-jpl/src/c/Makefile.am	(revision 14914)
@@ -20,7 +20,6 @@
 #Core sources{{{
 core_sources = ./issm.h\
 					./issm-binding.h\
-					./include/macros.h\
 					./include/typedefs.h\
 					./include/types.h\
 					./include/include.h\
Index: ../trunk-jpl/src/c/classes/DofIndexing.cpp
===================================================================
--- ../trunk-jpl/src/c/classes/DofIndexing.cpp	(revision 14913)
+++ ../trunk-jpl/src/c/classes/DofIndexing.cpp	(revision 14914)
@@ -14,7 +14,6 @@
 #include "../include/types.h"
 #include "../include/typedefs.h"
 #include "../io/Print/Print.h"
-#include "../include/macros.h"
 #include "../shared/Exceptions/exceptions.h"
 #include "../shared/MemOps/MemOps.h"
 #include "../EnumDefinitions/EnumDefinitions.h"
Index: ../trunk-jpl/src/c/classes/gauss/GaussTria.cpp
===================================================================
--- ../trunk-jpl/src/c/classes/gauss/GaussTria.cpp	(revision 14913)
+++ ../trunk-jpl/src/c/classes/gauss/GaussTria.cpp	(revision 14914)
@@ -3,7 +3,6 @@
  */
 
 #include "./GaussTria.h"
-#include "../../include/macros.h"
 #include "../../io/Print/Print.h"
 #include "../../shared/Exceptions/exceptions.h"
 #include "../../shared/MemOps/MemOps.h"
Index: ../trunk-jpl/src/c/classes/gauss/GaussPenta.cpp
===================================================================
--- ../trunk-jpl/src/c/classes/gauss/GaussPenta.cpp	(revision 14913)
+++ ../trunk-jpl/src/c/classes/gauss/GaussPenta.cpp	(revision 14914)
@@ -4,8 +4,8 @@
 
 #include "./GaussPenta.h"
 #include "./GaussTria.h"
-#include "../../include/macros.h"
 #include "../../io/Print/Print.h"
+#include "../../include/typedefs.h"
 #include "../../shared/Exceptions/exceptions.h"
 #include "../../shared/MemOps/MemOps.h"
 #include "../../shared/Numerics/GaussPoints.h"
Index: ../trunk-jpl/src/c/classes/ToolkitOptions.cpp
===================================================================
--- ../trunk-jpl/src/c/classes/ToolkitOptions.cpp	(revision 14913)
+++ ../trunk-jpl/src/c/classes/ToolkitOptions.cpp	(revision 14914)
@@ -11,7 +11,6 @@
 #include <string.h>
 #include "./ToolkitOptions.h"
 #include "../include/types.h"
-#include "../include/macros.h"
 #include "../shared/Exceptions/exceptions.h"
 #include "../shared/MemOps/MemOps.h"
 
Index: ../trunk-jpl/src/c/classes/objects/Bucket.h
===================================================================
--- ../trunk-jpl/src/c/classes/objects/Bucket.h	(revision 14913)
+++ ../trunk-jpl/src/c/classes/objects/Bucket.h	(revision 14914)
@@ -9,7 +9,6 @@
 /*{{{*/
 #include "./Object.h"
 #include "../../shared/MemOps/MemOps.h"
-#include "../../include/macros.h"
 #include "../../Container/DataSet.h"
 #include "../../toolkits/toolkitsenums.h"
 /*}}}*/
Index: ../trunk-jpl/src/c/classes/bamg/include.h
===================================================================
--- ../trunk-jpl/src/c/classes/bamg/include.h	(revision 14913)
+++ ../trunk-jpl/src/c/classes/bamg/include.h	(revision 14914)
@@ -5,7 +5,6 @@
 #ifndef _INCLUDE2_H_
 #define  _INCLUDE2_H_
 
-#include "../../include/macros.h"
 #include "./macros.h"
 #include "./typedefs.h"