Index: issm/trunk/src/c/BamgConvertMeshx/BamgConvertMeshx.cpp
===================================================================
--- issm/trunk/src/c/BamgConvertMeshx/BamgConvertMeshx.cpp	(revision 3774)
+++ issm/trunk/src/c/BamgConvertMeshx/BamgConvertMeshx.cpp	(revision 3775)
@@ -5,5 +5,5 @@
 
 #include "../shared/shared.h"
-#include "../include/macros.h"
+#include "../include/include.h"
 #include "../toolkits/toolkits.h"
 
Index: issm/trunk/src/c/Bamgx/Bamgx.cpp
===================================================================
--- issm/trunk/src/c/Bamgx/Bamgx.cpp	(revision 3774)
+++ issm/trunk/src/c/Bamgx/Bamgx.cpp	(revision 3775)
@@ -5,5 +5,5 @@
 #include "../objects/objects.h"
 #include "../shared/shared.h"
-#include "../include/macros.h"
+#include "../include/include.h"
 #include "../toolkits/toolkits.h"
 #include "./objects/BamgObjects.h"
Index: issm/trunk/src/c/Bamgx/include/include.h
===================================================================
--- issm/trunk/src/c/Bamgx/include/include.h	(revision 3775)
+++ issm/trunk/src/c/Bamgx/include/include.h	(revision 3775)
@@ -0,0 +1,14 @@
+/*!\file: include.h
+ * \brief prototypes for include.h
+ */ 
+
+#ifndef _INCLUDE2_H_
+#define  _INCLUDE2_H_
+
+
+#include "./macros.h"
+#include "./typedefs.h"
+
+
+#endif //ifndef _INCLUDE2_H_
+
Index: issm/trunk/src/c/Bamgx/objects/CrackedEdge.h
===================================================================
--- issm/trunk/src/c/Bamgx/objects/CrackedEdge.h	(revision 3774)
+++ issm/trunk/src/c/Bamgx/objects/CrackedEdge.h	(revision 3775)
@@ -4,9 +4,9 @@
 #include "../../objects/objects.h"
 #include "../../shared/shared.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
 #include "../../toolkits/toolkits.h"
 
-#include "../include/typedefs.h"
-#include "../include/macros.h"
+#include "../include/include.h"
+#include "../include/include.h"
 #include "MeshVertex.h"
 #include "TriangleAdjacent.h"
Index: issm/trunk/src/c/Bamgx/objects/Curve.h
===================================================================
--- issm/trunk/src/c/Bamgx/objects/Curve.h	(revision 3774)
+++ issm/trunk/src/c/Bamgx/objects/Curve.h	(revision 3775)
@@ -4,9 +4,9 @@
 #include "../../objects/objects.h"
 #include "../../shared/shared.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
 #include "../../toolkits/toolkits.h"
 
-#include "../include/typedefs.h"
-#include "../include/macros.h"
+#include "../include/include.h"
+#include "../include/include.h"
 #include "../shared/shared.h"
 #include "GeometricalEdge.h"
Index: issm/trunk/src/c/Bamgx/objects/Direction.h
===================================================================
--- issm/trunk/src/c/Bamgx/objects/Direction.h	(revision 3774)
+++ issm/trunk/src/c/Bamgx/objects/Direction.h	(revision 3775)
@@ -2,6 +2,6 @@
 #define _DIRECTION_H_
 
-#include "../include/typedefs.h"
-#include "../include/macros.h"
+#include "../include/include.h"
+#include "../include/include.h"
 #include "../shared/shared.h"
 
Index: issm/trunk/src/c/Bamgx/objects/DoubleAndInt.h
===================================================================
--- issm/trunk/src/c/Bamgx/objects/DoubleAndInt.h	(revision 3774)
+++ issm/trunk/src/c/Bamgx/objects/DoubleAndInt.h	(revision 3775)
@@ -2,6 +2,6 @@
 #define _DOUBLEANDINT_H_
 
-#include "../include/typedefs.h"
-#include "../include/macros.h"
+#include "../include/include.h"
+#include "../include/include.h"
 
 namespace bamg {
Index: issm/trunk/src/c/Bamgx/objects/Edge.h
===================================================================
--- issm/trunk/src/c/Bamgx/objects/Edge.h	(revision 3774)
+++ issm/trunk/src/c/Bamgx/objects/Edge.h	(revision 3775)
@@ -4,9 +4,9 @@
 #include "../../objects/objects.h"
 #include "../../shared/shared.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
 #include "../../toolkits/toolkits.h"
 
-#include "../include/typedefs.h"
-#include "../include/macros.h"
+#include "../include/include.h"
+#include "../include/include.h"
 #include "MeshVertex.h"
 #include "TriangleAdjacent.h"
Index: issm/trunk/src/c/Bamgx/objects/GeometricalEdge.h
===================================================================
--- issm/trunk/src/c/Bamgx/objects/GeometricalEdge.h	(revision 3774)
+++ issm/trunk/src/c/Bamgx/objects/GeometricalEdge.h	(revision 3775)
@@ -4,9 +4,9 @@
 #include "../../objects/objects.h"
 #include "../../shared/shared.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
 #include "../../toolkits/toolkits.h"
 
-#include "../include/typedefs.h"
-#include "../include/macros.h"
+#include "../include/include.h"
+#include "../include/include.h"
 #include "Edge.h"
 #include "GeometricalVertex.h"
Index: issm/trunk/src/c/Bamgx/objects/GeometricalSubDomain.h
===================================================================
--- issm/trunk/src/c/Bamgx/objects/GeometricalSubDomain.h	(revision 3774)
+++ issm/trunk/src/c/Bamgx/objects/GeometricalSubDomain.h	(revision 3775)
@@ -4,9 +4,9 @@
 #include "../../objects/objects.h"
 #include "../../shared/shared.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
 #include "../../toolkits/toolkits.h"
 
-#include "../include/typedefs.h"
-#include "../include/macros.h"
+#include "../include/include.h"
+#include "../include/include.h"
 #include "GeometricalEdge.h"
 
Index: issm/trunk/src/c/Bamgx/objects/GeometricalVertex.h
===================================================================
--- issm/trunk/src/c/Bamgx/objects/GeometricalVertex.h	(revision 3774)
+++ issm/trunk/src/c/Bamgx/objects/GeometricalVertex.h	(revision 3775)
@@ -4,9 +4,9 @@
 #include "../../objects/objects.h"
 #include "../../shared/shared.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
 #include "../../toolkits/toolkits.h"
 
-#include "../include/typedefs.h"
-#include "../include/macros.h"
+#include "../include/include.h"
+#include "../include/include.h"
 #include "MeshVertex.h"
 
Index: issm/trunk/src/c/Bamgx/objects/Geometry.h
===================================================================
--- issm/trunk/src/c/Bamgx/objects/Geometry.h	(revision 3774)
+++ issm/trunk/src/c/Bamgx/objects/Geometry.h	(revision 3775)
@@ -4,9 +4,9 @@
 #include "../../objects/objects.h"
 #include "../../shared/shared.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
 #include "../../toolkits/toolkits.h"
 
-#include "../include/typedefs.h"
-#include "../include/macros.h"
+#include "../include/include.h"
+#include "../include/include.h"
 #include "MeshVertex.h"
 #include "Edge.h"
Index: issm/trunk/src/c/Bamgx/objects/ListofIntersectionTriangles.h
===================================================================
--- issm/trunk/src/c/Bamgx/objects/ListofIntersectionTriangles.h	(revision 3774)
+++ issm/trunk/src/c/Bamgx/objects/ListofIntersectionTriangles.h	(revision 3775)
@@ -4,9 +4,9 @@
 #include "../../objects/objects.h"
 #include "../../shared/shared.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
 #include "../../toolkits/toolkits.h"
 
-#include "../include/typedefs.h"
-#include "../include/macros.h"
+#include "../include/include.h"
+#include "../include/include.h"
 #include "Metric.h"
 #include "MeshVertex.h"
Index: issm/trunk/src/c/Bamgx/objects/MeshVertex.h
===================================================================
--- issm/trunk/src/c/Bamgx/objects/MeshVertex.h	(revision 3774)
+++ issm/trunk/src/c/Bamgx/objects/MeshVertex.h	(revision 3775)
@@ -4,9 +4,9 @@
 #include "../../objects/objects.h"
 #include "../../shared/shared.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
 #include "../../toolkits/toolkits.h"
 
-#include "../include/typedefs.h"
-#include "../include/macros.h"
+#include "../include/include.h"
+#include "../include/include.h"
 #include "Direction.h"
 #include "Metric.h"
Index: issm/trunk/src/c/Bamgx/objects/Metric.h
===================================================================
--- issm/trunk/src/c/Bamgx/objects/Metric.h	(revision 3774)
+++ issm/trunk/src/c/Bamgx/objects/Metric.h	(revision 3775)
@@ -4,9 +4,9 @@
 #include "../../objects/objects.h"
 #include "../../shared/shared.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
 #include "../../toolkits/toolkits.h"
 
-#include "../include/typedefs.h"
-#include "../include/macros.h"
+#include "../include/include.h"
+#include "../include/include.h"
 #include "../shared/shared.h"
 #include "R2.h"
Index: issm/trunk/src/c/Bamgx/objects/QuadTree.h
===================================================================
--- issm/trunk/src/c/Bamgx/objects/QuadTree.h	(revision 3774)
+++ issm/trunk/src/c/Bamgx/objects/QuadTree.h	(revision 3775)
@@ -4,9 +4,9 @@
 
 #include "../../shared/shared.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
 #include "../../toolkits/toolkits.h"
 
-#include "../include/typedefs.h"
-#include "../include/macros.h"
+#include "../include/include.h"
+#include "../include/include.h"
 
 namespace bamg {
Index: issm/trunk/src/c/Bamgx/objects/SubDomain.h
===================================================================
--- issm/trunk/src/c/Bamgx/objects/SubDomain.h	(revision 3774)
+++ issm/trunk/src/c/Bamgx/objects/SubDomain.h	(revision 3775)
@@ -4,9 +4,9 @@
 #include "../../objects/objects.h"
 #include "../../shared/shared.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
 #include "../../toolkits/toolkits.h"
 
-#include "../include/typedefs.h"
-#include "../include/macros.h"
+#include "../include/include.h"
+#include "../include/include.h"
 #include "Edge.h"
 #include "Triangle.h"
Index: issm/trunk/src/c/Bamgx/objects/Triangle.h
===================================================================
--- issm/trunk/src/c/Bamgx/objects/Triangle.h	(revision 3774)
+++ issm/trunk/src/c/Bamgx/objects/Triangle.h	(revision 3775)
@@ -4,9 +4,9 @@
 #include "../../objects/objects.h"
 #include "../../shared/shared.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
 #include "../../toolkits/toolkits.h"
 
-#include "../include/typedefs.h"
-#include "../include/macros.h"
+#include "../include/include.h"
+#include "../include/include.h"
 #include "MeshVertex.h"
 #include "TriangleAdjacent.h"
Index: issm/trunk/src/c/Bamgx/objects/TriangleAdjacent.h
===================================================================
--- issm/trunk/src/c/Bamgx/objects/TriangleAdjacent.h	(revision 3774)
+++ issm/trunk/src/c/Bamgx/objects/TriangleAdjacent.h	(revision 3775)
@@ -4,9 +4,9 @@
 #include "../../objects/objects.h"
 #include "../../shared/shared.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
 #include "../../toolkits/toolkits.h"
 
-#include "../include/typedefs.h"
-#include "../include/macros.h"
+#include "../include/include.h"
+#include "../include/include.h"
 #include "MeshVertex.h"
 
Index: issm/trunk/src/c/Bamgx/objects/Triangles.h
===================================================================
--- issm/trunk/src/c/Bamgx/objects/Triangles.h	(revision 3774)
+++ issm/trunk/src/c/Bamgx/objects/Triangles.h	(revision 3775)
@@ -4,9 +4,9 @@
 #include "../../objects/objects.h"
 #include "../../shared/shared.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
 #include "../../toolkits/toolkits.h"
 
-#include "../include/typedefs.h"
-#include "../include/macros.h"
+#include "../include/include.h"
+#include "../include/include.h"
 #include "../shared/shared.h"
 #include "Metric.h"
Index: issm/trunk/src/c/Bamgx/objects/VertexOnEdge.h
===================================================================
--- issm/trunk/src/c/Bamgx/objects/VertexOnEdge.h	(revision 3774)
+++ issm/trunk/src/c/Bamgx/objects/VertexOnEdge.h	(revision 3775)
@@ -4,9 +4,9 @@
 #include "../../objects/objects.h"
 #include "../../shared/shared.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
 #include "../../toolkits/toolkits.h"
 
-#include "../include/typedefs.h"
-#include "../include/macros.h"
+#include "../include/include.h"
+#include "../include/include.h"
 #include "MeshVertex.h"
 #include "Edge.h"
Index: issm/trunk/src/c/Bamgx/objects/VertexOnGeom.h
===================================================================
--- issm/trunk/src/c/Bamgx/objects/VertexOnGeom.h	(revision 3774)
+++ issm/trunk/src/c/Bamgx/objects/VertexOnGeom.h	(revision 3775)
@@ -4,9 +4,9 @@
 #include "../../objects/objects.h"
 #include "../../shared/shared.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
 #include "../../toolkits/toolkits.h"
 
-#include "../include/typedefs.h"
-#include "../include/macros.h"
+#include "../include/include.h"
+#include "../include/include.h"
 #include "MeshVertex.h"
 #include "GeometricalVertex.h"
Index: issm/trunk/src/c/Bamgx/objects/VertexOnVertex.h
===================================================================
--- issm/trunk/src/c/Bamgx/objects/VertexOnVertex.h	(revision 3774)
+++ issm/trunk/src/c/Bamgx/objects/VertexOnVertex.h	(revision 3775)
@@ -4,9 +4,9 @@
 #include "../../objects/objects.h"
 #include "../../shared/shared.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
 #include "../../toolkits/toolkits.h"
 
-#include "../include/typedefs.h"
-#include "../include/macros.h"
+#include "../include/include.h"
+#include "../include/include.h"
 #include "MeshVertex.h"
 
Index: issm/trunk/src/c/Bamgx/shared/OppositeAngle.h
===================================================================
--- issm/trunk/src/c/Bamgx/shared/OppositeAngle.h	(revision 3774)
+++ issm/trunk/src/c/Bamgx/shared/OppositeAngle.h	(revision 3775)
@@ -2,5 +2,5 @@
 #define _OPPOSITEANGLE_H_
 
-#include "../include/macros.h"
+#include "../include/include.h"
 
 /*Return the opposite angle modulo 2 Pi*/
Index: issm/trunk/src/c/Bamgx/shared/det.h
===================================================================
--- issm/trunk/src/c/Bamgx/shared/det.h	(revision 3774)
+++ issm/trunk/src/c/Bamgx/shared/det.h	(revision 3775)
@@ -2,5 +2,5 @@
 #define _BAMGDET_H_
 
-#include "../include/typedefs.h"
+#include "../include/include.h"
 
 namespace bamg {
Index: issm/trunk/src/c/BuildNodeSetsx/BuildNodeSetsx.cpp
===================================================================
--- issm/trunk/src/c/BuildNodeSetsx/BuildNodeSetsx.cpp	(revision 3774)
+++ issm/trunk/src/c/BuildNodeSetsx/BuildNodeSetsx.cpp	(revision 3775)
@@ -6,5 +6,5 @@
 
 #include "../shared/shared.h"
-#include "../include/macros.h"
+#include "../include/include.h"
 #include "../toolkits/toolkits.h"
 #include "../EnumDefinitions/EnumDefinitions.h"
Index: issm/trunk/src/c/BuildNodeSetsx/PartitionSets.cpp
===================================================================
--- issm/trunk/src/c/BuildNodeSetsx/PartitionSets.cpp	(revision 3774)
+++ issm/trunk/src/c/BuildNodeSetsx/PartitionSets.cpp	(revision 3775)
@@ -5,5 +5,5 @@
 #include "stdio.h"
 #include "../shared/shared.h"
-#include "../include/macros.h"
+#include "../include/include.h"
 
 void PartitionSets(Vec* ppartitionb, Vec* ppartitionc,Vec flags_a,Vec flags_b,Vec flags_c,int gsize){
Index: issm/trunk/src/c/ComputeBasalStressx/ComputeBasalStressx.cpp
===================================================================
--- issm/trunk/src/c/ComputeBasalStressx/ComputeBasalStressx.cpp	(revision 3774)
+++ issm/trunk/src/c/ComputeBasalStressx/ComputeBasalStressx.cpp	(revision 3775)
@@ -6,5 +6,5 @@
 
 #include "../shared/shared.h"
-#include "../include/macros.h"
+#include "../include/include.h"
 #include "../toolkits/toolkits.h"
 #include "../EnumDefinitions/EnumDefinitions.h"
Index: issm/trunk/src/c/ComputePressurex/ComputePressurex.cpp
===================================================================
--- issm/trunk/src/c/ComputePressurex/ComputePressurex.cpp	(revision 3774)
+++ issm/trunk/src/c/ComputePressurex/ComputePressurex.cpp	(revision 3775)
@@ -6,5 +6,5 @@
 
 #include "../shared/shared.h"
-#include "../include/macros.h"
+#include "../include/include.h"
 #include "../toolkits/toolkits.h"
 #include "../EnumDefinitions/EnumDefinitions.h"
Index: issm/trunk/src/c/ComputeStrainRatex/ComputeStrainRatex.cpp
===================================================================
--- issm/trunk/src/c/ComputeStrainRatex/ComputeStrainRatex.cpp	(revision 3774)
+++ issm/trunk/src/c/ComputeStrainRatex/ComputeStrainRatex.cpp	(revision 3775)
@@ -6,5 +6,5 @@
 
 #include "../shared/shared.h"
-#include "../include/macros.h"
+#include "../include/include.h"
 #include "../toolkits/toolkits.h"
 #include "../EnumDefinitions/EnumDefinitions.h"
Index: issm/trunk/src/c/ConfigureObjectsx/ConfigureObjectsx.cpp
===================================================================
--- issm/trunk/src/c/ConfigureObjectsx/ConfigureObjectsx.cpp	(revision 3774)
+++ issm/trunk/src/c/ConfigureObjectsx/ConfigureObjectsx.cpp	(revision 3775)
@@ -6,5 +6,5 @@
 
 #include "../shared/shared.h"
-#include "../include/macros.h"
+#include "../include/include.h"
 #include "../toolkits/toolkits.h"
 #include "../EnumDefinitions/EnumDefinitions.h"
Index: issm/trunk/src/c/ControlConstrainx/ControlConstrainx.cpp
===================================================================
--- issm/trunk/src/c/ControlConstrainx/ControlConstrainx.cpp	(revision 3774)
+++ issm/trunk/src/c/ControlConstrainx/ControlConstrainx.cpp	(revision 3775)
@@ -6,5 +6,5 @@
 
 #include "../shared/shared.h"
-#include "../include/macros.h"
+#include "../include/include.h"
 #include "../toolkits/toolkits.h"
 #include "../EnumDefinitions/EnumDefinitions.h"
Index: issm/trunk/src/c/CostFunctionx/CostFunctionx.cpp
===================================================================
--- issm/trunk/src/c/CostFunctionx/CostFunctionx.cpp	(revision 3774)
+++ issm/trunk/src/c/CostFunctionx/CostFunctionx.cpp	(revision 3775)
@@ -6,5 +6,5 @@
 
 #include "../shared/shared.h"
-#include "../include/macros.h"
+#include "../include/include.h"
 #include "../toolkits/toolkits.h"
 #include "../EnumDefinitions/EnumDefinitions.h"
Index: issm/trunk/src/c/DataSet/DataSet.cpp
===================================================================
--- issm/trunk/src/c/DataSet/DataSet.cpp	(revision 3774)
+++ issm/trunk/src/c/DataSet/DataSet.cpp	(revision 3775)
@@ -19,5 +19,5 @@
 #include "../objects/objects.h"
 #include "../shared/shared.h"
-#include "../include/macros.h"
+#include "../include/include.h"
 #include "../EnumDefinitions/EnumDefinitions.h"
 
Index: issm/trunk/src/c/DataSet/Inputs.cpp
===================================================================
--- issm/trunk/src/c/DataSet/Inputs.cpp	(revision 3774)
+++ issm/trunk/src/c/DataSet/Inputs.cpp	(revision 3775)
@@ -18,5 +18,5 @@
 #include "./DataSet.h"
 #include "../shared/shared.h"
-#include "../include/macros.h"
+#include "../include/include.h"
 #include "../EnumDefinitions/EnumDefinitions.h"
 
Index: issm/trunk/src/c/DataSet/Parameters.cpp
===================================================================
--- issm/trunk/src/c/DataSet/Parameters.cpp	(revision 3774)
+++ issm/trunk/src/c/DataSet/Parameters.cpp	(revision 3775)
@@ -18,5 +18,5 @@
 #include "./DataSet.h"
 #include "../shared/shared.h"
-#include "../include/macros.h"
+#include "../include/include.h"
 #include "../EnumDefinitions/EnumDefinitions.h"
 
Index: issm/trunk/src/c/Dofx/Dofx.cpp
===================================================================
--- issm/trunk/src/c/Dofx/Dofx.cpp	(revision 3774)
+++ issm/trunk/src/c/Dofx/Dofx.cpp	(revision 3775)
@@ -6,5 +6,5 @@
 
 #include "../shared/shared.h"
-#include "../include/macros.h"
+#include "../include/include.h"
 #include "../toolkits/toolkits.h"
 #include "../EnumDefinitions/EnumDefinitions.h"
Index: issm/trunk/src/c/Dux/Dux.cpp
===================================================================
--- issm/trunk/src/c/Dux/Dux.cpp	(revision 3774)
+++ issm/trunk/src/c/Dux/Dux.cpp	(revision 3775)
@@ -6,5 +6,5 @@
 
 #include "../shared/shared.h"
-#include "../include/macros.h"
+#include "../include/include.h"
 #include "../toolkits/toolkits.h"
 #include "../EnumDefinitions/EnumDefinitions.h"
Index: issm/trunk/src/c/ElementConnectivityx/ElementConnectivityx.cpp
===================================================================
--- issm/trunk/src/c/ElementConnectivityx/ElementConnectivityx.cpp	(revision 3774)
+++ issm/trunk/src/c/ElementConnectivityx/ElementConnectivityx.cpp	(revision 3775)
@@ -11,5 +11,5 @@
 
 #include "../shared/shared.h"
-#include "../include/macros.h"
+#include "../include/include.h"
 #include "../toolkits/toolkits.h"
 #include "../EnumDefinitions/EnumDefinitions.h"
Index: issm/trunk/src/c/EnumDefinitions/EnumAsString.cpp
===================================================================
--- issm/trunk/src/c/EnumDefinitions/EnumAsString.cpp	(revision 3774)
+++ issm/trunk/src/c/EnumDefinitions/EnumAsString.cpp	(revision 3775)
@@ -9,5 +9,5 @@
 
 #include "../shared/shared.h"
-#include "../include/macros.h"
+#include "../include/include.h"
 #include "./EnumDefinitions.h"
 
Index: issm/trunk/src/c/EnumDefinitions/StringAsEnum.cpp
===================================================================
--- issm/trunk/src/c/EnumDefinitions/StringAsEnum.cpp	(revision 3774)
+++ issm/trunk/src/c/EnumDefinitions/StringAsEnum.cpp	(revision 3775)
@@ -9,5 +9,5 @@
 
 #include "../shared/shared.h"
-#include "../include/macros.h"
+#include "../include/include.h"
 #include "./EnumDefinitions.h"
 
Index: issm/trunk/src/c/FieldAverageOntoVerticesx/FieldAverageOntoVerticesx.cpp
===================================================================
--- issm/trunk/src/c/FieldAverageOntoVerticesx/FieldAverageOntoVerticesx.cpp	(revision 3774)
+++ issm/trunk/src/c/FieldAverageOntoVerticesx/FieldAverageOntoVerticesx.cpp	(revision 3775)
@@ -6,5 +6,5 @@
 
 #include "../shared/shared.h"
-#include "../include/macros.h"
+#include "../include/include.h"
 #include "../toolkits/toolkits.h"
 #include "../EnumDefinitions/EnumDefinitions.h"
Index: issm/trunk/src/c/FieldDepthAveragex/FieldDepthAveragex.cpp
===================================================================
--- issm/trunk/src/c/FieldDepthAveragex/FieldDepthAveragex.cpp	(revision 3774)
+++ issm/trunk/src/c/FieldDepthAveragex/FieldDepthAveragex.cpp	(revision 3775)
@@ -6,5 +6,5 @@
 
 #include "../shared/shared.h"
-#include "../include/macros.h"
+#include "../include/include.h"
 #include "../toolkits/toolkits.h"
 #include "../EnumDefinitions/EnumDefinitions.h"
Index: issm/trunk/src/c/FieldExtrudex/FieldExtrudex.cpp
===================================================================
--- issm/trunk/src/c/FieldExtrudex/FieldExtrudex.cpp	(revision 3774)
+++ issm/trunk/src/c/FieldExtrudex/FieldExtrudex.cpp	(revision 3775)
@@ -6,5 +6,5 @@
 
 #include "../shared/shared.h"
-#include "../include/macros.h"
+#include "../include/include.h"
 #include "../toolkits/toolkits.h"
 #include "../EnumDefinitions/EnumDefinitions.h"
Index: issm/trunk/src/c/Gradjx/Gradjx.cpp
===================================================================
--- issm/trunk/src/c/Gradjx/Gradjx.cpp	(revision 3774)
+++ issm/trunk/src/c/Gradjx/Gradjx.cpp	(revision 3775)
@@ -6,5 +6,5 @@
 
 #include "../shared/shared.h"
-#include "../include/macros.h"
+#include "../include/include.h"
 #include "../toolkits/toolkits.h"
 #include "../EnumDefinitions/EnumDefinitions.h"
Index: issm/trunk/src/c/InterpFromGridToMeshx/InterpFromGridToMeshx.cpp
===================================================================
--- issm/trunk/src/c/InterpFromGridToMeshx/InterpFromGridToMeshx.cpp	(revision 3774)
+++ issm/trunk/src/c/InterpFromGridToMeshx/InterpFromGridToMeshx.cpp	(revision 3775)
@@ -11,5 +11,5 @@
 #include "./InterpFromGridToMeshx.h"
 #include "../shared/shared.h"
-#include "../include/macros.h"
+#include "../include/include.h"
 
 int InterpFromGridToMeshx( Vec* pdata_mesh,double* x_in, int x_rows, double* y_in, int y_rows, double* data, int M, int N, double* x_mesh, double* y_mesh, int nods,double default_value) {
Index: issm/trunk/src/c/InterpFromMeshToGridx/InterpFromMeshToGridx.cpp
===================================================================
--- issm/trunk/src/c/InterpFromMeshToGridx/InterpFromMeshToGridx.cpp	(revision 3774)
+++ issm/trunk/src/c/InterpFromMeshToGridx/InterpFromMeshToGridx.cpp	(revision 3775)
@@ -5,5 +5,5 @@
 #include "./InterpFromMeshToGridx.h"
 #include "../shared/shared.h"
-#include "../include/macros.h"
+#include "../include/include.h"
 
 void InterpFromMeshToGridx(double** px_m,double** py_m,double** pgriddata,double* index_mesh, double* x_mesh, double* y_mesh, int nods,int nels, double* data_mesh, int data_length, double cornereast,double cornernorth,double xposting,double yposting,int nlines,int ncols,double default_value) {
Index: issm/trunk/src/c/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp
===================================================================
--- issm/trunk/src/c/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp	(revision 3774)
+++ issm/trunk/src/c/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp	(revision 3775)
@@ -5,5 +5,5 @@
 
 #include "../shared/shared.h"
-#include "../include/macros.h"
+#include "../include/include.h"
 #include "../toolkits/toolkits.h"
 
Index: issm/trunk/src/c/InterpFromMeshToMesh3dx/InterpFromMeshToMesh3dx.cpp
===================================================================
--- issm/trunk/src/c/InterpFromMeshToMesh3dx/InterpFromMeshToMesh3dx.cpp	(revision 3774)
+++ issm/trunk/src/c/InterpFromMeshToMesh3dx/InterpFromMeshToMesh3dx.cpp	(revision 3775)
@@ -5,5 +5,5 @@
 #include "./InterpFromMeshToMesh3dx.h"
 #include "../shared/shared.h"
-#include "../include/macros.h"
+#include "../include/include.h"
 
 int InterpFromMeshToMesh3dx( Vec* pdata_prime,double* index_data, double* x_data, double* y_data, double* z_data, int nods_data,int nels_data, double* data, int data_length, double* x_prime, double* y_prime, double* z_prime, int nods_prime,double default_value) {
Index: issm/trunk/src/c/Makefile.am
===================================================================
--- issm/trunk/src/c/Makefile.am	(revision 3774)
+++ issm/trunk/src/c/Makefile.am	(revision 3775)
@@ -21,5 +21,10 @@
 
 #Serial compilation
-libISSM_a_SOURCES = ./objects/objects.h\
+libISSM_a_SOURCES = ./include/macros.h\
+					./include/typedefs.h\
+					./include/types.h\
+					./include/globals.h\
+					./include/include.h\
+					./objects/objects.h\
 					./objects/Object.h\
 					./objects/Bamg/BamgGeom.h\
@@ -152,6 +157,4 @@
 					./shared/Numerics/OptFunc.cpp\
 					./shared/Numerics/extrema.cpp\
-					./shared/Numerics/SplitSolutionVector.h\
-					./shared/Numerics/SplitSolutionVector.cpp\
 					./shared/Exceptions/exceptions.h\
 					./shared/Exceptions/Exceptions.cpp\
@@ -380,4 +383,5 @@
 					./Bamgx/Bamgx.cpp\
 					./Bamgx/Bamgx.h\
+					./Bamgx/include/include.h \
 					./Bamgx/include/macros.h \
 					./Bamgx/include/typedefs.h \
@@ -450,5 +454,10 @@
 
 #Parallel compilation
-libpISSM_a_SOURCES = ./objects/objects.h\
+libpISSM_a_SOURCES = ./include/macros.h\
+					./include/typedefs.h\
+					./include/types.h\
+					./include/globals.h\
+					./include/include.h\
+					./objects/objects.h\
 					./objects/Object.h\
 					./objects/Bamg/BamgGeom.h\
@@ -712,6 +721,6 @@
 					./Gradjx/Gradjx.h\
 					./Gradjx/Gradjx.cpp\
-					./shared/Numerics/SplitSolutionVector.h\
-					./shared/Numerics/SplitSolutionVector.cpp\
+					./SplitSolutionVectorx/SplitSolutionVectorx.h\
+					./SplitSolutionVectorx/SplitSolutionVectorx.cpp\
 					./UpdateInputsFromSolutionx/UpdateInputsFromSolutionx.h\
 					./UpdateInputsFromSolutionx/UpdateInputsFromSolutionx.cpp\
@@ -822,4 +831,5 @@
 					./Bamgx/Bamgx.cpp\
 					./Bamgx/Bamgx.h\
+					./Bamgx/include/include.h \
 					./Bamgx/include/macros.h \
 					./Bamgx/include/typedefs.h \
Index: issm/trunk/src/c/MassFluxx/MassFluxx.cpp
===================================================================
--- issm/trunk/src/c/MassFluxx/MassFluxx.cpp	(revision 3774)
+++ issm/trunk/src/c/MassFluxx/MassFluxx.cpp	(revision 3775)
@@ -6,5 +6,5 @@
 
 #include "../shared/shared.h"
-#include "../include/macros.h"
+#include "../include/include.h"
 #include "../toolkits/toolkits.h"
 #include "../EnumDefinitions/EnumDefinitions.h"
Index: issm/trunk/src/c/MeshPartitionx/MeshPartitionx.cpp
===================================================================
--- issm/trunk/src/c/MeshPartitionx/MeshPartitionx.cpp	(revision 3774)
+++ issm/trunk/src/c/MeshPartitionx/MeshPartitionx.cpp	(revision 3775)
@@ -5,5 +5,5 @@
 #include "./MeshPartitionx.h"
 #include "../shared/shared.h"
-#include "../include/macros.h"
+#include "../include/include.h"
 #include "../toolkits/toolkits.h"
 #include "../EnumDefinitions/EnumDefinitions.h"
Index: issm/trunk/src/c/Misfitx/Misfitx.cpp
===================================================================
--- issm/trunk/src/c/Misfitx/Misfitx.cpp	(revision 3774)
+++ issm/trunk/src/c/Misfitx/Misfitx.cpp	(revision 3775)
@@ -6,5 +6,5 @@
 
 #include "../shared/shared.h"
-#include "../include/macros.h"
+#include "../include/include.h"
 #include "../toolkits/toolkits.h"
 #include "../EnumDefinitions/EnumDefinitions.h"
Index: issm/trunk/src/c/ModelProcessorx/Balancedthickness/CreateElementsNodesAndMaterialsBalancedthickness.cpp
===================================================================
--- issm/trunk/src/c/ModelProcessorx/Balancedthickness/CreateElementsNodesAndMaterialsBalancedthickness.cpp	(revision 3774)
+++ issm/trunk/src/c/ModelProcessorx/Balancedthickness/CreateElementsNodesAndMaterialsBalancedthickness.cpp	(revision 3775)
@@ -9,5 +9,5 @@
 #include "../../objects/objects.h"
 #include "../../shared/shared.h"
-#include "../../include/typedefs.h"
+#include "../../include/include.h"
 #include "../../MeshPartitionx/MeshPartitionx.h"
 #include "../ModelProcessorx.h"
Index: issm/trunk/src/c/ModelProcessorx/Balancedthickness/CreateLoadsBalancedthickness.cpp
===================================================================
--- issm/trunk/src/c/ModelProcessorx/Balancedthickness/CreateLoadsBalancedthickness.cpp	(revision 3774)
+++ issm/trunk/src/c/ModelProcessorx/Balancedthickness/CreateLoadsBalancedthickness.cpp	(revision 3775)
@@ -8,5 +8,5 @@
 #include "../../objects/objects.h"
 #include "../../shared/shared.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
 #include "../ModelProcessorx.h"
 
Index: issm/trunk/src/c/ModelProcessorx/Balancedthickness2/CreateElementsNodesAndMaterialsBalancedthickness2.cpp
===================================================================
--- issm/trunk/src/c/ModelProcessorx/Balancedthickness2/CreateElementsNodesAndMaterialsBalancedthickness2.cpp	(revision 3774)
+++ issm/trunk/src/c/ModelProcessorx/Balancedthickness2/CreateElementsNodesAndMaterialsBalancedthickness2.cpp	(revision 3775)
@@ -9,6 +9,6 @@
 #include "../../objects/objects.h"
 #include "../../shared/shared.h"
-#include "../../include/macros.h"
-#include "../../include/typedefs.h"
+#include "../../include/include.h"
+#include "../../include/include.h"
 #include "../../MeshPartitionx/MeshPartitionx.h"
 #include "../ModelProcessorx.h"
Index: issm/trunk/src/c/ModelProcessorx/Balancedthickness2/CreateLoadsBalancedthickness2.cpp
===================================================================
--- issm/trunk/src/c/ModelProcessorx/Balancedthickness2/CreateLoadsBalancedthickness2.cpp	(revision 3774)
+++ issm/trunk/src/c/ModelProcessorx/Balancedthickness2/CreateLoadsBalancedthickness2.cpp	(revision 3775)
@@ -8,6 +8,6 @@
 #include "../../objects/objects.h"
 #include "../../shared/shared.h"
-#include "../../include/macros.h"
-#include "../../include/typedefs.h"
+#include "../../include/include.h"
+#include "../../include/include.h"
 #include "../ModelProcessorx.h"
 
Index: issm/trunk/src/c/ModelProcessorx/Balancedvelocities/CreateElementsNodesAndMaterialsBalancedvelocities.cpp
===================================================================
--- issm/trunk/src/c/ModelProcessorx/Balancedvelocities/CreateElementsNodesAndMaterialsBalancedvelocities.cpp	(revision 3774)
+++ issm/trunk/src/c/ModelProcessorx/Balancedvelocities/CreateElementsNodesAndMaterialsBalancedvelocities.cpp	(revision 3775)
@@ -10,5 +10,5 @@
 #include "../../shared/shared.h"
 #include "../../MeshPartitionx/MeshPartitionx.h"
-#include "../../include/typedefs.h"
+#include "../../include/include.h"
 #include "../ModelProcessorx.h"
 
Index: issm/trunk/src/c/ModelProcessorx/Balancedvelocities/CreateLoadsBalancedvelocities.cpp
===================================================================
--- issm/trunk/src/c/ModelProcessorx/Balancedvelocities/CreateLoadsBalancedvelocities.cpp	(revision 3774)
+++ issm/trunk/src/c/ModelProcessorx/Balancedvelocities/CreateLoadsBalancedvelocities.cpp	(revision 3775)
@@ -8,5 +8,5 @@
 #include "../../objects/objects.h"
 #include "../../shared/shared.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
 #include "../ModelProcessorx.h"
 
Index: issm/trunk/src/c/ModelProcessorx/Control/CreateParametersControl.cpp
===================================================================
--- issm/trunk/src/c/ModelProcessorx/Control/CreateParametersControl.cpp	(revision 3774)
+++ issm/trunk/src/c/ModelProcessorx/Control/CreateParametersControl.cpp	(revision 3775)
@@ -9,5 +9,5 @@
 #include "../../objects/objects.h"
 #include "../../shared/shared.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
 #include "../ModelProcessorx.h"
 
Index: issm/trunk/src/c/ModelProcessorx/CreateDataSets.cpp
===================================================================
--- issm/trunk/src/c/ModelProcessorx/CreateDataSets.cpp	(revision 3774)
+++ issm/trunk/src/c/ModelProcessorx/CreateDataSets.cpp	(revision 3775)
@@ -11,5 +11,5 @@
 #include "../objects/objects.h"
 #include "../shared/shared.h"
-#include "../include/macros.h"
+#include "../include/include.h"
 #include "../EnumDefinitions/EnumDefinitions.h"
 #include "./ModelProcessorx/ModelProcessorx.h"
Index: issm/trunk/src/c/ModelProcessorx/CreateSingleNodeToElementConnectivity.cpp
===================================================================
--- issm/trunk/src/c/ModelProcessorx/CreateSingleNodeToElementConnectivity.cpp	(revision 3774)
+++ issm/trunk/src/c/ModelProcessorx/CreateSingleNodeToElementConnectivity.cpp	(revision 3775)
@@ -11,6 +11,6 @@
 #include "../shared/shared.h"
 #include "../io/io.h"
-#include "../include/macros.h"
-#include "../include/typedefs.h"
+#include "../include/include.h"
+#include "../include/include.h"
 #include "./ModelProcessorx.h"
 
Index: issm/trunk/src/c/ModelProcessorx/DiagnosticHoriz/CreateElementsNodesAndMaterialsDiagnosticHoriz.cpp
===================================================================
--- issm/trunk/src/c/ModelProcessorx/DiagnosticHoriz/CreateElementsNodesAndMaterialsDiagnosticHoriz.cpp	(revision 3774)
+++ issm/trunk/src/c/ModelProcessorx/DiagnosticHoriz/CreateElementsNodesAndMaterialsDiagnosticHoriz.cpp	(revision 3775)
@@ -10,5 +10,5 @@
 #include "../../shared/shared.h"
 #include "../../MeshPartitionx/MeshPartitionx.h"
-#include "../../include/typedefs.h"
+#include "../../include/include.h"
 #include "../ModelProcessorx.h"
 
Index: issm/trunk/src/c/ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp
===================================================================
--- issm/trunk/src/c/ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp	(revision 3774)
+++ issm/trunk/src/c/ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp	(revision 3775)
@@ -8,5 +8,5 @@
 #include "../../objects/objects.h"
 #include "../../shared/shared.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
 #include "../ModelProcessorx.h"
 
Index: issm/trunk/src/c/ModelProcessorx/DiagnosticHutter/CreateElementsNodesAndMaterialsDiagnosticHutter.cpp
===================================================================
--- issm/trunk/src/c/ModelProcessorx/DiagnosticHutter/CreateElementsNodesAndMaterialsDiagnosticHutter.cpp	(revision 3774)
+++ issm/trunk/src/c/ModelProcessorx/DiagnosticHutter/CreateElementsNodesAndMaterialsDiagnosticHutter.cpp	(revision 3775)
@@ -10,5 +10,5 @@
 #include "../../shared/shared.h"
 #include "../../MeshPartitionx/MeshPartitionx.h"
-#include "../../include/typedefs.h"
+#include "../../include/include.h"
 #include "../ModelProcessorx.h"
 
Index: issm/trunk/src/c/ModelProcessorx/DiagnosticHutter/CreateLoadsDiagnosticHutter.cpp
===================================================================
--- issm/trunk/src/c/ModelProcessorx/DiagnosticHutter/CreateLoadsDiagnosticHutter.cpp	(revision 3774)
+++ issm/trunk/src/c/ModelProcessorx/DiagnosticHutter/CreateLoadsDiagnosticHutter.cpp	(revision 3775)
@@ -8,5 +8,5 @@
 #include "../../objects/objects.h"
 #include "../../shared/shared.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
 #include "../ModelProcessorx.h"
 
Index: issm/trunk/src/c/ModelProcessorx/DiagnosticStokes/CreateElementsNodesAndMaterialsDiagnosticStokes.cpp
===================================================================
--- issm/trunk/src/c/ModelProcessorx/DiagnosticStokes/CreateElementsNodesAndMaterialsDiagnosticStokes.cpp	(revision 3774)
+++ issm/trunk/src/c/ModelProcessorx/DiagnosticStokes/CreateElementsNodesAndMaterialsDiagnosticStokes.cpp	(revision 3775)
@@ -9,6 +9,6 @@
 #include "../../objects/objects.h"
 #include "../../shared/shared.h"
-#include "../../include/macros.h"
-#include "../../include/typedefs.h"
+#include "../../include/include.h"
+#include "../../include/include.h"
 #include "../../MeshPartitionx/MeshPartitionx.h"
 #include "../ModelProcessorx.h"
Index: issm/trunk/src/c/ModelProcessorx/DiagnosticStokes/CreateLoadsDiagnosticStokes.cpp
===================================================================
--- issm/trunk/src/c/ModelProcessorx/DiagnosticStokes/CreateLoadsDiagnosticStokes.cpp	(revision 3774)
+++ issm/trunk/src/c/ModelProcessorx/DiagnosticStokes/CreateLoadsDiagnosticStokes.cpp	(revision 3775)
@@ -8,5 +8,5 @@
 #include "../../objects/objects.h"
 #include "../../shared/shared.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
 #include "../ModelProcessorx.h"
 
Index: issm/trunk/src/c/ModelProcessorx/DiagnosticVert/CreateElementsNodesAndMaterialsDiagnosticVert.cpp
===================================================================
--- issm/trunk/src/c/ModelProcessorx/DiagnosticVert/CreateElementsNodesAndMaterialsDiagnosticVert.cpp	(revision 3774)
+++ issm/trunk/src/c/ModelProcessorx/DiagnosticVert/CreateElementsNodesAndMaterialsDiagnosticVert.cpp	(revision 3775)
@@ -10,5 +10,5 @@
 #include "../../shared/shared.h"
 #include "../../MeshPartitionx/MeshPartitionx.h"
-#include "../../include/typedefs.h"
+#include "../../include/include.h"
 #include "../ModelProcessorx.h"
 
Index: issm/trunk/src/c/ModelProcessorx/DiagnosticVert/CreateLoadsDiagnosticVert.cpp
===================================================================
--- issm/trunk/src/c/ModelProcessorx/DiagnosticVert/CreateLoadsDiagnosticVert.cpp	(revision 3774)
+++ issm/trunk/src/c/ModelProcessorx/DiagnosticVert/CreateLoadsDiagnosticVert.cpp	(revision 3775)
@@ -8,5 +8,5 @@
 #include "../../objects/objects.h"
 #include "../../shared/shared.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
 #include "../ModelProcessorx.h"
 
Index: issm/trunk/src/c/ModelProcessorx/Melting/CreateElementsNodesAndMaterialsMelting.cpp
===================================================================
--- issm/trunk/src/c/ModelProcessorx/Melting/CreateElementsNodesAndMaterialsMelting.cpp	(revision 3774)
+++ issm/trunk/src/c/ModelProcessorx/Melting/CreateElementsNodesAndMaterialsMelting.cpp	(revision 3775)
@@ -7,5 +7,5 @@
 #include "../../io/io.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"
-#include "../../include/typedefs.h"
+#include "../../include/include.h"
 #include "../../objects/objects.h"
 #include "../../shared/shared.h"
Index: issm/trunk/src/c/ModelProcessorx/Melting/CreateLoadsMelting.cpp
===================================================================
--- issm/trunk/src/c/ModelProcessorx/Melting/CreateLoadsMelting.cpp	(revision 3774)
+++ issm/trunk/src/c/ModelProcessorx/Melting/CreateLoadsMelting.cpp	(revision 3775)
@@ -8,5 +8,5 @@
 #include "../../objects/objects.h"
 #include "../../shared/shared.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
 #include "../ModelProcessorx.h"
 
Index: issm/trunk/src/c/ModelProcessorx/Partitioning.cpp
===================================================================
--- issm/trunk/src/c/ModelProcessorx/Partitioning.cpp	(revision 3774)
+++ issm/trunk/src/c/ModelProcessorx/Partitioning.cpp	(revision 3775)
@@ -13,7 +13,7 @@
 #include "../shared/shared.h"
 #include "../EnumDefinitions/EnumDefinitions.h"
-#include "../include/macros.h"
+#include "../include/include.h"
 #include "../io/io.h"
-#include "../include/typedefs.h"
+#include "../include/include.h"
 #include "../MeshPartitionx/MeshPartitionx.h"
 #include "../ModelProcessorx/ModelProcessorx.h"
Index: issm/trunk/src/c/ModelProcessorx/Prognostic/CreateElementsNodesAndMaterialsPrognostic.cpp
===================================================================
--- issm/trunk/src/c/ModelProcessorx/Prognostic/CreateElementsNodesAndMaterialsPrognostic.cpp	(revision 3774)
+++ issm/trunk/src/c/ModelProcessorx/Prognostic/CreateElementsNodesAndMaterialsPrognostic.cpp	(revision 3775)
@@ -10,5 +10,5 @@
 #include "../../io/io.h"
 #include "../../MeshPartitionx/MeshPartitionx.h"
-#include "../../include/typedefs.h"
+#include "../../include/include.h"
 #include "../ModelProcessorx.h"
 
Index: issm/trunk/src/c/ModelProcessorx/Prognostic/CreateLoadsPrognostic.cpp
===================================================================
--- issm/trunk/src/c/ModelProcessorx/Prognostic/CreateLoadsPrognostic.cpp	(revision 3774)
+++ issm/trunk/src/c/ModelProcessorx/Prognostic/CreateLoadsPrognostic.cpp	(revision 3775)
@@ -8,5 +8,5 @@
 #include "../../objects/objects.h"
 #include "../../shared/shared.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
 #include "../ModelProcessorx.h"
 
Index: issm/trunk/src/c/ModelProcessorx/Prognostic2/CreateElementsNodesAndMaterialsPrognostic2.cpp
===================================================================
--- issm/trunk/src/c/ModelProcessorx/Prognostic2/CreateElementsNodesAndMaterialsPrognostic2.cpp	(revision 3774)
+++ issm/trunk/src/c/ModelProcessorx/Prognostic2/CreateElementsNodesAndMaterialsPrognostic2.cpp	(revision 3775)
@@ -9,6 +9,6 @@
 #include "../../io/io.h"
 #include "../../shared/shared.h"
-#include "../../include/macros.h"
-#include "../../include/typedefs.h"
+#include "../../include/include.h"
+#include "../../include/include.h"
 #include "../../MeshPartitionx/MeshPartitionx.h"
 #include "../ModelProcessorx.h"
Index: issm/trunk/src/c/ModelProcessorx/Prognostic2/CreateLoadsPrognostic2.cpp
===================================================================
--- issm/trunk/src/c/ModelProcessorx/Prognostic2/CreateLoadsPrognostic2.cpp	(revision 3774)
+++ issm/trunk/src/c/ModelProcessorx/Prognostic2/CreateLoadsPrognostic2.cpp	(revision 3775)
@@ -8,6 +8,6 @@
 #include "../../io/io.h"
 #include "../../shared/shared.h"
-#include "../../include/macros.h"
-#include "../../include/typedefs.h"
+#include "../../include/include.h"
+#include "../../include/include.h"
 #include "../ModelProcessorx.h"
 
Index: issm/trunk/src/c/ModelProcessorx/Qmu/CreateParametersQmu.cpp
===================================================================
--- issm/trunk/src/c/ModelProcessorx/Qmu/CreateParametersQmu.cpp	(revision 3774)
+++ issm/trunk/src/c/ModelProcessorx/Qmu/CreateParametersQmu.cpp	(revision 3775)
@@ -9,5 +9,5 @@
 #include "../../shared/shared.h"
 #include "../../io/io.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
 #include "../../MeshPartitionx/MeshPartitionx.h"
 #include "../ModelProcessorx.h"
Index: issm/trunk/src/c/ModelProcessorx/SlopeCompute/CreateElementsNodesAndMaterialsSlopeCompute.cpp
===================================================================
--- issm/trunk/src/c/ModelProcessorx/SlopeCompute/CreateElementsNodesAndMaterialsSlopeCompute.cpp	(revision 3774)
+++ issm/trunk/src/c/ModelProcessorx/SlopeCompute/CreateElementsNodesAndMaterialsSlopeCompute.cpp	(revision 3775)
@@ -9,5 +9,5 @@
 #include "../../objects/objects.h"
 #include "../../shared/shared.h"
-#include "../../include/typedefs.h"
+#include "../../include/include.h"
 #include "../../MeshPartitionx/MeshPartitionx.h"
 #include "../ModelProcessorx.h"
Index: issm/trunk/src/c/ModelProcessorx/SlopeCompute/CreateLoadsSlopeCompute.cpp
===================================================================
--- issm/trunk/src/c/ModelProcessorx/SlopeCompute/CreateLoadsSlopeCompute.cpp	(revision 3774)
+++ issm/trunk/src/c/ModelProcessorx/SlopeCompute/CreateLoadsSlopeCompute.cpp	(revision 3775)
@@ -8,5 +8,5 @@
 #include "../../objects/objects.h"
 #include "../../shared/shared.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
 #include "../ModelProcessorx.h"
 
Index: issm/trunk/src/c/ModelProcessorx/Thermal/CreateElementsNodesAndMaterialsThermal.cpp
===================================================================
--- issm/trunk/src/c/ModelProcessorx/Thermal/CreateElementsNodesAndMaterialsThermal.cpp	(revision 3774)
+++ issm/trunk/src/c/ModelProcessorx/Thermal/CreateElementsNodesAndMaterialsThermal.cpp	(revision 3775)
@@ -8,5 +8,5 @@
 #include "../../EnumDefinitions/EnumDefinitions.h"
 #include "../../objects/objects.h"
-#include "../../include/typedefs.h"
+#include "../../include/include.h"
 #include "../../shared/shared.h"
 #include "../../MeshPartitionx/MeshPartitionx.h"
Index: issm/trunk/src/c/ModelProcessorx/Thermal/CreateLoadsThermal.cpp
===================================================================
--- issm/trunk/src/c/ModelProcessorx/Thermal/CreateLoadsThermal.cpp	(revision 3774)
+++ issm/trunk/src/c/ModelProcessorx/Thermal/CreateLoadsThermal.cpp	(revision 3775)
@@ -8,5 +8,5 @@
 #include "../../objects/objects.h"
 #include "../../shared/shared.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
 #include "../ModelProcessorx.h"
 
Index: issm/trunk/src/c/MpcNodesx/MpcNodesx.cpp
===================================================================
--- issm/trunk/src/c/MpcNodesx/MpcNodesx.cpp	(revision 3774)
+++ issm/trunk/src/c/MpcNodesx/MpcNodesx.cpp	(revision 3775)
@@ -6,5 +6,5 @@
 
 #include "../shared/shared.h"
-#include "../include/macros.h"
+#include "../include/include.h"
 #include "../toolkits/toolkits.h"
 #include "../EnumDefinitions/EnumDefinitions.h"
Index: issm/trunk/src/c/NodeConnectivityx/NodeConnectivityx.cpp
===================================================================
--- issm/trunk/src/c/NodeConnectivityx/NodeConnectivityx.cpp	(revision 3774)
+++ issm/trunk/src/c/NodeConnectivityx/NodeConnectivityx.cpp	(revision 3775)
@@ -14,5 +14,5 @@
 
 #include "../shared/shared.h"
-#include "../include/macros.h"
+#include "../include/include.h"
 #include "../toolkits/toolkits.h"
 #include "../EnumDefinitions/EnumDefinitions.h"
Index: issm/trunk/src/c/Orthx/Orthx.h
===================================================================
--- issm/trunk/src/c/Orthx/Orthx.h	(revision 3774)
+++ issm/trunk/src/c/Orthx/Orthx.h	(revision 3775)
@@ -7,5 +7,5 @@
 
 #include "../objects/objects.h"
-#include "../include/macros.h"
+#include "../include/include.h"
 #include "../shared/shared.h"
 
Index: issm/trunk/src/c/OutputRiftsx/OutputRiftsx.cpp
===================================================================
--- issm/trunk/src/c/OutputRiftsx/OutputRiftsx.cpp	(revision 3774)
+++ issm/trunk/src/c/OutputRiftsx/OutputRiftsx.cpp	(revision 3775)
@@ -7,5 +7,5 @@
 
 #include "../shared/shared.h"
-#include "../include/macros.h"
+#include "../include/include.h"
 #include "../toolkits/toolkits.h"
 #include "../EnumDefinitions/EnumDefinitions.h"
Index: issm/trunk/src/c/PenaltyConstraintsx/PenaltyConstraintsx.cpp
===================================================================
--- issm/trunk/src/c/PenaltyConstraintsx/PenaltyConstraintsx.cpp	(revision 3774)
+++ issm/trunk/src/c/PenaltyConstraintsx/PenaltyConstraintsx.cpp	(revision 3775)
@@ -7,5 +7,5 @@
 
 #include "../shared/shared.h"
-#include "../include/macros.h"
+#include "../include/include.h"
 #include "../toolkits/toolkits.h"
 #include "../EnumDefinitions/EnumDefinitions.h"
Index: issm/trunk/src/c/PenaltyConstraintsx/RiftConstraints.cpp
===================================================================
--- issm/trunk/src/c/PenaltyConstraintsx/RiftConstraints.cpp	(revision 3774)
+++ issm/trunk/src/c/PenaltyConstraintsx/RiftConstraints.cpp	(revision 3775)
@@ -5,5 +5,5 @@
 #include "./RiftConstraints.h"
 #include "../EnumDefinitions/EnumDefinitions.h"
-#include "../include/macros.h"
+#include "../include/include.h"
 #include "../shared/shared.h"
 
Index: issm/trunk/src/c/PenaltySystemMatricesx/PenaltySystemMatricesx.cpp
===================================================================
--- issm/trunk/src/c/PenaltySystemMatricesx/PenaltySystemMatricesx.cpp	(revision 3774)
+++ issm/trunk/src/c/PenaltySystemMatricesx/PenaltySystemMatricesx.cpp	(revision 3775)
@@ -6,5 +6,5 @@
 
 #include "../shared/shared.h"
-#include "../include/macros.h"
+#include "../include/include.h"
 #include "../toolkits/toolkits.h"
 #include "../EnumDefinitions/EnumDefinitions.h"
Index: issm/trunk/src/c/ProcessParamsx/ProcessParamsx.cpp
===================================================================
--- issm/trunk/src/c/ProcessParamsx/ProcessParamsx.cpp	(revision 3774)
+++ issm/trunk/src/c/ProcessParamsx/ProcessParamsx.cpp	(revision 3775)
@@ -10,5 +10,5 @@
 
 #include "../shared/shared.h"
-#include "../include/macros.h"
+#include "../include/include.h"
 #include "../toolkits/toolkits.h"
 #include "../DataSet/DataSet.h"
Index: issm/trunk/src/c/PropagateFlagsFromConnectivityx/PropagateFlagsFromConnectivityx.cpp
===================================================================
--- issm/trunk/src/c/PropagateFlagsFromConnectivityx/PropagateFlagsFromConnectivityx.cpp	(revision 3774)
+++ issm/trunk/src/c/PropagateFlagsFromConnectivityx/PropagateFlagsFromConnectivityx.cpp	(revision 3775)
@@ -5,5 +5,5 @@
 
 #include "../shared/shared.h"
-#include "../include/macros.h"
+#include "../include/include.h"
 #include "../toolkits/toolkits.h"
 
Index: issm/trunk/src/c/Qmux/DakotaResponses.cpp
===================================================================
--- issm/trunk/src/c/Qmux/DakotaResponses.cpp	(revision 3774)
+++ issm/trunk/src/c/Qmux/DakotaResponses.cpp	(revision 3775)
@@ -11,8 +11,9 @@
 #include "../DataSet/DataSet.h"    
 #include "../shared/shared.h"
-#include "../include/macros.h"
+#include "../include/include.h"
 #include "../EnumDefinitions/EnumDefinitions.h"
 #include "../MassFluxx/MassFluxx.h"
 #include "../Misfitx/Misfitx.h"
+#include "../modules.h"
 
 void DakotaResponses(double* responses,char** responses_descriptors,int numresponses,Model* model,DataSet* results,DataSet* processed_results,int analysis_type,int sub_analysis_type){
@@ -261,5 +262,5 @@
 			if(!found)ISSMERROR(" could not find velocity to compute misfit");
 
-			SplitSolutionVector(u_g,numberofnodes,numberofdofspernode,&vx,&vy,&vz);
+			SplitSolutionVectorx(u_g,numberofnodes,numberofdofspernode,&vx,&vy,&vz);
 
 			/*Add to inputs: */
Index: issm/trunk/src/c/Qmux/Qmux.cpp
===================================================================
--- issm/trunk/src/c/Qmux/Qmux.cpp	(revision 3774)
+++ issm/trunk/src/c/Qmux/Qmux.cpp	(revision 3775)
@@ -36,5 +36,5 @@
 
 #include "../shared/shared.h"
-#include "../include/macros.h"
+#include "../include/include.h"
 #include "../toolkits/toolkits.h"
 #include "../EnumDefinitions/EnumDefinitions.h"
Index: issm/trunk/src/c/Qmux/SpawnCore.cpp
===================================================================
--- issm/trunk/src/c/Qmux/SpawnCore.cpp	(revision 3774)
+++ issm/trunk/src/c/Qmux/SpawnCore.cpp	(revision 3775)
@@ -15,5 +15,5 @@
 #include "../shared/shared.h"
 #include "./Qmux.h"
-#include "../include/macros.h"
+#include "../include/include.h"
 
 int SpawnCore(double* responses, int numresponses, double* variables, char** variables_descriptors,int numvariables, void* model,int analysis_type,int sub_analysis_type,int counter){
Index: issm/trunk/src/c/Qmux/SpawnCoreParallel.cpp
===================================================================
--- issm/trunk/src/c/Qmux/SpawnCoreParallel.cpp	(revision 3774)
+++ issm/trunk/src/c/Qmux/SpawnCoreParallel.cpp	(revision 3775)
@@ -31,5 +31,5 @@
 #include "../shared/shared.h"
 #include "./Qmux.h"
-#include "../include/macros.h"
+#include "../include/include.h"
 #include "../parallel/parallel.h"
 
Index: issm/trunk/src/c/Qmux/SpawnCoreSerial.cpp
===================================================================
--- issm/trunk/src/c/Qmux/SpawnCoreSerial.cpp	(revision 3774)
+++ issm/trunk/src/c/Qmux/SpawnCoreSerial.cpp	(revision 3775)
@@ -17,5 +17,5 @@
 #include "../shared/shared.h"
 #include "./Qmux.h"
-#include "../include/macros.h"
+#include "../include/include.h"
 
 void SpawnCoreSerial(double* responses, int numresponses, double* variables, char** variables_descriptors,int numvariables, mxArray* model,int analysis_type,int sub_analysis_type,int counter){
Index: issm/trunk/src/c/Solverx/Solverx.cpp
===================================================================
--- issm/trunk/src/c/Solverx/Solverx.cpp	(revision 3774)
+++ issm/trunk/src/c/Solverx/Solverx.cpp	(revision 3775)
@@ -6,5 +6,5 @@
 
 #include "../shared/shared.h"
-#include "../include/macros.h"
+#include "../include/include.h"
 
 #ifdef HAVE_CONFIG_H
Index: issm/trunk/src/c/SpcNodesx/SpcNodesx.cpp
===================================================================
--- issm/trunk/src/c/SpcNodesx/SpcNodesx.cpp	(revision 3774)
+++ issm/trunk/src/c/SpcNodesx/SpcNodesx.cpp	(revision 3775)
@@ -6,5 +6,5 @@
 
 #include "../shared/shared.h"
-#include "../include/macros.h"
+#include "../include/include.h"
 #include "../toolkits/toolkits.h"
 #include "../EnumDefinitions/EnumDefinitions.h"
Index: issm/trunk/src/c/SplitSolutionVectorx/SplitSolutionVectorx.cpp
===================================================================
--- issm/trunk/src/c/SplitSolutionVectorx/SplitSolutionVectorx.cpp	(revision 3774)
+++ issm/trunk/src/c/SplitSolutionVectorx/SplitSolutionVectorx.cpp	(revision 3775)
@@ -3,4 +3,5 @@
 
 #include "./SplitSolutionVectorx.h"
+#include "../shared/shared.h"
 
 void SplitSolutionVectorx(Vec u_g,int numberofnodes,int numberofdofs, ...){
Index: issm/trunk/src/c/SplitSolutionVectorx/SplitSolutionVectorx.h
===================================================================
--- issm/trunk/src/c/SplitSolutionVectorx/SplitSolutionVectorx.h	(revision 3774)
+++ issm/trunk/src/c/SplitSolutionVectorx/SplitSolutionVectorx.h	(revision 3775)
@@ -12,9 +12,7 @@
 
 #include <stdarg.h>
+#include "../toolkits/toolkits.h"
 
-#include "../../shared/shared.h"
-#include "../../include/macros.h"
-
-void SplitSolutionVector(Vec u_g,int numberofnodes,int numberofdofs, ...);
+void SplitSolutionVectorx(Vec u_g,int numberofnodes,int numberofdofs, ...);
 
 #endif  /* _SPLITSOLUTIONVECTORX_H */
Index: issm/trunk/src/c/SurfaceAreax/SurfaceAreax.cpp
===================================================================
--- issm/trunk/src/c/SurfaceAreax/SurfaceAreax.cpp	(revision 3774)
+++ issm/trunk/src/c/SurfaceAreax/SurfaceAreax.cpp	(revision 3775)
@@ -6,5 +6,5 @@
 
 #include "../shared/shared.h"
-#include "../include/macros.h"
+#include "../include/include.h"
 #include "../toolkits/toolkits.h"
 #include "../EnumDefinitions/EnumDefinitions.h"
Index: issm/trunk/src/c/SystemMatricesx/SystemMatricesx.cpp
===================================================================
--- issm/trunk/src/c/SystemMatricesx/SystemMatricesx.cpp	(revision 3774)
+++ issm/trunk/src/c/SystemMatricesx/SystemMatricesx.cpp	(revision 3775)
@@ -6,5 +6,5 @@
 
 #include "../shared/shared.h"
-#include "../include/macros.h"
+#include "../include/include.h"
 #include "../toolkits/toolkits.h"
 #include "../EnumDefinitions/EnumDefinitions.h"
Index: issm/trunk/src/c/UpdateGeometryx/UpdateGeometryx.cpp
===================================================================
--- issm/trunk/src/c/UpdateGeometryx/UpdateGeometryx.cpp	(revision 3774)
+++ issm/trunk/src/c/UpdateGeometryx/UpdateGeometryx.cpp	(revision 3775)
@@ -6,5 +6,5 @@
 
 #include "../shared/shared.h"
-#include "../include/macros.h"
+#include "../include/include.h"
 #include "../toolkits/toolkits.h"
 #include "../EnumDefinitions/EnumDefinitions.h"
Index: issm/trunk/src/c/UpdateInputsFromSolutionx/UpdateInputsFromSolutionx.cpp
===================================================================
--- issm/trunk/src/c/UpdateInputsFromSolutionx/UpdateInputsFromSolutionx.cpp	(revision 3774)
+++ issm/trunk/src/c/UpdateInputsFromSolutionx/UpdateInputsFromSolutionx.cpp	(revision 3775)
@@ -5,5 +5,5 @@
 #include "./UpdateInputsFromSolutionx.h"
 #include "../shared/shared.h"
-#include "../include/macros.h"
+#include "../include/include.h"
 #include "../toolkits/toolkits.h"
 #include "../EnumDefinitions/EnumDefinitions.h"
Index: issm/trunk/src/c/UpdateInputsFromVectorx/UpdateInputsFromVectorx.cpp
===================================================================
--- issm/trunk/src/c/UpdateInputsFromVectorx/UpdateInputsFromVectorx.cpp	(revision 3774)
+++ issm/trunk/src/c/UpdateInputsFromVectorx/UpdateInputsFromVectorx.cpp	(revision 3775)
@@ -5,5 +5,5 @@
 #include "./UpdateInputsFromVectorx.h"
 #include "../shared/shared.h"
-#include "../include/macros.h"
+#include "../include/include.h"
 #include "../toolkits/toolkits.h"
 #include "../EnumDefinitions/EnumDefinitions.h"
Index: issm/trunk/src/c/UpdateVertexPositionsx/UpdateVertexPositionsx.cpp
===================================================================
--- issm/trunk/src/c/UpdateVertexPositionsx/UpdateVertexPositionsx.cpp	(revision 3774)
+++ issm/trunk/src/c/UpdateVertexPositionsx/UpdateVertexPositionsx.cpp	(revision 3775)
@@ -6,5 +6,5 @@
 
 #include "../shared/shared.h"
-#include "../include/macros.h"
+#include "../include/include.h"
 #include "../toolkits/toolkits.h"
 #include "../EnumDefinitions/EnumDefinitions.h"
Index: issm/trunk/src/c/include/include.h
===================================================================
--- issm/trunk/src/c/include/include.h	(revision 3775)
+++ issm/trunk/src/c/include/include.h	(revision 3775)
@@ -0,0 +1,15 @@
+/*!\file: include.h
+ * \brief prototypes for include.h
+ */ 
+
+#ifndef _INCLUDEGLOBAL_H_
+#define  _INCLUDEGLOBAL_H_
+
+#include "./globals.h"  
+#include "./macros.h"
+#include "./typedefs.h"
+#include "./types.h"
+
+
+#endif //ifndef _INCLUDE_H_
+
Index: issm/trunk/src/c/include/types.h
===================================================================
--- issm/trunk/src/c/include/types.h	(revision 3774)
+++ issm/trunk/src/c/include/types.h	(revision 3775)
@@ -13,4 +13,5 @@
 #endif
 
+#include "stdio.h"
 
 /*Define abstract type for I/O: */
Index: issm/trunk/src/c/io/FetchData.cpp
===================================================================
--- issm/trunk/src/c/io/FetchData.cpp	(revision 3774)
+++ issm/trunk/src/c/io/FetchData.cpp	(revision 3775)
@@ -11,5 +11,5 @@
 #include "./io.h"
 #include "../shared/shared.h"
-#include "../include/macros.h"
+#include "../include/include.h"
 
 /***************** **************** **************** **************** **************** **************** **************** **************** **************** ****************
Index: issm/trunk/src/c/io/FetchParams.cpp
===================================================================
--- issm/trunk/src/c/io/FetchParams.cpp	(revision 3774)
+++ issm/trunk/src/c/io/FetchParams.cpp	(revision 3775)
@@ -15,5 +15,5 @@
 #include "../objects/objects.h"
 #include "../shared/shared.h"
-#include "../include/macros.h"
+#include "../include/include.h"
 #include "../EnumDefinitions/EnumDefinitions.h"
 
Index: issm/trunk/src/c/io/WriteData.cpp
===================================================================
--- issm/trunk/src/c/io/WriteData.cpp	(revision 3774)
+++ issm/trunk/src/c/io/WriteData.cpp	(revision 3775)
@@ -9,5 +9,5 @@
 #endif
 
-#include "../include/macros.h"
+#include "../include/include.h"
 #include "./shared/shared.h"
 #include "./io.h"
Index: issm/trunk/src/c/io/WriteDataToDisk.cpp
===================================================================
--- issm/trunk/src/c/io/WriteDataToDisk.cpp	(revision 3774)
+++ issm/trunk/src/c/io/WriteDataToDisk.cpp	(revision 3775)
@@ -5,5 +5,5 @@
 #include "stdio.h"
 #include "string.h"
-#include "../include/macros.h"
+#include "../include/include.h"
 #include "../shared/shared.h"
 
Index: issm/trunk/src/c/io/WriteParams.cpp
===================================================================
--- issm/trunk/src/c/io/WriteParams.cpp	(revision 3774)
+++ issm/trunk/src/c/io/WriteParams.cpp	(revision 3775)
@@ -16,5 +16,5 @@
 #include "../objects/objects.h"
 #include "../shared/shared.h"
-#include "../include/macros.h"
+#include "../include/include.h"
 
 void WriteParams(DataHandle* pdataref,Parameters* parameters){
Index: issm/trunk/src/c/io/io.h
===================================================================
--- issm/trunk/src/c/io/io.h	(revision 3774)
+++ issm/trunk/src/c/io/io.h	(revision 3775)
@@ -8,5 +8,5 @@
 #include "../objects/objects.h"
 #include "../DataSet/DataSet.h"
-#include "../include/types.h"
+#include "../include/include.h"
 
 class DataSet;
Index: issm/trunk/src/c/io/pfclose.cpp
===================================================================
--- issm/trunk/src/c/io/pfclose.cpp	(revision 3774)
+++ issm/trunk/src/c/io/pfclose.cpp	(revision 3775)
@@ -11,5 +11,5 @@
 #include "stdio.h"
 #include "../shared/shared.h"
-#include "../include/macros.h"
+#include "../include/include.h"
 
 void pfclose(FILE* fid,char* filename){
Index: issm/trunk/src/c/io/pfopen.cpp
===================================================================
--- issm/trunk/src/c/io/pfopen.cpp	(revision 3774)
+++ issm/trunk/src/c/io/pfopen.cpp	(revision 3775)
@@ -11,5 +11,5 @@
 #include "stdio.h"
 #include "../shared/shared.h"
-#include "../include/macros.h"
+#include "../include/include.h"
 
 FILE* pfopen(char* filename,char* format){
Index: issm/trunk/src/c/objects/Bamg/BamgOpts.cpp
===================================================================
--- issm/trunk/src/c/objects/Bamg/BamgOpts.cpp	(revision 3774)
+++ issm/trunk/src/c/objects/Bamg/BamgOpts.cpp	(revision 3775)
@@ -1,5 +1,5 @@
 #include "stdio.h"
 #include "../../shared/shared.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
 #include "../objects.h"
 
Index: issm/trunk/src/c/objects/Constraints/Rgb.cpp
===================================================================
--- issm/trunk/src/c/objects/Constraints/Rgb.cpp	(revision 3774)
+++ issm/trunk/src/c/objects/Constraints/Rgb.cpp	(revision 3775)
@@ -15,5 +15,5 @@
 #include "../../DataSet/DataSet.h"
 #include "../../shared/shared.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
 #include "../objects.h"
 
Index: issm/trunk/src/c/objects/Constraints/Spc.cpp
===================================================================
--- issm/trunk/src/c/objects/Constraints/Spc.cpp	(revision 3774)
+++ issm/trunk/src/c/objects/Constraints/Spc.cpp	(revision 3775)
@@ -12,5 +12,5 @@
 #include "stdio.h"
 #include <string.h>
-#include "../../include/macros.h"
+#include "../../include/include.h"
 #include "../../shared/shared.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"
Index: issm/trunk/src/c/objects/Contour.cpp
===================================================================
--- issm/trunk/src/c/objects/Contour.cpp	(revision 3774)
+++ issm/trunk/src/c/objects/Contour.cpp	(revision 3775)
@@ -10,5 +10,5 @@
 
 #include "./objects.h"
-#include "../include/macros.h"
+#include "../include/include.h"
 #include "../shared/Matlab/matlabshared.h"
 
Index: issm/trunk/src/c/objects/DakotaPlugin.cpp
===================================================================
--- issm/trunk/src/c/objects/DakotaPlugin.cpp	(revision 3774)
+++ issm/trunk/src/c/objects/DakotaPlugin.cpp	(revision 3775)
@@ -24,5 +24,5 @@
 /*Standard ISSM includes: */
 #include "../shared/shared.h"
-#include "../include/macros.h"
+#include "../include/include.h"
 #include "../objects/objects.h"
 #include "../Qmux/Qmux.h"
Index: issm/trunk/src/c/objects/DofIndexing.cpp
===================================================================
--- issm/trunk/src/c/objects/DofIndexing.cpp	(revision 3774)
+++ issm/trunk/src/c/objects/DofIndexing.cpp	(revision 3775)
@@ -15,6 +15,6 @@
 #include "../shared/shared.h"
 #include "../DataSet/DataSet.h"
-#include "../include/typedefs.h"
-#include "../include/macros.h"
+#include "../include/include.h"
+#include "../include/include.h"
 
 /*Object constructors and destructor*/
Index: issm/trunk/src/c/objects/DofVec.cpp
===================================================================
--- issm/trunk/src/c/objects/DofVec.cpp	(revision 3774)
+++ issm/trunk/src/c/objects/DofVec.cpp	(revision 3775)
@@ -11,5 +11,5 @@
 #include "./objects.h"
 #include "../shared/shared.h"
-#include "../include/macros.h"
+#include "../include/include.h"
 #include "../EnumDefinitions/EnumDefinitions.h"
 
Index: issm/trunk/src/c/objects/Elements/Beam.cpp
===================================================================
--- issm/trunk/src/c/objects/Elements/Beam.cpp	(revision 3774)
+++ issm/trunk/src/c/objects/Elements/Beam.cpp	(revision 3775)
@@ -15,6 +15,6 @@
 #include "../../shared/shared.h"
 #include "../../DataSet/DataSet.h"
-#include "../../include/typedefs.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
+#include "../../include/include.h"
 
 /*Object constructors and destructor*/
Index: issm/trunk/src/c/objects/Elements/Beam.h
===================================================================
--- issm/trunk/src/c/objects/Elements/Beam.h	(revision 3774)
+++ issm/trunk/src/c/objects/Elements/Beam.h	(revision 3775)
@@ -16,5 +16,5 @@
 
 #include "../../shared/Exceptions/exceptions.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
 /*}}}*/
 
Index: issm/trunk/src/c/objects/Elements/Penta.cpp
===================================================================
--- issm/trunk/src/c/objects/Elements/Penta.cpp	(revision 3774)
+++ issm/trunk/src/c/objects/Elements/Penta.cpp	(revision 3775)
@@ -14,6 +14,6 @@
 #include "../../EnumDefinitions/EnumDefinitions.h"
 #include "../../shared/shared.h"
-#include "../../include/typedefs.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
+#include "../../include/include.h"
 #include "../../DataSet/DataSet.h"
 
Index: issm/trunk/src/c/objects/Elements/Penta.h
===================================================================
--- issm/trunk/src/c/objects/Elements/Penta.h	(revision 3774)
+++ issm/trunk/src/c/objects/Elements/Penta.h	(revision 3775)
@@ -18,5 +18,5 @@
 
 #include "../../shared/Exceptions/exceptions.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
 
 /*}}}*/
Index: issm/trunk/src/c/objects/Elements/Sing.cpp
===================================================================
--- issm/trunk/src/c/objects/Elements/Sing.cpp	(revision 3774)
+++ issm/trunk/src/c/objects/Elements/Sing.cpp	(revision 3775)
@@ -15,6 +15,6 @@
 #include "../../shared/shared.h"
 #include "../../DataSet/DataSet.h"
-#include "../../include/typedefs.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
+#include "../../include/include.h"
 
 /*Object constructors and destructor*/
Index: issm/trunk/src/c/objects/Elements/Sing.h
===================================================================
--- issm/trunk/src/c/objects/Elements/Sing.h	(revision 3774)
+++ issm/trunk/src/c/objects/Elements/Sing.h	(revision 3775)
@@ -14,5 +14,5 @@
 class IoModel;
 
-#include "../../include/macros.h"
+#include "../../include/include.h"
 #include "../../shared/Exceptions/exceptions.h"
 
Index: issm/trunk/src/c/objects/Elements/Tria.cpp
===================================================================
--- issm/trunk/src/c/objects/Elements/Tria.cpp	(revision 3774)
+++ issm/trunk/src/c/objects/Elements/Tria.cpp	(revision 3775)
@@ -17,6 +17,6 @@
 #include "../../shared/shared.h"
 #include "../../DataSet/DataSet.h"
-#include "../../include/typedefs.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
+#include "../../include/include.h"
 /*}}}*/
 
Index: issm/trunk/src/c/objects/Elements/Tria.h
===================================================================
--- issm/trunk/src/c/objects/Elements/Tria.h	(revision 3774)
+++ issm/trunk/src/c/objects/Elements/Tria.h	(revision 3775)
@@ -14,5 +14,5 @@
 class IoModel;
 
-#include "../../include/macros.h"
+#include "../../include/include.h"
 #include "../../shared/Exceptions/exceptions.h"
 /*}}}*/
Index: issm/trunk/src/c/objects/FemModel.cpp
===================================================================
--- issm/trunk/src/c/objects/FemModel.cpp	(revision 3774)
+++ issm/trunk/src/c/objects/FemModel.cpp	(revision 3775)
@@ -11,5 +11,5 @@
 #include "stdio.h"
 #include "../shared/shared.h"
-#include "../include/macros.h"
+#include "../include/include.h"
 #include "./objects.h"
 
Index: issm/trunk/src/c/objects/Hook.cpp
===================================================================
--- issm/trunk/src/c/objects/Hook.cpp	(revision 3774)
+++ issm/trunk/src/c/objects/Hook.cpp	(revision 3775)
@@ -16,6 +16,6 @@
 #include "../EnumDefinitions/EnumDefinitions.h"
 #include "../shared/shared.h"
-#include "../include/typedefs.h"
-#include "../include/macros.h"
+#include "../include/include.h"
+#include "../include/include.h"
 
 
Index: issm/trunk/src/c/objects/Inputs/BeamVertexInput.cpp
===================================================================
--- issm/trunk/src/c/objects/Inputs/BeamVertexInput.cpp	(revision 3774)
+++ issm/trunk/src/c/objects/Inputs/BeamVertexInput.cpp	(revision 3775)
@@ -15,6 +15,6 @@
 #include "../../shared/shared.h"
 #include "../../DataSet/DataSet.h"
-#include "../../include/typedefs.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
+#include "../../include/include.h"
 
 /*Object constructors and destructor*/
Index: issm/trunk/src/c/objects/Inputs/BoolInput.cpp
===================================================================
--- issm/trunk/src/c/objects/Inputs/BoolInput.cpp	(revision 3774)
+++ issm/trunk/src/c/objects/Inputs/BoolInput.cpp	(revision 3775)
@@ -15,7 +15,7 @@
 #include "../../shared/shared.h"
 #include "../../DataSet/DataSet.h"
-#include "../../include/typedefs.h"
-#include "../../include/types.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
+#include "../../include/include.h"
+#include "../../include/include.h"
 
 /*Object constructors and destructor*/
Index: issm/trunk/src/c/objects/Inputs/BoolInput.h
===================================================================
--- issm/trunk/src/c/objects/Inputs/BoolInput.h	(revision 3774)
+++ issm/trunk/src/c/objects/Inputs/BoolInput.h	(revision 3775)
@@ -10,5 +10,5 @@
 /*{{{1*/
 #include "./Input.h"
-#include "../../include/types.h"
+#include "../../include/include.h"
 /*}}}*/
 
Index: issm/trunk/src/c/objects/Inputs/DoubleInput.cpp
===================================================================
--- issm/trunk/src/c/objects/Inputs/DoubleInput.cpp	(revision 3774)
+++ issm/trunk/src/c/objects/Inputs/DoubleInput.cpp	(revision 3775)
@@ -15,7 +15,7 @@
 #include "../../shared/shared.h"
 #include "../../DataSet/DataSet.h"
-#include "../../include/typedefs.h"
-#include "../../include/types.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
+#include "../../include/include.h"
+#include "../../include/include.h"
 
 /*Object constructors and destructor*/
Index: issm/trunk/src/c/objects/Inputs/DoubleInput.h
===================================================================
--- issm/trunk/src/c/objects/Inputs/DoubleInput.h	(revision 3774)
+++ issm/trunk/src/c/objects/Inputs/DoubleInput.h	(revision 3775)
@@ -10,5 +10,5 @@
 /*{{{1*/
 #include "./Input.h"
-#include "../../include/types.h"
+#include "../../include/include.h"
 /*}}}*/
 
Index: issm/trunk/src/c/objects/Inputs/IntInput.cpp
===================================================================
--- issm/trunk/src/c/objects/Inputs/IntInput.cpp	(revision 3774)
+++ issm/trunk/src/c/objects/Inputs/IntInput.cpp	(revision 3775)
@@ -15,7 +15,7 @@
 #include "../../shared/shared.h"
 #include "../../DataSet/DataSet.h"
-#include "../../include/typedefs.h"
-#include "../../include/types.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
+#include "../../include/include.h"
+#include "../../include/include.h"
 
 /*Object constructors and destructor*/
Index: issm/trunk/src/c/objects/Inputs/IntInput.h
===================================================================
--- issm/trunk/src/c/objects/Inputs/IntInput.h	(revision 3774)
+++ issm/trunk/src/c/objects/Inputs/IntInput.h	(revision 3775)
@@ -10,5 +10,5 @@
 /*{{{1*/
 #include "./Input.h"
-#include "../../include/types.h"
+#include "../../include/include.h"
 /*}}}*/
 
Index: issm/trunk/src/c/objects/Inputs/PentaVertexInput.cpp
===================================================================
--- issm/trunk/src/c/objects/Inputs/PentaVertexInput.cpp	(revision 3774)
+++ issm/trunk/src/c/objects/Inputs/PentaVertexInput.cpp	(revision 3775)
@@ -15,6 +15,6 @@
 #include "../../shared/shared.h"
 #include "../../DataSet/DataSet.h"
-#include "../../include/typedefs.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
+#include "../../include/include.h"
 
 /*Object constructors and destructor*/
Index: issm/trunk/src/c/objects/Inputs/SingVertexInput.cpp
===================================================================
--- issm/trunk/src/c/objects/Inputs/SingVertexInput.cpp	(revision 3774)
+++ issm/trunk/src/c/objects/Inputs/SingVertexInput.cpp	(revision 3775)
@@ -15,6 +15,6 @@
 #include "../../shared/shared.h"
 #include "../../DataSet/DataSet.h"
-#include "../../include/typedefs.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
+#include "../../include/include.h"
 
 /*Object constructors and destructor*/
Index: issm/trunk/src/c/objects/Inputs/TriaVertexInput.cpp
===================================================================
--- issm/trunk/src/c/objects/Inputs/TriaVertexInput.cpp	(revision 3774)
+++ issm/trunk/src/c/objects/Inputs/TriaVertexInput.cpp	(revision 3775)
@@ -15,6 +15,6 @@
 #include "../../shared/shared.h"
 #include "../../DataSet/DataSet.h"
-#include "../../include/typedefs.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
+#include "../../include/include.h"
 
 /*Object constructors and destructor*/
Index: issm/trunk/src/c/objects/IoModel.cpp
===================================================================
--- issm/trunk/src/c/objects/IoModel.cpp	(revision 3774)
+++ issm/trunk/src/c/objects/IoModel.cpp	(revision 3775)
@@ -10,11 +10,10 @@
 #endif
 
-#include "../shared/shared.h"
-#include "../io/io.h"
-#include "../include/globals.h"
-#include "../include/macros.h"
 #include <string.h>
 #include "stdio.h"
 #include "./objects.h"
+#include "../shared/shared.h"
+#include "../io/io.h"
+#include "../include/include.h"
 
 /*FUNCTION IoModel::IoModel(){{{1*/
Index: issm/trunk/src/c/objects/IoModel.h
===================================================================
--- issm/trunk/src/c/objects/IoModel.h	(revision 3774)
+++ issm/trunk/src/c/objects/IoModel.h	(revision 3775)
@@ -8,5 +8,5 @@
 #define _IOMODEL_H
 
-#include "../include/types.h"
+#include "../include/include.h"
 
 class IoModel {
Index: issm/trunk/src/c/objects/Loads/Friction.cpp
===================================================================
--- issm/trunk/src/c/objects/Loads/Friction.cpp	(revision 3774)
+++ issm/trunk/src/c/objects/Loads/Friction.cpp	(revision 3775)
@@ -5,5 +5,5 @@
 #include "../objects.h"
 #include "../../shared/shared.h"
-#include "../../include/typedefs.h"
+#include "../../include/include.h"
 
 /*--------------------------------------------------
Index: issm/trunk/src/c/objects/Loads/Icefront.cpp
===================================================================
--- issm/trunk/src/c/objects/Loads/Icefront.cpp	(revision 3774)
+++ issm/trunk/src/c/objects/Loads/Icefront.cpp	(revision 3775)
@@ -16,6 +16,6 @@
 #include "../../EnumDefinitions/EnumDefinitions.h"
 #include "../../shared/shared.h"
-#include "../../include/typedefs.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
+#include "../../include/include.h"
 /*}}}*/	
 
Index: issm/trunk/src/c/objects/Loads/Numericalflux.cpp
===================================================================
--- issm/trunk/src/c/objects/Loads/Numericalflux.cpp	(revision 3774)
+++ issm/trunk/src/c/objects/Loads/Numericalflux.cpp	(revision 3775)
@@ -13,6 +13,6 @@
 #include "../../EnumDefinitions/EnumDefinitions.h"
 #include "../../shared/shared.h"
-#include "../../include/typedefs.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
+#include "../../include/include.h"
 #include "../objects.h"
 
Index: issm/trunk/src/c/objects/Loads/Pengrid.cpp
===================================================================
--- issm/trunk/src/c/objects/Loads/Pengrid.cpp	(revision 3774)
+++ issm/trunk/src/c/objects/Loads/Pengrid.cpp	(revision 3775)
@@ -14,8 +14,8 @@
 #include "../objects.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
 #include "../../shared/shared.h"
-#include "../../include/typedefs.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
+#include "../../include/include.h"
 #include "../../DataSet/DataSet.h"
 	
Index: issm/trunk/src/c/objects/Loads/Penpair.cpp
===================================================================
--- issm/trunk/src/c/objects/Loads/Penpair.cpp	(revision 3774)
+++ issm/trunk/src/c/objects/Loads/Penpair.cpp	(revision 3775)
@@ -14,7 +14,7 @@
 #include "../objects.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
 #include "../../shared/shared.h"
-#include "../../include/typedefs.h"
+#include "../../include/include.h"
 
 		
Index: issm/trunk/src/c/objects/Loads/Riftfront.cpp
===================================================================
--- issm/trunk/src/c/objects/Loads/Riftfront.cpp	(revision 3774)
+++ issm/trunk/src/c/objects/Loads/Riftfront.cpp	(revision 3775)
@@ -15,6 +15,6 @@
 #include "../../EnumDefinitions/EnumDefinitions.h"
 #include "../../shared/shared.h"
-#include "../../include/typedefs.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
+#include "../../include/include.h"
 #include "../../ModelProcessorx/ModelProcessorx.h"
 #include "../objects.h"
Index: issm/trunk/src/c/objects/Materials/Matice.cpp
===================================================================
--- issm/trunk/src/c/objects/Materials/Matice.cpp	(revision 3774)
+++ issm/trunk/src/c/objects/Materials/Matice.cpp	(revision 3775)
@@ -14,6 +14,6 @@
 #include "../../EnumDefinitions/EnumDefinitions.h"
 #include "../../shared/shared.h"
-#include "../../include/macros.h"
-#include "../../include/typedefs.h"
+#include "../../include/include.h"
+#include "../../include/include.h"
 		
 /*Object constructors and destructor*/
Index: issm/trunk/src/c/objects/Materials/Matpar.cpp
===================================================================
--- issm/trunk/src/c/objects/Materials/Matpar.cpp	(revision 3774)
+++ issm/trunk/src/c/objects/Materials/Matpar.cpp	(revision 3775)
@@ -14,5 +14,5 @@
 #include "../objects.h"
 #include "../../shared/shared.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"
 
Index: issm/trunk/src/c/objects/Model.cpp
===================================================================
--- issm/trunk/src/c/objects/Model.cpp	(revision 3774)
+++ issm/trunk/src/c/objects/Model.cpp	(revision 3775)
@@ -14,5 +14,5 @@
 #include "../ModelProcessorx/ModelProcessorx.h"
 #include "./objects.h"
-#include "../include/types.h"
+#include "../include/include.h"
 #include "../EnumDefinitions/EnumDefinitions.h"
 #include "../modules.h"
Index: issm/trunk/src/c/objects/Model.h
===================================================================
--- issm/trunk/src/c/objects/Model.h	(revision 3774)
+++ issm/trunk/src/c/objects/Model.h	(revision 3775)
@@ -8,5 +8,5 @@
 /*Headers:*/
 /*{{{1*/
-#include "../include/types.h"
+#include "../include/include.h"
 struct FemModel;
 class DataSet;
Index: issm/trunk/src/c/objects/Node.cpp
===================================================================
--- issm/trunk/src/c/objects/Node.cpp	(revision 3774)
+++ issm/trunk/src/c/objects/Node.cpp	(revision 3775)
@@ -16,6 +16,6 @@
 #include "../EnumDefinitions/EnumDefinitions.h"
 #include "../shared/shared.h"
-#include "../include/typedefs.h"
-#include "../include/macros.h"
+#include "../include/include.h"
+#include "../include/include.h"
 /*}}}*/
 
Index: issm/trunk/src/c/objects/NodeSets.cpp
===================================================================
--- issm/trunk/src/c/objects/NodeSets.cpp	(revision 3774)
+++ issm/trunk/src/c/objects/NodeSets.cpp	(revision 3775)
@@ -3,5 +3,5 @@
  */ 
 
-#include "../include/macros.h"
+#include "../include/include.h"
 #include "../shared/shared.h"
 #include "./objects.h"
Index: issm/trunk/src/c/objects/Params/BoolParam.cpp
===================================================================
--- issm/trunk/src/c/objects/Params/BoolParam.cpp	(revision 3774)
+++ issm/trunk/src/c/objects/Params/BoolParam.cpp	(revision 3775)
@@ -17,7 +17,7 @@
 #include "../../shared/shared.h"
 #include "../../DataSet/DataSet.h"
-#include "../../include/typedefs.h"
-#include "../../include/types.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
+#include "../../include/include.h"
+#include "../../include/include.h"
 /*}}}*/
 
Index: issm/trunk/src/c/objects/Params/BoolParam.h
===================================================================
--- issm/trunk/src/c/objects/Params/BoolParam.h	(revision 3774)
+++ issm/trunk/src/c/objects/Params/BoolParam.h	(revision 3775)
@@ -22,8 +22,8 @@
 
 #include "./Param.h"
-#include "../../include/types.h"
+#include "../../include/include.h"
 #include "../../shared/shared.h"
-#include "../../include/typedefs.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
+#include "../../include/include.h"
 /*}}}*/
 
Index: issm/trunk/src/c/objects/Params/DoubleMatParam.cpp
===================================================================
--- issm/trunk/src/c/objects/Params/DoubleMatParam.cpp	(revision 3774)
+++ issm/trunk/src/c/objects/Params/DoubleMatParam.cpp	(revision 3775)
@@ -17,7 +17,7 @@
 #include "../../shared/shared.h"
 #include "../../DataSet/DataSet.h"
-#include "../../include/typedefs.h"
-#include "../../include/types.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
+#include "../../include/include.h"
+#include "../../include/include.h"
 /*}}}*/
 
Index: issm/trunk/src/c/objects/Params/DoubleMatParam.h
===================================================================
--- issm/trunk/src/c/objects/Params/DoubleMatParam.h	(revision 3774)
+++ issm/trunk/src/c/objects/Params/DoubleMatParam.h	(revision 3775)
@@ -22,8 +22,8 @@
 
 #include "./Param.h"
-#include "../../include/types.h"
+#include "../../include/include.h"
 #include "../../shared/shared.h"
-#include "../../include/typedefs.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
+#include "../../include/include.h"
 /*}}}*/
 
Index: issm/trunk/src/c/objects/Params/DoubleParam.cpp
===================================================================
--- issm/trunk/src/c/objects/Params/DoubleParam.cpp	(revision 3774)
+++ issm/trunk/src/c/objects/Params/DoubleParam.cpp	(revision 3775)
@@ -15,7 +15,6 @@
 #include "../../shared/shared.h"
 #include "../../DataSet/DataSet.h"
-#include "../../include/typedefs.h"
-#include "../../include/types.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
+#include "../../include/include.h"
 
 /*Object constructors and destructor*/
Index: issm/trunk/src/c/objects/Params/DoubleParam.h
===================================================================
--- issm/trunk/src/c/objects/Params/DoubleParam.h	(revision 3774)
+++ issm/trunk/src/c/objects/Params/DoubleParam.h	(revision 3775)
@@ -22,8 +22,8 @@
 
 #include "./Param.h"
-#include "../../include/types.h"
+#include "../../include/include.h"
 #include "../../shared/shared.h"
-#include "../../include/typedefs.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
+#include "../../include/include.h"
 /*}}}*/
 
Index: issm/trunk/src/c/objects/Params/DoubleVecParam.cpp
===================================================================
--- issm/trunk/src/c/objects/Params/DoubleVecParam.cpp	(revision 3774)
+++ issm/trunk/src/c/objects/Params/DoubleVecParam.cpp	(revision 3775)
@@ -17,7 +17,7 @@
 #include "../../shared/shared.h"
 #include "../../DataSet/DataSet.h"
-#include "../../include/typedefs.h"
-#include "../../include/types.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
+#include "../../include/include.h"
+#include "../../include/include.h"
 /*}}}*/
 
Index: issm/trunk/src/c/objects/Params/DoubleVecParam.h
===================================================================
--- issm/trunk/src/c/objects/Params/DoubleVecParam.h	(revision 3774)
+++ issm/trunk/src/c/objects/Params/DoubleVecParam.h	(revision 3775)
@@ -22,8 +22,8 @@
 
 #include "./Param.h"
-#include "../../include/types.h"
+#include "../../include/include.h"
 #include "../../shared/shared.h"
-#include "../../include/typedefs.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
+#include "../../include/include.h"
 /*}}}*/
 
Index: issm/trunk/src/c/objects/Params/IntParam.cpp
===================================================================
--- issm/trunk/src/c/objects/Params/IntParam.cpp	(revision 3774)
+++ issm/trunk/src/c/objects/Params/IntParam.cpp	(revision 3775)
@@ -17,7 +17,7 @@
 #include "../../shared/shared.h"
 #include "../../DataSet/DataSet.h"
-#include "../../include/typedefs.h"
-#include "../../include/types.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
+#include "../../include/include.h"
+#include "../../include/include.h"
 /*}}}*/
 
Index: issm/trunk/src/c/objects/Params/IntParam.h
===================================================================
--- issm/trunk/src/c/objects/Params/IntParam.h	(revision 3774)
+++ issm/trunk/src/c/objects/Params/IntParam.h	(revision 3775)
@@ -22,8 +22,8 @@
 
 #include "./Param.h"
-#include "../../include/types.h"
+#include "../../include/include.h"
 #include "../../shared/shared.h"
-#include "../../include/typedefs.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
+#include "../../include/include.h"
 /*}}}*/
 
Index: issm/trunk/src/c/objects/Params/PetscMatParam.cpp
===================================================================
--- issm/trunk/src/c/objects/Params/PetscMatParam.cpp	(revision 3774)
+++ issm/trunk/src/c/objects/Params/PetscMatParam.cpp	(revision 3775)
@@ -17,7 +17,7 @@
 #include "../../shared/shared.h"
 #include "../../DataSet/DataSet.h"
-#include "../../include/typedefs.h"
-#include "../../include/types.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
+#include "../../include/include.h"
+#include "../../include/include.h"
 /*}}}*/
 
Index: issm/trunk/src/c/objects/Params/PetscMatParam.h
===================================================================
--- issm/trunk/src/c/objects/Params/PetscMatParam.h	(revision 3774)
+++ issm/trunk/src/c/objects/Params/PetscMatParam.h	(revision 3775)
@@ -22,8 +22,8 @@
 
 #include "./Param.h"
-#include "../../include/types.h"
+#include "../../include/include.h"
 #include "../../shared/shared.h"
-#include "../../include/typedefs.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
+#include "../../include/include.h"
 /*}}}*/
 
Index: issm/trunk/src/c/objects/Params/PetscVecParam.cpp
===================================================================
--- issm/trunk/src/c/objects/Params/PetscVecParam.cpp	(revision 3774)
+++ issm/trunk/src/c/objects/Params/PetscVecParam.cpp	(revision 3775)
@@ -17,7 +17,7 @@
 #include "../../shared/shared.h"
 #include "../../DataSet/DataSet.h"
-#include "../../include/typedefs.h"
-#include "../../include/types.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
+#include "../../include/include.h"
+#include "../../include/include.h"
 /*}}}*/
 
Index: issm/trunk/src/c/objects/Params/PetscVecParam.h
===================================================================
--- issm/trunk/src/c/objects/Params/PetscVecParam.h	(revision 3774)
+++ issm/trunk/src/c/objects/Params/PetscVecParam.h	(revision 3775)
@@ -22,8 +22,8 @@
 
 #include "./Param.h"
-#include "../../include/types.h"
+#include "../../include/include.h"
 #include "../../shared/shared.h"
-#include "../../include/typedefs.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
+#include "../../include/include.h"
 /*}}}*/
 
Index: issm/trunk/src/c/objects/Params/StringArrayParam.cpp
===================================================================
--- issm/trunk/src/c/objects/Params/StringArrayParam.cpp	(revision 3774)
+++ issm/trunk/src/c/objects/Params/StringArrayParam.cpp	(revision 3775)
@@ -17,7 +17,7 @@
 #include "../../shared/shared.h"
 #include "../../DataSet/DataSet.h"
-#include "../../include/typedefs.h"
-#include "../../include/types.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
+#include "../../include/include.h"
+#include "../../include/include.h"
 /*}}}*/
 
Index: issm/trunk/src/c/objects/Params/StringArrayParam.h
===================================================================
--- issm/trunk/src/c/objects/Params/StringArrayParam.h	(revision 3774)
+++ issm/trunk/src/c/objects/Params/StringArrayParam.h	(revision 3775)
@@ -22,8 +22,8 @@
 
 #include "./Param.h"
-#include "../../include/types.h"
+#include "../../include/include.h"
 #include "../../shared/shared.h"
-#include "../../include/typedefs.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
+#include "../../include/include.h"
 /*}}}*/
 
Index: issm/trunk/src/c/objects/Params/StringParam.cpp
===================================================================
--- issm/trunk/src/c/objects/Params/StringParam.cpp	(revision 3774)
+++ issm/trunk/src/c/objects/Params/StringParam.cpp	(revision 3775)
@@ -17,7 +17,7 @@
 #include "../../shared/shared.h"
 #include "../../DataSet/DataSet.h"
-#include "../../include/typedefs.h"
-#include "../../include/types.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
+#include "../../include/include.h"
+#include "../../include/include.h"
 /*}}}*/
 
Index: issm/trunk/src/c/objects/Params/StringParam.h
===================================================================
--- issm/trunk/src/c/objects/Params/StringParam.h	(revision 3774)
+++ issm/trunk/src/c/objects/Params/StringParam.h	(revision 3775)
@@ -22,8 +22,8 @@
 
 #include "./Param.h"
-#include "../../include/types.h"
+#include "../../include/include.h"
 #include "../../shared/shared.h"
-#include "../../include/typedefs.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
+#include "../../include/include.h"
 /*}}}*/
 
Index: issm/trunk/src/c/objects/Result.cpp
===================================================================
--- issm/trunk/src/c/objects/Result.cpp	(revision 3774)
+++ issm/trunk/src/c/objects/Result.cpp	(revision 3775)
@@ -14,8 +14,8 @@
 #include "./objects.h"
 #include "../EnumDefinitions/EnumDefinitions.h"
-#include "../include/macros.h"
+#include "../include/include.h"
 #include "../shared/shared.h"
-#include "../include/typedefs.h"
-#include "../include/macros.h"
+#include "../include/include.h"
+#include "../include/include.h"
 
 /*Object constructors and destructor*/
Index: issm/trunk/src/c/objects/Vertex.cpp
===================================================================
--- issm/trunk/src/c/objects/Vertex.cpp	(revision 3774)
+++ issm/trunk/src/c/objects/Vertex.cpp	(revision 3775)
@@ -13,8 +13,8 @@
 #include "./objects.h"
 #include "../EnumDefinitions/EnumDefinitions.h"
-#include "../include/macros.h"
+#include "../include/include.h"
 #include "../shared/shared.h"
-#include "../include/typedefs.h"
-#include "../include/macros.h"
+#include "../include/include.h"
+#include "../include/include.h"
 /*}}}*/
 
Index: issm/trunk/src/c/objects/Vertex.h
===================================================================
--- issm/trunk/src/c/objects/Vertex.h	(revision 3774)
+++ issm/trunk/src/c/objects/Vertex.h	(revision 3775)
@@ -12,5 +12,5 @@
 class IoModel;
 #include "../shared/Exceptions/exceptions.h"
-#include "../include/macros.h"
+#include "../include/include.h"
 
 /*}}}*/
Index: issm/trunk/src/c/parallel/ControlInitialization.cpp
===================================================================
--- issm/trunk/src/c/parallel/ControlInitialization.cpp	(revision 3774)
+++ issm/trunk/src/c/parallel/ControlInitialization.cpp	(revision 3775)
@@ -104,5 +104,5 @@
 
 	//Add to inputs:
-	SplitSolutionVector(ug_horiz,numberofnodes,numberofdofspernode_dh,&vx,&vy);
+	SplitSolutionVectorx(ug_horiz,numberofnodes,numberofdofspernode_dh,&vx,&vy);
 	model->UpdateInputsFromVector(vx,VxEnum,VertexEnum);
 	model->UpdateInputsFromVector(vy,VyEnum,VertexEnum);
@@ -129,5 +129,5 @@
 
 	//Add in inputs
-	SplitSolutionVector(ug_stokes,numberofnodes,numberofdofspernode_ds,&vx,&vy,&vz,&pressure);
+	SplitSolutionVectorx(ug_stokes,numberofnodes,numberofdofspernode_ds,&vx,&vy,&vz,&pressure);
 	model->UpdateInputsFromVector(vx,VxEnum,VertexEnum);
 	model->UpdateInputsFromVector(vy,VyEnum,VertexEnum);
@@ -150,5 +150,5 @@
 	//Add in inputs
 	xfree((void**)&vx); xfree((void**)&vy); xfree((void**)&vz); xfree((void**)&pressure);
-	SplitSolutionVector(ug,numberofnodes,numberofdofspernode_ds,&vx,&vy,&vz,&pressure);
+	SplitSolutionVectorx(ug,numberofnodes,numberofdofspernode_ds,&vx,&vy,&vz,&pressure);
 	model->UpdateInputsFromVector(vx,VxEnum,VertexEnum);
 	model->UpdateInputsFromVector(vy,VyEnum,VertexEnum);
Index: issm/trunk/src/c/parallel/WriteLockFile.cpp
===================================================================
--- issm/trunk/src/c/parallel/WriteLockFile.cpp	(revision 3774)
+++ issm/trunk/src/c/parallel/WriteLockFile.cpp	(revision 3775)
@@ -4,5 +4,5 @@
 #include "stdio.h"
 #include "../shared/shared.h"
-#include "../include/macros.h"
+#include "../include/include.h"
 
 void WriteLockFile(char* filename){
Index: issm/trunk/src/c/parallel/balancedthickness.cpp
===================================================================
--- issm/trunk/src/c/parallel/balancedthickness.cpp	(revision 3774)
+++ issm/trunk/src/c/parallel/balancedthickness.cpp	(revision 3775)
@@ -12,5 +12,5 @@
 #include "../DataSet/DataSet.h"
 #include "../EnumDefinitions/EnumDefinitions.h"
-#include "../include/globals.h"
+#include "../include/include.h"
 #include "./parallel.h"
 
Index: issm/trunk/src/c/parallel/balancedthickness2.cpp
===================================================================
--- issm/trunk/src/c/parallel/balancedthickness2.cpp	(revision 3774)
+++ issm/trunk/src/c/parallel/balancedthickness2.cpp	(revision 3775)
@@ -13,5 +13,5 @@
 #include "../DataSet/DataSet.h"
 #include "../EnumDefinitions/EnumDefinitions.h"
-#include "../include/globals.h"
+#include "../include/include.h"
 #include "./parallel.h"
 
Index: issm/trunk/src/c/parallel/balancedthickness2_core.cpp
===================================================================
--- issm/trunk/src/c/parallel/balancedthickness2_core.cpp	(revision 3774)
+++ issm/trunk/src/c/parallel/balancedthickness2_core.cpp	(revision 3775)
@@ -6,5 +6,5 @@
 #include "../objects/objects.h"
 #include "../shared/shared.h"
-#include "../include/macros.h"
+#include "../include/include.h"
 #include "../EnumDefinitions/EnumDefinitions.h"
 #include "./parallel.h"
Index: issm/trunk/src/c/parallel/balancedthickness_core.cpp
===================================================================
--- issm/trunk/src/c/parallel/balancedthickness_core.cpp	(revision 3774)
+++ issm/trunk/src/c/parallel/balancedthickness_core.cpp	(revision 3775)
@@ -6,5 +6,5 @@
 #include "../objects/objects.h"
 #include "../shared/shared.h"
-#include "../include/macros.h"
+#include "../include/include.h"
 #include "../EnumDefinitions/EnumDefinitions.h"
 #include "./parallel.h"
Index: issm/trunk/src/c/parallel/balancedvelocities.cpp
===================================================================
--- issm/trunk/src/c/parallel/balancedvelocities.cpp	(revision 3774)
+++ issm/trunk/src/c/parallel/balancedvelocities.cpp	(revision 3775)
@@ -13,5 +13,5 @@
 #include "../DataSet/DataSet.h"
 #include "../EnumDefinitions/EnumDefinitions.h"
-#include "../include/globals.h"
+#include "../include/include.h"
 #include "./parallel.h"
 
Index: issm/trunk/src/c/parallel/diagnostic.cpp
===================================================================
--- issm/trunk/src/c/parallel/diagnostic.cpp	(revision 3774)
+++ issm/trunk/src/c/parallel/diagnostic.cpp	(revision 3775)
@@ -13,5 +13,5 @@
 #include "../DataSet/DataSet.h"
 #include "../EnumDefinitions/EnumDefinitions.h"
-#include "../include/globals.h"
+#include "../include/include.h"
 #include "./parallel.h"
 
Index: issm/trunk/src/c/parallel/diagnostic_core.cpp
===================================================================
--- issm/trunk/src/c/parallel/diagnostic_core.cpp	(revision 3774)
+++ issm/trunk/src/c/parallel/diagnostic_core.cpp	(revision 3775)
@@ -9,5 +9,5 @@
 #include "./parallel.h"
 #include "../modules.h"
-#include "../include/macros.h"
+#include "../include/include.h"
 
 void diagnostic_core(DataSet* results,Model* model){
@@ -143,5 +143,5 @@
 		FieldExtrudex( ug,fem_dh->elements,fem_dh->nodes, fem_dh->vertices,fem_dh->loads,fem_dh->materials,fem_dh->parameters,"velocity",1);
 
-		SplitSolutionVector(ug,numberofnodes,numberofdofspernode_dh,&vx,&vy);
+		SplitSolutionVectorx(ug,numberofnodes,numberofdofspernode_dh,&vx,&vy);
 		model->UpdateInputsFromVector(vx,VxEnum,VertexEnum);
 		model->UpdateInputsFromVector(vy,VyEnum,VertexEnum);
Index: issm/trunk/src/c/parallel/gradjcompute_core.cpp
===================================================================
--- issm/trunk/src/c/parallel/gradjcompute_core.cpp	(revision 3774)
+++ issm/trunk/src/c/parallel/gradjcompute_core.cpp	(revision 3775)
@@ -84,5 +84,5 @@
 
 	/*add to inputs: */
-	SplitSolutionVector(lambda_g,numberofnodes,numberofdofspernode,&lambdax,&lambday);
+	SplitSolutionVectorx(lambda_g,numberofnodes,numberofdofspernode,&lambdax,&lambday);
 	model->UpdateInputsFromVector(lambdax,AdjointxEnum,VertexEnum);
 	model->UpdateInputsFromVector(lambday,AdjointyEnum,VertexEnum);
@@ -106,5 +106,5 @@
 		diagnostic_results->FindResult(&u_g,"u_g");
 		
-		SplitSolutionVector(u_g,numberofnodes,3,&vx,&vy,&vz);
+		SplitSolutionVectorx(u_g,numberofnodes,3,&vx,&vy,&vz);
 		model->UpdateInputsFromVector(vx,VxEnum,VertexEnum);
 		model->UpdateInputsFromVector(vy,VyEnum,VertexEnum);
Index: issm/trunk/src/c/parallel/objectivefunctionC.cpp
===================================================================
--- issm/trunk/src/c/parallel/objectivefunctionC.cpp	(revision 3774)
+++ issm/trunk/src/c/parallel/objectivefunctionC.cpp	(revision 3775)
@@ -104,5 +104,5 @@
 		diagnostic_results->FindResult(&u_g,"u_g");
 		
-		SplitSolutionVector(u_g,numberofnodes,3,&vx,&vy,&vz);
+		SplitSolutionVectorx(u_g,numberofnodes,3,&vx,&vy,&vz);
 		femmodel->UpdateInputsFromVector(vx,VxEnum,VertexEnum);
 		femmodel->UpdateInputsFromVector(vy,VxEnum,VertexEnum);
Index: issm/trunk/src/c/parallel/prognostic.cpp
===================================================================
--- issm/trunk/src/c/parallel/prognostic.cpp	(revision 3774)
+++ issm/trunk/src/c/parallel/prognostic.cpp	(revision 3775)
@@ -13,5 +13,5 @@
 #include "../DataSet/DataSet.h"
 #include "../EnumDefinitions/EnumDefinitions.h"
-#include "../include/globals.h"
+#include "../include/include.h"
 #include "./parallel.h"
 
Index: issm/trunk/src/c/parallel/prognostic2.cpp
===================================================================
--- issm/trunk/src/c/parallel/prognostic2.cpp	(revision 3774)
+++ issm/trunk/src/c/parallel/prognostic2.cpp	(revision 3775)
@@ -13,5 +13,5 @@
 #include "../DataSet/DataSet.h"
 #include "../EnumDefinitions/EnumDefinitions.h"
-#include "../include/globals.h"
+#include "../include/include.h"
 #include "./parallel.h"
 
Index: issm/trunk/src/c/parallel/slopecompute.cpp
===================================================================
--- issm/trunk/src/c/parallel/slopecompute.cpp	(revision 3774)
+++ issm/trunk/src/c/parallel/slopecompute.cpp	(revision 3775)
@@ -13,5 +13,5 @@
 #include "../DataSet/DataSet.h"
 #include "../EnumDefinitions/EnumDefinitions.h"
-#include "../include/globals.h"
+#include "../include/include.h"
 #include "./parallel.h"
 
Index: issm/trunk/src/c/parallel/steadystate.cpp
===================================================================
--- issm/trunk/src/c/parallel/steadystate.cpp	(revision 3774)
+++ issm/trunk/src/c/parallel/steadystate.cpp	(revision 3775)
@@ -13,5 +13,5 @@
 #include "../DataSet/DataSet.h"
 #include "../EnumDefinitions/EnumDefinitions.h"
-#include "../include/globals.h"
+#include "../include/include.h"
 #include "./parallel.h"
 
Index: issm/trunk/src/c/parallel/thermal.cpp
===================================================================
--- issm/trunk/src/c/parallel/thermal.cpp	(revision 3774)
+++ issm/trunk/src/c/parallel/thermal.cpp	(revision 3775)
@@ -13,5 +13,5 @@
 #include "../DataSet/DataSet.h"
 #include "../EnumDefinitions/EnumDefinitions.h"
-#include "../include/globals.h"
+#include "../include/include.h"
 #include "./parallel.h"
 
Index: issm/trunk/src/c/parallel/transient.cpp
===================================================================
--- issm/trunk/src/c/parallel/transient.cpp	(revision 3774)
+++ issm/trunk/src/c/parallel/transient.cpp	(revision 3775)
@@ -13,5 +13,5 @@
 #include "../DataSet/DataSet.h"
 #include "../EnumDefinitions/EnumDefinitions.h"
-#include "../include/globals.h"
+#include "../include/include.h"
 #include "./parallel.h"
 
Index: issm/trunk/src/c/parallel/transient_core_2d.cpp
===================================================================
--- issm/trunk/src/c/parallel/transient_core_2d.cpp	(revision 3774)
+++ issm/trunk/src/c/parallel/transient_core_2d.cpp	(revision 3775)
@@ -97,5 +97,5 @@
 		_printf_("%s\n","computing new thickness");
 		
-		SplitSolutionVector(u_g,numberofnodes,2,&vx,&vy);
+		SplitSolutionVectorx(u_g,numberofnodes,2,&vx,&vy);
 		model->UpdateInputsFromVector(vx,VxEnum,VertexEnum);
 		model->UpdateInputsFromVector(vy,VyEnum,VertexEnum);
@@ -130,5 +130,5 @@
 		model->UpdateInputsFromVector(b_g,BedEnum,VertexEnum);
 	
-		SplitSolutionVector(u_g,numberofnodes,2,&vx,&vy);
+		SplitSolutionVectorx(u_g,numberofnodes,2,&vx,&vy);
 		model->UpdateInputsFromVector(vx,VxEnum,VertexEnum);
 		model->UpdateInputsFromVector(vy,VyEnum,VertexEnum);
Index: issm/trunk/src/c/parallel/transient_core_3d.cpp
===================================================================
--- issm/trunk/src/c/parallel/transient_core_3d.cpp	(revision 3774)
+++ issm/trunk/src/c/parallel/transient_core_3d.cpp	(revision 3775)
@@ -118,5 +118,5 @@
 		if(verbose)_printf_("%s\n","computing new thickness");
 	
-		SplitSolutionVector(u_g,numberofnodes,3,&vx,&vy,&vz);
+		SplitSolutionVectorx(u_g,numberofnodes,3,&vx,&vy,&vz);
 		model->UpdateInputsFromVector(vx,VxEnum,VertexEnum);
 		model->UpdateInputsFromVector(vy,VyEnum,VertexEnum);
@@ -159,5 +159,5 @@
 		model->UpdateInputsFromVector(b_g,BedEnum,VertexEnum);
 	
-		SplitSolutionVector(u_g,numberofnodes,3,&vx,&vy,&vz);
+		SplitSolutionVectorx(u_g,numberofnodes,3,&vx,&vy,&vz);
 		model->UpdateInputsFromVector(vx,VxEnum,VertexEnum);
 		model->UpdateInputsFromVector(vy,VyEnum,VertexEnum);
Index: issm/trunk/src/c/shared/Alloc/alloc.cpp
===================================================================
--- issm/trunk/src/c/shared/Alloc/alloc.cpp	(revision 3774)
+++ issm/trunk/src/c/shared/Alloc/alloc.cpp	(revision 3775)
@@ -27,5 +27,5 @@
 #include  "./alloc.h"
 #include "../Exceptions/exceptions.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
 
 void* xmalloc(int size){
Index: issm/trunk/src/c/shared/Dofs/DistributeNumDofs.cpp
===================================================================
--- issm/trunk/src/c/shared/Dofs/DistributeNumDofs.cpp	(revision 3774)
+++ issm/trunk/src/c/shared/Dofs/DistributeNumDofs.cpp	(revision 3775)
@@ -3,5 +3,5 @@
  */ 
 
-#include "../../include/macros.h"
+#include "../../include/include.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"
 #include "../shared.h"
Index: issm/trunk/src/c/shared/Dofs/dofsetgen.cpp
===================================================================
--- issm/trunk/src/c/shared/Dofs/dofsetgen.cpp	(revision 3774)
+++ issm/trunk/src/c/shared/Dofs/dofsetgen.cpp	(revision 3775)
@@ -10,5 +10,5 @@
 
 #include "../Alloc/alloc.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
 #include "stdio.h"
 
Index: issm/trunk/src/c/shared/Elements/ResolvePointers.cpp
===================================================================
--- issm/trunk/src/c/shared/Elements/ResolvePointers.cpp	(revision 3774)
+++ issm/trunk/src/c/shared/Elements/ResolvePointers.cpp	(revision 3775)
@@ -11,6 +11,6 @@
 #include "../../objects/objects.h"
 #include "../../DataSet/DataSet.h"
-#include "../../include/typedefs.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
+#include "../../include/include.h"
 #include "../Exceptions/exceptions.h"
 
Index: issm/trunk/src/c/shared/Exceptions/Exceptions.cpp
===================================================================
--- issm/trunk/src/c/shared/Exceptions/Exceptions.cpp	(revision 3774)
+++ issm/trunk/src/c/shared/Exceptions/Exceptions.cpp	(revision 3775)
@@ -4,5 +4,5 @@
 
 #include "../shared.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
 
 ErrorException::ErrorException(const string &what_arg){
Index: issm/trunk/src/c/shared/Exp/DomainOutlineRead.cpp
===================================================================
--- issm/trunk/src/c/shared/Exp/DomainOutlineRead.cpp	(revision 3774)
+++ issm/trunk/src/c/shared/Exp/DomainOutlineRead.cpp	(revision 3775)
@@ -8,5 +8,5 @@
 #include "stdio.h"
 #include "../Alloc/alloc.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
 #include "../Exceptions/exceptions.h"
 
Index: issm/trunk/src/c/shared/Matlab/CheckNumMatlabArguments.cpp
===================================================================
--- issm/trunk/src/c/shared/Matlab/CheckNumMatlabArguments.cpp	(revision 3774)
+++ issm/trunk/src/c/shared/Matlab/CheckNumMatlabArguments.cpp	(revision 3775)
@@ -6,5 +6,5 @@
 
 #include "../Exceptions/exceptions.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
 #include "mex.h"
 
Index: issm/trunk/src/c/shared/Matrix/MatrixUtils.cpp
===================================================================
--- issm/trunk/src/c/shared/Matrix/MatrixUtils.cpp	(revision 3774)
+++ issm/trunk/src/c/shared/Matrix/MatrixUtils.cpp	(revision 3775)
@@ -37,5 +37,5 @@
 #include <math.h>
 #include <float.h>    /*  DBL_EPSILON  */
-#include "../../include/macros.h"
+#include "../../include/include.h"
 
 int TripleMultiply( double* a, int nrowa, int ncola, int itrna, double* b, int nrowb, int ncolb, int itrnb, double* c, int nrowc, int ncolc, int itrnc, double* d, int iaddd){
Index: issm/trunk/src/c/shared/Numerics/BrentSearch.cpp
===================================================================
--- issm/trunk/src/c/shared/Numerics/BrentSearch.cpp	(revision 3774)
+++ issm/trunk/src/c/shared/Numerics/BrentSearch.cpp	(revision 3775)
@@ -11,5 +11,5 @@
 #include "./numerics.h"
 #include "../../objects/objects.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
 #include "../../shared/shared.h"
 #include <float.h>
Index: issm/trunk/src/c/shared/Numerics/GaussPoints.cpp
===================================================================
--- issm/trunk/src/c/shared/Numerics/GaussPoints.cpp	(revision 3774)
+++ issm/trunk/src/c/shared/Numerics/GaussPoints.cpp	(revision 3775)
@@ -5,6 +5,6 @@
 #include "../Matlab/matlabshared.h"
 #include "../Alloc/alloc.h"
-#include "../../include/macros.h"
-#include "../../include/typedefs.h"
+#include "../../include/include.h"
+#include "../../include/include.h"
 #include "../Exceptions/exceptions.h"
 #include <math.h>
Index: issm/trunk/src/c/shared/Numerics/OptFunc.cpp
===================================================================
--- issm/trunk/src/c/shared/Numerics/OptFunc.cpp	(revision 3774)
+++ issm/trunk/src/c/shared/Numerics/OptFunc.cpp	(revision 3775)
@@ -11,5 +11,5 @@
 #include "../../objects/objects.h"
 #include "../../shared/shared.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
 
 #ifdef _SERIAL_
Index: issm/trunk/src/c/shared/Numerics/numerics.h
===================================================================
--- issm/trunk/src/c/shared/Numerics/numerics.h	(revision 3774)
+++ issm/trunk/src/c/shared/Numerics/numerics.h	(revision 3775)
@@ -8,5 +8,4 @@
 #include "./GaussPoints.h"
 #include "./isnan.h"
-#include "./SplitSolutionVector.h"
 
 struct OptArgs;
Index: issm/trunk/src/c/shared/Threads/LaunchThread.cpp
===================================================================
--- issm/trunk/src/c/shared/Threads/LaunchThread.cpp	(revision 3774)
+++ issm/trunk/src/c/shared/Threads/LaunchThread.cpp	(revision 3775)
@@ -22,5 +22,5 @@
 #include "../Alloc/alloc.h"
 #include "../Exceptions/exceptions.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
 
 void LaunchThread(void* function(void*), void* gate,int num_threads){
Index: issm/trunk/src/c/shared/TriMesh/TriMeshUtils.cpp
===================================================================
--- issm/trunk/src/c/shared/TriMesh/TriMeshUtils.cpp	(revision 3774)
+++ issm/trunk/src/c/shared/TriMesh/TriMeshUtils.cpp	(revision 3775)
@@ -8,5 +8,5 @@
 #include "../Exceptions/exceptions.h"
 #include "../Alloc/alloc.h"
-#include "../../include/macros.h"
+#include "../../include/include.h"
 
 int IsGridOnRift(int* riftsegments, int nriftsegs, int grid){
Index: issm/trunk/src/c/toolkits/petsc/patches/MatInvert.cpp
===================================================================
--- issm/trunk/src/c/toolkits/petsc/patches/MatInvert.cpp	(revision 3774)
+++ issm/trunk/src/c/toolkits/petsc/patches/MatInvert.cpp	(revision 3775)
@@ -9,5 +9,5 @@
 
 #include "../../../shared/shared.h"
-#include "../../../include/macros.h"
+#include "../../../include/include.h"
 
 void MatInvert(Mat* pinv, Mat matrix){
Index: issm/trunk/src/c/toolkits/petsc/patches/NewMat.cpp
===================================================================
--- issm/trunk/src/c/toolkits/petsc/patches/NewMat.cpp	(revision 3774)
+++ issm/trunk/src/c/toolkits/petsc/patches/NewMat.cpp	(revision 3775)
@@ -17,5 +17,5 @@
 
 #include "../../../shared/shared.h"
-#include "../../../include/macros.h"
+#include "../../../include/include.h"
 
 Mat NewMat(int M,int N,double* psparsity,int* pconnectivity,int* pnumberofdofspernode){
Index: issm/trunk/src/c/toolkits/petsc/patches/PetscOptionsDetermineSolverType.cpp
===================================================================
--- issm/trunk/src/c/toolkits/petsc/patches/PetscOptionsDetermineSolverType.cpp	(revision 3774)
+++ issm/trunk/src/c/toolkits/petsc/patches/PetscOptionsDetermineSolverType.cpp	(revision 3775)
@@ -37,5 +37,5 @@
 
 #include "../../../shared/shared.h"
-#include "../../../include/macros.h"
+#include "../../../include/include.h"
 
 void PetscOptionsDetermineSolverType(int* psolver_type,char* options_string){
Index: issm/trunk/src/c/toolkits/petsc/patches/PetscOptionsInsertMultipleString.cpp
===================================================================
--- issm/trunk/src/c/toolkits/petsc/patches/PetscOptionsInsertMultipleString.cpp	(revision 3774)
+++ issm/trunk/src/c/toolkits/petsc/patches/PetscOptionsInsertMultipleString.cpp	(revision 3775)
@@ -17,5 +17,5 @@
 
 #include "../../../shared/shared.h"
-#include "../../../include/macros.h"
+#include "../../../include/include.h"
 
 void PetscOptionsInsertMultipleString(char* options_string){
Index: issm/trunk/src/c/toolkits/petsc/patches/VecMerge.cpp
===================================================================
--- issm/trunk/src/c/toolkits/petsc/patches/VecMerge.cpp	(revision 3774)
+++ issm/trunk/src/c/toolkits/petsc/patches/VecMerge.cpp	(revision 3775)
@@ -17,5 +17,5 @@
 
 #include "../../../shared/shared.h"
-#include "../../../include/macros.h"
+#include "../../../include/include.h"
 
 void VecMerge(Vec A, Vec B, double* row_partition_vector,int row_partition_size){
Index: issm/trunk/src/c/toolkits/plapack/patches/PlapackInvertMatrix.cpp
===================================================================
--- issm/trunk/src/c/toolkits/plapack/patches/PlapackInvertMatrix.cpp	(revision 3774)
+++ issm/trunk/src/c/toolkits/plapack/patches/PlapackInvertMatrix.cpp	(revision 3775)
@@ -2,5 +2,5 @@
  * \brief invert petsc matrix using Plapack
  */
-#include "../../../include/macros.h"
+#include "../../../include/include.h"
 
 /* petsc: */
Index: issm/trunk/src/c/toolkits/plapack/plapackincludes.h
===================================================================
--- issm/trunk/src/c/toolkits/plapack/plapackincludes.h	(revision 3774)
+++ issm/trunk/src/c/toolkits/plapack/plapackincludes.h	(revision 3775)
@@ -7,5 +7,5 @@
 
 #include "PLA.h"
-#include "PLA_prototypes.h"
+#include "PLA_protoinclude.h"
 
 /* missing Plapack prototypes: */
Index: issm/trunk/src/mex/SplitSolutionVector/SplitSolutionVector.cpp
===================================================================
--- issm/trunk/src/mex/SplitSolutionVector/SplitSolutionVector.cpp	(revision 3774)
+++ issm/trunk/src/mex/SplitSolutionVector/SplitSolutionVector.cpp	(revision 3775)
@@ -12,5 +12,5 @@
 	/*input datasets: */
 	double* vector=NULL;
-	int dummy=NULL;
+	int dummy;
 	int numberofnodes;
 	int numberofdofspernode;
@@ -27,5 +27,5 @@
 	for(i=0;i<numberofdofspernode;i++){
 		double*  component=(double*)xmalloc(numberofnodes*sizeof(double));
-		for (j=0;j<numberofnodes;j++) component[i]=vector[j*numberofdofs+i];
+		for (j=0;j<numberofnodes;j++) component[i]=vector[j*numberofdofspernode+i];
 
 
