Index: /issm/trunk-jpl/src/c/Makefile.am
===================================================================
--- /issm/trunk-jpl/src/c/Makefile.am	(revision 14913)
+++ /issm/trunk-jpl/src/c/Makefile.am	(revision 14914)
@@ -21,5 +21,4 @@
 core_sources = ./issm.h\
 					./issm-binding.h\
-					./include/macros.h\
 					./include/typedefs.h\
 					./include/types.h\
Index: /issm/trunk-jpl/src/c/classes/DofIndexing.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/DofIndexing.cpp	(revision 14913)
+++ /issm/trunk-jpl/src/c/classes/DofIndexing.cpp	(revision 14914)
@@ -15,5 +15,4 @@
 #include "../include/typedefs.h"
 #include "../io/Print/Print.h"
-#include "../include/macros.h"
 #include "../shared/Exceptions/exceptions.h"
 #include "../shared/MemOps/MemOps.h"
Index: /issm/trunk-jpl/src/c/classes/ToolkitOptions.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/ToolkitOptions.cpp	(revision 14913)
+++ /issm/trunk-jpl/src/c/classes/ToolkitOptions.cpp	(revision 14914)
@@ -12,5 +12,4 @@
 #include "./ToolkitOptions.h"
 #include "../include/types.h"
-#include "../include/macros.h"
 #include "../shared/Exceptions/exceptions.h"
 #include "../shared/MemOps/MemOps.h"
Index: /issm/trunk-jpl/src/c/classes/bamg/include.h
===================================================================
--- /issm/trunk-jpl/src/c/classes/bamg/include.h	(revision 14913)
+++ /issm/trunk-jpl/src/c/classes/bamg/include.h	(revision 14914)
@@ -6,5 +6,4 @@
 #define  _INCLUDE2_H_
 
-#include "../../include/macros.h"
 #include "./macros.h"
 #include "./typedefs.h"
Index: /issm/trunk-jpl/src/c/classes/gauss/GaussPenta.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/gauss/GaussPenta.cpp	(revision 14913)
+++ /issm/trunk-jpl/src/c/classes/gauss/GaussPenta.cpp	(revision 14914)
@@ -5,6 +5,6 @@
 #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"
Index: /issm/trunk-jpl/src/c/classes/gauss/GaussTria.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/gauss/GaussTria.cpp	(revision 14913)
+++ /issm/trunk-jpl/src/c/classes/gauss/GaussTria.cpp	(revision 14914)
@@ -4,5 +4,4 @@
 
 #include "./GaussTria.h"
-#include "../../include/macros.h"
 #include "../../io/Print/Print.h"
 #include "../../shared/Exceptions/exceptions.h"
Index: /issm/trunk-jpl/src/c/classes/objects/Bucket.h
===================================================================
--- /issm/trunk-jpl/src/c/classes/objects/Bucket.h	(revision 14913)
+++ /issm/trunk-jpl/src/c/classes/objects/Bucket.h	(revision 14914)
@@ -10,5 +10,4 @@
 #include "./Object.h"
 #include "../../shared/MemOps/MemOps.h"
-#include "../../include/macros.h"
 #include "../../Container/DataSet.h"
 #include "../../toolkits/toolkitsenums.h"
Index: /issm/trunk-jpl/src/c/include/include.h
===================================================================
--- /issm/trunk-jpl/src/c/include/include.h	(revision 14913)
+++ /issm/trunk-jpl/src/c/include/include.h	(revision 14914)
@@ -6,5 +6,4 @@
 #define  _INCLUDEGLOBAL_H_
 
-#include "./macros.h"
 #include "./typedefs.h"
 #include "./types.h"
Index: sm/trunk-jpl/src/c/include/macros.h
===================================================================
--- /issm/trunk-jpl/src/c/include/macros.h	(revision 14913)
+++ 	(revision )
@@ -1,70 +1,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: /issm/trunk-jpl/src/c/io/Comm/IssmComm.cpp
===================================================================
--- /issm/trunk-jpl/src/c/io/Comm/IssmComm.cpp	(revision 14913)
+++ /issm/trunk-jpl/src/c/io/Comm/IssmComm.cpp	(revision 14914)
@@ -11,5 +11,4 @@
 #include "./IssmComm.h"
 #include "../../include/types.h"
-#include "../../include/macros.h"
 #include "../../shared/Exceptions/exceptions.h"
 
Index: /issm/trunk-jpl/src/c/shared/Elements/PrintArrays.cpp
===================================================================
--- /issm/trunk-jpl/src/c/shared/Elements/PrintArrays.cpp	(revision 14913)
+++ /issm/trunk-jpl/src/c/shared/Elements/PrintArrays.cpp	(revision 14914)
@@ -1,5 +1,4 @@
 
 #include "./elements.h"
-#include "../../include/macros.h"
 using namespace std;
 
Index: /issm/trunk-jpl/src/c/shared/Exceptions/exceptions.h
===================================================================
--- /issm/trunk-jpl/src/c/shared/Exceptions/exceptions.h	(revision 14913)
+++ /issm/trunk-jpl/src/c/shared/Exceptions/exceptions.h	(revision 14914)
@@ -7,13 +7,72 @@
  */
 
-#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;
@@ -32,5 +91,9 @@
 
 };
+/*}}}*/
 
 char* exprintf(const char* format,...);
+
 #endif
+
+
Index: /issm/trunk-jpl/src/c/shared/Numerics/Synchronize.sh
===================================================================
--- /issm/trunk-jpl/src/c/shared/Numerics/Synchronize.sh	(revision 14913)
+++ /issm/trunk-jpl/src/c/shared/Numerics/Synchronize.sh	(revision 14914)
@@ -27,5 +27,4 @@
 #endif
 #include "./Verbosity.h"
-#include "../../include/macros.h"
 #include "../Exceptions/exceptions.h"
 /*}}}*/
Index: /issm/trunk-jpl/src/c/shared/Numerics/Verbosity.cpp
===================================================================
--- /issm/trunk-jpl/src/c/shared/Numerics/Verbosity.cpp	(revision 14913)
+++ /issm/trunk-jpl/src/c/shared/Numerics/Verbosity.cpp	(revision 14914)
@@ -16,5 +16,4 @@
 #endif
 #include "./Verbosity.h"
-#include "../../include/macros.h"
 #include "../Exceptions/exceptions.h"
 /*}}}*/
Index: /issm/trunk-jpl/src/c/shared/Sorting/binary_search.cpp
===================================================================
--- /issm/trunk-jpl/src/c/shared/Sorting/binary_search.cpp	(revision 14913)
+++ /issm/trunk-jpl/src/c/shared/Sorting/binary_search.cpp	(revision 14914)
@@ -9,5 +9,4 @@
 #endif
 
-#include "../../include/macros.h"
 #include "../Exceptions/exceptions.h"
 #include <stdio.h>
Index: /issm/trunk-jpl/src/c/toolkits/issm/IssmAbsMat.h
===================================================================
--- /issm/trunk-jpl/src/c/toolkits/issm/IssmAbsMat.h	(revision 14913)
+++ /issm/trunk-jpl/src/c/toolkits/issm/IssmAbsMat.h	(revision 14914)
@@ -21,5 +21,4 @@
 #include "../../shared/Exceptions/exceptions.h"
 #include "../../shared/MemOps/MemOps.h"
-#include "../../include/macros.h"
 #include "./IssmAbsVec.h"
 
Index: /issm/trunk-jpl/src/c/toolkits/issm/IssmAbsVec.h
===================================================================
--- /issm/trunk-jpl/src/c/toolkits/issm/IssmAbsVec.h	(revision 14913)
+++ /issm/trunk-jpl/src/c/toolkits/issm/IssmAbsVec.h	(revision 14914)
@@ -21,5 +21,4 @@
 #include "../../shared/Exceptions/exceptions.h"
 #include "../../shared/MemOps/MemOps.h"
-#include "../../include/macros.h"
 #include <math.h>
 
Index: /issm/trunk-jpl/src/c/toolkits/issm/IssmDenseMat.h
===================================================================
--- /issm/trunk-jpl/src/c/toolkits/issm/IssmDenseMat.h	(revision 14913)
+++ /issm/trunk-jpl/src/c/toolkits/issm/IssmDenseMat.h	(revision 14914)
@@ -21,5 +21,4 @@
 #include "../../shared/MemOps/MemOps.h"
 #include "../../io/Print/Print.h"
-#include "../../include/macros.h"
 #include "../../toolkits/gsl/gslincludes.h"
 
Index: /issm/trunk-jpl/src/c/toolkits/issm/IssmMat.h
===================================================================
--- /issm/trunk-jpl/src/c/toolkits/issm/IssmMat.h	(revision 14913)
+++ /issm/trunk-jpl/src/c/toolkits/issm/IssmMat.h	(revision 14914)
@@ -16,5 +16,4 @@
 #include "../../shared/Exceptions/exceptions.h"
 #include "../../shared/MemOps/MemOps.h"
-#include "../../include/macros.h"
 #include "../../classes/ToolkitOptions.h"
 #include "../../io/Comm/Comm.h"
Index: /issm/trunk-jpl/src/c/toolkits/issm/IssmMpiDenseMat.h
===================================================================
--- /issm/trunk-jpl/src/c/toolkits/issm/IssmMpiDenseMat.h	(revision 14913)
+++ /issm/trunk-jpl/src/c/toolkits/issm/IssmMpiDenseMat.h	(revision 14914)
@@ -20,5 +20,4 @@
 #include "../../shared/Exceptions/exceptions.h"
 #include "../../shared/MemOps/MemOps.h"
-#include "../../include/macros.h"
 #include "../../Container/DataSet.h"
 #include "../../io/Comm/Comm.h"
Index: /issm/trunk-jpl/src/c/toolkits/issm/IssmMpiVec.h
===================================================================
--- /issm/trunk-jpl/src/c/toolkits/issm/IssmMpiVec.h	(revision 14913)
+++ /issm/trunk-jpl/src/c/toolkits/issm/IssmMpiVec.h	(revision 14914)
@@ -20,5 +20,4 @@
 #include "../../shared/Exceptions/exceptions.h"
 #include "../../shared/MemOps/MemOps.h"
-#include "../../include/macros.h"
 #include "../../io/io.h"
 #ifdef _HAVE_MPI_
Index: /issm/trunk-jpl/src/c/toolkits/issm/IssmSeqVec.h
===================================================================
--- /issm/trunk-jpl/src/c/toolkits/issm/IssmSeqVec.h	(revision 14913)
+++ /issm/trunk-jpl/src/c/toolkits/issm/IssmSeqVec.h	(revision 14914)
@@ -20,5 +20,4 @@
 #include "../../io/Print/Print.h"
 #include "../../shared/MemOps/MemOps.h"
-#include "../../include/macros.h"
 #include <math.h>
 
Index: /issm/trunk-jpl/src/c/toolkits/issm/IssmToolkitUtils.cpp
===================================================================
--- /issm/trunk-jpl/src/c/toolkits/issm/IssmToolkitUtils.cpp	(revision 14913)
+++ /issm/trunk-jpl/src/c/toolkits/issm/IssmToolkitUtils.cpp	(revision 14914)
@@ -13,5 +13,4 @@
 #include "../../shared/MemOps/MemOps.h"
 #include "../../io/Comm/Comm.h"
-#include "../../include/macros.h"
 #include "../../classes/ToolkitOptions.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"
Index: /issm/trunk-jpl/src/c/toolkits/issm/IssmVec.h
===================================================================
--- /issm/trunk-jpl/src/c/toolkits/issm/IssmVec.h	(revision 14913)
+++ /issm/trunk-jpl/src/c/toolkits/issm/IssmVec.h	(revision 14914)
@@ -17,5 +17,4 @@
 #include "../../shared/Exceptions/exceptions.h"
 #include "../../shared/MemOps/MemOps.h"
-#include "../../include/macros.h"
 #include "./IssmToolkitUtils.h"
 #include <math.h>
Index: /issm/trunk-jpl/src/c/toolkits/mumps/MpiDenseMumpsSolve.cpp
===================================================================
--- /issm/trunk-jpl/src/c/toolkits/mumps/MpiDenseMumpsSolve.cpp	(revision 14913)
+++ /issm/trunk-jpl/src/c/toolkits/mumps/MpiDenseMumpsSolve.cpp	(revision 14914)
@@ -11,5 +11,4 @@
 
 #include "../../include/types.h"
-#include "../../include/macros.h"
 #include "../../shared/MemOps/MemOps.h"
 #include "../../shared/Exceptions/exceptions.h"