Index: sm/trunk/src/c/issm.h
===================================================================
--- /issm/trunk/src/c/issm.h	(revision 3683)
+++ 	(revision )
@@ -1,72 +1,0 @@
-/*! \file issm.h: 
- *  \brief header file for all the ISSM library. 
- *  This header file should be included for the parallel binaries, or any 
- *  matlab mex module.
- */
-
-#ifndef _ISSM_H_
-#define _ISSM_H_
-
-#include "DataSet/DataSet.h"
-#include "io/io.h"
-#include "EnumDefinitions/EnumDefinitions.h"
-#include "toolkits/toolkits.h"
-#include "objects/objects.h"
-#include "shared/shared.h"
-#include "include/macros.h"
-#include "include/globals.h"
-#include "include/types.h"
-
-/*Modules: */
-#include "./ModelProcessorx/ModelProcessorx.h"
-#include "./Dofx/Dofx.h"
-#include "./Dux/Dux.h"
-#include "./SpcNodesx/SpcNodesx.h"
-#include "./MpcNodesx/MpcNodesx.h"
-#include "./ContourToMeshx/ContourToMeshx.h"
-#include "./ContourToNodesx/ContourToNodesx.h"
-#include "./InterpFromGridToMeshx/InterpFromGridToMeshx.h"
-#include "./InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.h"
-#include "./InterpFromMeshToMesh3dx/InterpFromMeshToMesh3dx.h"
-#include "./InterpFromMeshToGridx/InterpFromMeshToGridx.h"
-#include "./HoleFillerx/HoleFillerx.h"
-#include "./AverageFilterx/AverageFilterx.h"
-#include "./MeshPartitionx/MeshPartitionx.h"
-#include "./BuildNodeSetsx/BuildNodeSetsx.h"
-#include "./Reducevectorgtosx/Reducevectorgtosx.h"
-#include "./Reducevectorgtofx/Reducevectorgtofx.h"
-#include "./NormalizeConstraintsx/NormalizeConstraintsx.h"
-#include "./ConfigureObjectsx/ConfigureObjectsx.h"
-#include "./SystemMatricesx/SystemMatricesx.h"
-#include "./UpdateInputsx/UpdateInputsx.h"
-#include "./UpdateGeometryx/UpdateGeometryx.h"
-#include "./UpdateVertexPositionsx/UpdateVertexPositionsx.h"
-#include "./PenaltySystemMatricesx/PenaltySystemMatricesx.h"
-#include "./Reducematrixfromgtofx/Reducematrixfromgtofx.h"
-#include "./Reduceloadfromgtofx/Reduceloadfromgtofx.h"
-#include "./Solverx/Solverx.h"
-#include "./Mergesolutionfromftogx/Mergesolutionfromftogx.h"
-#include "./PenaltyConstraintsx/PenaltyConstraintsx.h"
-#include "./ProcessParamsx/ProcessParamsx.h"
-#include "./PropagateFlagsFromConnectivityx/PropagateFlagsFromConnectivityx.h"
-#include "./Gradjx/Gradjx.h"
-#include "./Orthx/Orthx.h"
-#include "./Misfitx/Misfitx.h"
-#include "./SurfaceAreax/SurfaceAreax.h"
-#include "./CostFunctionx/CostFunctionx.h"
-#include "./ControlConstrainx/ControlConstrainx.h"
-#include "./FieldAverageOntoVerticesx/FieldAverageOntoVerticesx.h"
-#include "./FieldDepthAveragex/FieldDepthAveragex.h"
-#include "./ComputeBasalStressx/ComputeBasalStressx.h"
-#include "./ComputePressurex/ComputePressurex.h"
-#include "./ComputeStrainRatex/ComputeStrainRatex.h"
-#include "./FieldExtrudex/FieldExtrudex.h"
-#include "./Qmux/Qmux.h"
-#include "./NodeConnectivityx/NodeConnectivityx.h"
-#include "./ElementConnectivityx/ElementConnectivityx.h"
-#include "./OutputRiftsx/OutputRiftsx.h"
-#include "./MassFluxx/MassFluxx.h"
-#include "./Bamgx/Bamgx.h"
-#include "./BamgConvertMeshx/BamgConvertMeshx.h"
-
-#endif
Index: /issm/trunk/src/c/modules.h
===================================================================
--- /issm/trunk/src/c/modules.h	(revision 3684)
+++ /issm/trunk/src/c/modules.h	(revision 3684)
@@ -0,0 +1,59 @@
+/*! \file issm.h: 
+ *  \brief header file for all the ISSM modules
+ */
+
+#ifndef _ISSM_MODULES_H_
+#define _ISSM_MODULES_H_
+
+/*Modules: */
+#include "./ModelProcessorx/ModelProcessorx.h"
+#include "./Dofx/Dofx.h"
+#include "./Dux/Dux.h"
+#include "./SpcNodesx/SpcNodesx.h"
+#include "./MpcNodesx/MpcNodesx.h"
+#include "./ContourToMeshx/ContourToMeshx.h"
+#include "./ContourToNodesx/ContourToNodesx.h"
+#include "./InterpFromGridToMeshx/InterpFromGridToMeshx.h"
+#include "./InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.h"
+#include "./InterpFromMeshToMesh3dx/InterpFromMeshToMesh3dx.h"
+#include "./InterpFromMeshToGridx/InterpFromMeshToGridx.h"
+#include "./HoleFillerx/HoleFillerx.h"
+#include "./AverageFilterx/AverageFilterx.h"
+#include "./MeshPartitionx/MeshPartitionx.h"
+#include "./BuildNodeSetsx/BuildNodeSetsx.h"
+#include "./Reducevectorgtosx/Reducevectorgtosx.h"
+#include "./Reducevectorgtofx/Reducevectorgtofx.h"
+#include "./NormalizeConstraintsx/NormalizeConstraintsx.h"
+#include "./ConfigureObjectsx/ConfigureObjectsx.h"
+#include "./SystemMatricesx/SystemMatricesx.h"
+#include "./UpdateInputsx/UpdateInputsx.h"
+#include "./UpdateGeometryx/UpdateGeometryx.h"
+#include "./UpdateVertexPositionsx/UpdateVertexPositionsx.h"
+#include "./PenaltySystemMatricesx/PenaltySystemMatricesx.h"
+#include "./Reducematrixfromgtofx/Reducematrixfromgtofx.h"
+#include "./Reduceloadfromgtofx/Reduceloadfromgtofx.h"
+#include "./Solverx/Solverx.h"
+#include "./Mergesolutionfromftogx/Mergesolutionfromftogx.h"
+#include "./PenaltyConstraintsx/PenaltyConstraintsx.h"
+#include "./ProcessParamsx/ProcessParamsx.h"
+#include "./PropagateFlagsFromConnectivityx/PropagateFlagsFromConnectivityx.h"
+#include "./Gradjx/Gradjx.h"
+#include "./Orthx/Orthx.h"
+#include "./Misfitx/Misfitx.h"
+#include "./SurfaceAreax/SurfaceAreax.h"
+#include "./CostFunctionx/CostFunctionx.h"
+#include "./ControlConstrainx/ControlConstrainx.h"
+#include "./FieldAverageOntoVerticesx/FieldAverageOntoVerticesx.h"
+#include "./FieldDepthAveragex/FieldDepthAveragex.h"
+#include "./ComputeBasalStressx/ComputeBasalStressx.h"
+#include "./ComputePressurex/ComputePressurex.h"
+#include "./ComputeStrainRatex/ComputeStrainRatex.h"
+#include "./FieldExtrudex/FieldExtrudex.h"
+#include "./Qmux/Qmux.h"
+#include "./NodeConnectivityx/NodeConnectivityx.h"
+#include "./ElementConnectivityx/ElementConnectivityx.h"
+#include "./OutputRiftsx/OutputRiftsx.h"
+#include "./MassFluxx/MassFluxx.h"
+#include "./Bamgx/Bamgx.h"
+#include "./BamgConvertMeshx/BamgConvertMeshx.h"
+#endif