Index: /issm/trunk/src/mex/AverageFilter/AverageFilter.h
===================================================================
--- /issm/trunk/src/mex/AverageFilter/AverageFilter.h	(revision 3711)
+++ /issm/trunk/src/mex/AverageFilter/AverageFilter.h	(revision 3712)
@@ -11,5 +11,7 @@
 void AverageFilterUsage(void);
 
-#include "../../c/issm.h"
+#include "../../c/modules.h"
+#include "../../c/DataSet/DataSet.h"
+#include "../../c/shared/shared.h"
 
 #undef __FUNCT__ 
Index: /issm/trunk/src/mex/Bamg/Bamg.h
===================================================================
--- /issm/trunk/src/mex/Bamg/Bamg.h	(revision 3711)
+++ /issm/trunk/src/mex/Bamg/Bamg.h	(revision 3712)
@@ -9,5 +9,7 @@
 void BamgUsage(void);
 
-#include "../../c/issm.h"
+#include "../../c/modules.h"
+#include "../../c/DataSet/DataSet.h"
+#include "../../c/shared/shared.h"
 
 #undef __FUNCT__ 
Index: /issm/trunk/src/mex/BamgConvertMesh/BamgConvertMesh.h
===================================================================
--- /issm/trunk/src/mex/BamgConvertMesh/BamgConvertMesh.h	(revision 3711)
+++ /issm/trunk/src/mex/BamgConvertMesh/BamgConvertMesh.h	(revision 3712)
@@ -9,5 +9,7 @@
 void BamgConvertMeshUsage(void);
 
-#include "../../c/issm.h"
+#include "../../c/modules.h"
+#include "../../c/DataSet/DataSet.h"
+#include "../../c/shared/shared.h"
 
 #undef __FUNCT__ 
Index: /issm/trunk/src/mex/BuildNodeSets/BuildNodeSets.h
===================================================================
--- /issm/trunk/src/mex/BuildNodeSets/BuildNodeSets.h	(revision 3711)
+++ /issm/trunk/src/mex/BuildNodeSets/BuildNodeSets.h	(revision 3712)
@@ -11,5 +11,7 @@
 void BuildNodeSetsUsage(void);
 
-#include "../../c/issm.h"
+#include "../../c/modules.h"
+#include "../../c/DataSet/DataSet.h"
+#include "../../c/shared/shared.h"
 
 #undef __FUNCT__ 
Index: /issm/trunk/src/mex/ComputeBasalStress/ComputeBasalStress.cpp
===================================================================
--- /issm/trunk/src/mex/ComputeBasalStress/ComputeBasalStress.cpp	(revision 3711)
+++ /issm/trunk/src/mex/ComputeBasalStress/ComputeBasalStress.cpp	(revision 3712)
@@ -16,6 +16,5 @@
 	DataSet* loads=NULL;
 	DataSet* materials=NULL;
-	DataSet* parameters=NULL;
-	ParameterInputs* inputs=NULL;
+	Parameters* parameters=NULL;
 	int      numberofnodes;
 	int      analysis_type;
@@ -42,12 +41,5 @@
 
 	/*!Generate internal degree of freedom numbers: */
-	/*Fetch inputs: */
-	inputs=new ParameterInputs;
-	inputs->Init(INPUTS);
-
-	UpdateFromInputsx(elements,nodes,vertices,loads, materials,parameters,inputs);
-
-	/*!Generate internal degree of freedom numbers: */
-	ComputeBasalStressx(&sigma_g, elements,nodes,vertices,loads,materials,parameters,inputs,analysis_type,sub_analysis_type);
+	ComputeBasalStressx(&sigma_g, elements,nodes,vertices,loads,materials,parameters,analysis_type,sub_analysis_type);
 
 	/*write output datasets: */
@@ -61,5 +53,4 @@
 	delete loads;
 	delete parameters;
-	delete inputs;
 	VecFree(&sigma_g);
 
@@ -70,5 +61,5 @@
 void ComputeBasalStressUsage(void) {
 	printf("\n");
-	printf("   usage: [p_g] = %s(elements, nodes, vertices, loads, materials, params,inputs);\n",__FUNCT__);
+	printf("   usage: [p_g] = %s(elements, nodes, vertices, loads, materials, params);\n",__FUNCT__);
 	printf("\n");
 }
Index: /issm/trunk/src/mex/ComputeBasalStress/ComputeBasalStress.h
===================================================================
--- /issm/trunk/src/mex/ComputeBasalStress/ComputeBasalStress.h	(revision 3711)
+++ /issm/trunk/src/mex/ComputeBasalStress/ComputeBasalStress.h	(revision 3712)
@@ -11,5 +11,7 @@
 void ComputeBasalStressUsage(void);
 
-#include "../../c/issm.h"
+#include "../../c/modules.h"
+#include "../../c/DataSet/DataSet.h"
+#include "../../c/shared/shared.h"
 
 #undef __FUNCT__ 
Index: /issm/trunk/src/mex/ComputePressure/ComputePressure.cpp
===================================================================
--- /issm/trunk/src/mex/ComputePressure/ComputePressure.cpp	(revision 3711)
+++ /issm/trunk/src/mex/ComputePressure/ComputePressure.cpp	(revision 3712)
@@ -16,6 +16,5 @@
 	DataSet* loads=NULL;
 	DataSet* materials=NULL;
-	DataSet* parameters=NULL;
-	ParameterInputs* inputs=NULL;
+	Parameters* parameters=NULL;
 	int      numberofnodes;
 	int      analysis_type;
@@ -42,12 +41,5 @@
 
 	/*!Generate internal degree of freedom numbers: */
-	/*Fetch inputs: */
-	inputs=new ParameterInputs;
-	inputs->Init(INPUTS);
-
-	UpdateFromInputsx(elements,nodes,vertices,loads, materials,parameters,inputs);
-
-	/*!Generate internal degree of freedom numbers: */
-	ComputePressurex(&p_g, elements,nodes,vertices,loads,materials,parameters,inputs,analysis_type,sub_analysis_type);
+	ComputePressurex(&p_g, elements,nodes,vertices,loads,materials,parameters,analysis_type,sub_analysis_type);
 
 	/*write output datasets: */
@@ -61,5 +53,4 @@
 	delete loads;
 	delete parameters;
-	delete inputs;
 	VecFree(&p_g);
 
@@ -70,5 +61,5 @@
 void ComputePressureUsage(void) {
 	printf("\n");
-	printf("   usage: [p_g] = %s(elements, nodes, vertices, loads, materials, params,inputs);\n",__FUNCT__);
+	printf("   usage: [p_g] = %s(elements, nodes, vertices, loads, materials, params);\n",__FUNCT__);
 	printf("\n");
 }
Index: /issm/trunk/src/mex/ComputePressure/ComputePressure.h
===================================================================
--- /issm/trunk/src/mex/ComputePressure/ComputePressure.h	(revision 3711)
+++ /issm/trunk/src/mex/ComputePressure/ComputePressure.h	(revision 3712)
@@ -11,5 +11,7 @@
 void ComputePressureUsage(void);
 
-#include "../../c/issm.h"
+#include "../../c/modules.h"
+#include "../../c/DataSet/DataSet.h"
+#include "../../c/shared/shared.h"
 
 #undef __FUNCT__ 
Index: /issm/trunk/src/mex/ConfigureObjects/ConfigureObjects.cpp
===================================================================
--- /issm/trunk/src/mex/ConfigureObjects/ConfigureObjects.cpp	(revision 3711)
+++ /issm/trunk/src/mex/ConfigureObjects/ConfigureObjects.cpp	(revision 3712)
@@ -16,5 +16,5 @@
 	DataSet* vertices=NULL;
 	DataSet* materials=NULL;
-	DataSet* parameters=NULL;
+	Parameters* parameters=NULL;
 
 	/* output datasets: elements and loads*/
@@ -32,5 +32,5 @@
 	FetchData(&vertices,VERTICES);
 	FetchData(&materials,MATERIALS);
-	FetchData(&parameters,PARAMETERS);
+	FetchParams(&parameters,PARAMETERS);
 
 	/*!Configure objects:*/
Index: /issm/trunk/src/mex/ConfigureObjects/ConfigureObjects.h
===================================================================
--- /issm/trunk/src/mex/ConfigureObjects/ConfigureObjects.h	(revision 3711)
+++ /issm/trunk/src/mex/ConfigureObjects/ConfigureObjects.h	(revision 3712)
@@ -11,5 +11,7 @@
 void ConfigureObjectsUsage(void);
 
-#include "../../c/issm.h"
+#include "../../c/modules.h"
+#include "../../c/DataSet/DataSet.h"
+#include "../../c/shared/shared.h"
 
 #undef __FUNCT__ 
Index: /issm/trunk/src/mex/ContourToMesh/ContourToMesh.h
===================================================================
--- /issm/trunk/src/mex/ContourToMesh/ContourToMesh.h	(revision 3711)
+++ /issm/trunk/src/mex/ContourToMesh/ContourToMesh.h	(revision 3712)
@@ -11,5 +11,7 @@
 void ContourToMeshUsage(void);
 
-#include "../../c/issm.h"
+#include "../../c/modules.h"
+#include "../../c/DataSet/DataSet.h"
+#include "../../c/shared/shared.h"
 
 #undef __FUNCT__
Index: /issm/trunk/src/mex/ContourToNodes/ContourToNodes.h
===================================================================
--- /issm/trunk/src/mex/ContourToNodes/ContourToNodes.h	(revision 3711)
+++ /issm/trunk/src/mex/ContourToNodes/ContourToNodes.h	(revision 3712)
@@ -11,5 +11,7 @@
 void ContourToNodesUsage(void);
 
-#include "../../c/issm.h"
+#include "../../c/modules.h"
+#include "../../c/DataSet/DataSet.h"
+#include "../../c/shared/shared.h"
 
 #undef __FUNCT__
Index: /issm/trunk/src/mex/ControlConstrain/ControlConstrain.cpp
===================================================================
--- /issm/trunk/src/mex/ControlConstrain/ControlConstrain.cpp	(revision 3711)
+++ /issm/trunk/src/mex/ControlConstrain/ControlConstrain.cpp	(revision 3712)
@@ -16,5 +16,5 @@
 	char*    control_type=NULL;
 	int      gsize;
-	DataSet* parameters=NULL;
+	Parameters* parameters=NULL;
 
 	/*Boot module: */
@@ -28,7 +28,7 @@
 	FetchParams(&parameters,PARAMETERS);
 
-	parameters->FindParam(&cm_min,"cm_min");
-	parameters->FindParam(&cm_max,"cm_max");
-	parameters->FindParam(&control_type,"control_type");
+	parameters->FindParam(&cm_min,CmMinEnum);
+	parameters->FindParam(&cm_max,CmMaxEnum);
+	parameters->FindParam(&control_type,ControlTypeEnum);
 
 	/*!Call core code: */
Index: /issm/trunk/src/mex/ControlConstrain/ControlConstrain.h
===================================================================
--- /issm/trunk/src/mex/ControlConstrain/ControlConstrain.h	(revision 3711)
+++ /issm/trunk/src/mex/ControlConstrain/ControlConstrain.h	(revision 3712)
@@ -10,5 +10,7 @@
 void ControlConstrainUsage(void);
 
-#include "../../c/issm.h"
+#include "../../c/modules.h"
+#include "../../c/DataSet/DataSet.h"
+#include "../../c/shared/shared.h"
 
 #undef __FUNCT__ 
Index: /issm/trunk/src/mex/ControlOptimization/ControlOptimization.h
===================================================================
--- /issm/trunk/src/mex/ControlOptimization/ControlOptimization.h	(revision 3711)
+++ /issm/trunk/src/mex/ControlOptimization/ControlOptimization.h	(revision 3712)
@@ -11,5 +11,7 @@
 void ControlOptimizationUsage(void);
 
-#include "../../c/issm.h"
+#include "../../c/modules.h"
+#include "../../c/DataSet/DataSet.h"
+#include "../../c/shared/shared.h"
 
 #undef __FUNCT__ 
Index: /issm/trunk/src/mex/CostFunction/CostFunction.cpp
===================================================================
--- /issm/trunk/src/mex/CostFunction/CostFunction.cpp	(revision 3711)
+++ /issm/trunk/src/mex/CostFunction/CostFunction.cpp	(revision 3712)
@@ -16,5 +16,5 @@
 	DataSet* vertices=NULL;
 	DataSet* materials=NULL;
-	DataSet* parameters=NULL;
+	Parameters* parameters=NULL;
 	ParameterInputs* inputs=NULL;
 	int               analysis_type;
Index: /issm/trunk/src/mex/CostFunction/CostFunction.h
===================================================================
--- /issm/trunk/src/mex/CostFunction/CostFunction.h	(revision 3711)
+++ /issm/trunk/src/mex/CostFunction/CostFunction.h	(revision 3712)
@@ -11,5 +11,7 @@
 void CostFunctionUsage(void);
 
-#include "../../c/issm.h"
+#include "../../c/modules.h"
+#include "../../c/DataSet/DataSet.h"
+#include "../../c/shared/shared.h"
 
 #undef __FUNCT__ 
Index: /issm/trunk/src/mex/Dof/Dof.h
===================================================================
--- /issm/trunk/src/mex/Dof/Dof.h	(revision 3711)
+++ /issm/trunk/src/mex/Dof/Dof.h	(revision 3712)
@@ -11,5 +11,7 @@
 void DofUsage(void);
 
-#include "../../c/issm.h"
+#include "../../c/modules.h"
+#include "../../c/DataSet/DataSet.h"
+#include "../../c/shared/shared.h"
 
 #undef __FUNCT__ 
Index: /issm/trunk/src/mex/Du/Du.cpp
===================================================================
--- /issm/trunk/src/mex/Du/Du.cpp	(revision 3711)
+++ /issm/trunk/src/mex/Du/Du.cpp	(revision 3712)
@@ -16,5 +16,5 @@
 	DataSet* loads=NULL;
 	DataSet* materials=NULL;
-	DataSet* parameters=NULL;
+	Parameters* parameters=NULL;
 	ParameterInputs* inputs=NULL;
 	int               analysis_type;
Index: /issm/trunk/src/mex/Du/Du.h
===================================================================
--- /issm/trunk/src/mex/Du/Du.h	(revision 3711)
+++ /issm/trunk/src/mex/Du/Du.h	(revision 3712)
@@ -11,5 +11,7 @@
 void DuUsage(void);
 
-#include "../../c/issm.h"
+#include "../../c/modules.h"
+#include "../../c/DataSet/DataSet.h"
+#include "../../c/shared/shared.h"
 
 #undef __FUNCT__ 
Index: /issm/trunk/src/mex/Echo/Echo.h
===================================================================
--- /issm/trunk/src/mex/Echo/Echo.h	(revision 3711)
+++ /issm/trunk/src/mex/Echo/Echo.h	(revision 3712)
@@ -9,5 +9,7 @@
 void EchoUsage(void);
 
-#include "../../c/issm.h"
+#include "../../c/modules.h"
+#include "../../c/DataSet/DataSet.h"
+#include "../../c/shared/shared.h"
     
 /* serial input macros: */
Index: /issm/trunk/src/mex/ElementConnectivity/ElementConnectivity.h
===================================================================
--- /issm/trunk/src/mex/ElementConnectivity/ElementConnectivity.h	(revision 3711)
+++ /issm/trunk/src/mex/ElementConnectivity/ElementConnectivity.h	(revision 3712)
@@ -11,5 +11,7 @@
 void ElementConnectivityUsage(void);
 
-#include "../../c/issm.h"
+#include "../../c/modules.h"
+#include "../../c/DataSet/DataSet.h"
+#include "../../c/shared/shared.h"
 
 #undef __FUNCT__ 
Index: /issm/trunk/src/mex/FieldAverageOntoVertices/FieldAverageOntoVertices.cpp
===================================================================
--- /issm/trunk/src/mex/FieldAverageOntoVertices/FieldAverageOntoVertices.cpp	(revision 3711)
+++ /issm/trunk/src/mex/FieldAverageOntoVertices/FieldAverageOntoVertices.cpp	(revision 3712)
@@ -16,5 +16,5 @@
 	DataSet* loads=NULL;
 	DataSet* materials=NULL;
-	DataSet* parameters=NULL;
+	Parameters* parameters=NULL;
 	Vec      field=NULL;
 
Index: /issm/trunk/src/mex/FieldAverageOntoVertices/FieldAverageOntoVertices.h
===================================================================
--- /issm/trunk/src/mex/FieldAverageOntoVertices/FieldAverageOntoVertices.h	(revision 3711)
+++ /issm/trunk/src/mex/FieldAverageOntoVertices/FieldAverageOntoVertices.h	(revision 3712)
@@ -11,5 +11,7 @@
 void FieldAverageOntoVerticesUsage(void);
 
-#include "../../c/issm.h"
+#include "../../c/modules.h"
+#include "../../c/DataSet/DataSet.h"
+#include "../../c/shared/shared.h"
 
 #undef __FUNCT__ 
Index: /issm/trunk/src/mex/FieldDepthAverage/FieldDepthAverage.cpp
===================================================================
--- /issm/trunk/src/mex/FieldDepthAverage/FieldDepthAverage.cpp	(revision 3711)
+++ /issm/trunk/src/mex/FieldDepthAverage/FieldDepthAverage.cpp	(revision 3712)
@@ -16,5 +16,5 @@
 	DataSet* loads=NULL;
 	DataSet* materials=NULL;
-	DataSet* parameters=NULL;
+	Parameters* parameters=NULL;
 	Vec      field=NULL;
 	char*    fieldname=NULL;
Index: /issm/trunk/src/mex/FieldDepthAverage/FieldDepthAverage.h
===================================================================
--- /issm/trunk/src/mex/FieldDepthAverage/FieldDepthAverage.h	(revision 3711)
+++ /issm/trunk/src/mex/FieldDepthAverage/FieldDepthAverage.h	(revision 3712)
@@ -11,5 +11,7 @@
 void FieldDepthAverageUsage(void);
 
-#include "../../c/issm.h"
+#include "../../c/modules.h"
+#include "../../c/DataSet/DataSet.h"
+#include "../../c/shared/shared.h"
 
 #undef __FUNCT__ 
Index: /issm/trunk/src/mex/FieldExtrude/FieldExtrude.cpp
===================================================================
--- /issm/trunk/src/mex/FieldExtrude/FieldExtrude.cpp	(revision 3711)
+++ /issm/trunk/src/mex/FieldExtrude/FieldExtrude.cpp	(revision 3712)
@@ -16,5 +16,5 @@
 	DataSet* loads=NULL;
 	DataSet* materials=NULL;
-	DataSet* parameters=NULL;
+	Parameters* parameters=NULL;
 	Vec      field=NULL;
 	char*    field_name=NULL;
Index: /issm/trunk/src/mex/FieldExtrude/FieldExtrude.h
===================================================================
--- /issm/trunk/src/mex/FieldExtrude/FieldExtrude.h	(revision 3711)
+++ /issm/trunk/src/mex/FieldExtrude/FieldExtrude.h	(revision 3712)
@@ -11,5 +11,7 @@
 void FieldExtrudeUsage(void);
 
-#include "../../c/issm.h"
+#include "../../c/modules.h"
+#include "../../c/DataSet/DataSet.h"
+#include "../../c/shared/shared.h"
 
 #undef __FUNCT__ 
Index: /issm/trunk/src/mex/Gradj/Gradj.cpp
===================================================================
--- /issm/trunk/src/mex/Gradj/Gradj.cpp	(revision 3711)
+++ /issm/trunk/src/mex/Gradj/Gradj.cpp	(revision 3712)
@@ -16,5 +16,5 @@
 	DataSet* loads=NULL;
 	DataSet* materials=NULL;
-	DataSet* parameters=NULL;
+	Parameters* parameters=NULL;
 	char*    control_type=NULL;
 	ParameterInputs* inputs=NULL;
Index: /issm/trunk/src/mex/Gradj/Gradj.h
===================================================================
--- /issm/trunk/src/mex/Gradj/Gradj.h	(revision 3711)
+++ /issm/trunk/src/mex/Gradj/Gradj.h	(revision 3712)
@@ -11,5 +11,7 @@
 void GradjUsage(void);
 
-#include "../../c/issm.h"
+#include "../../c/modules.h"
+#include "../../c/DataSet/DataSet.h"
+#include "../../c/shared/shared.h"
 
 #undef __FUNCT__ 
Index: /issm/trunk/src/mex/HoleFiller/HoleFiller.h
===================================================================
--- /issm/trunk/src/mex/HoleFiller/HoleFiller.h	(revision 3711)
+++ /issm/trunk/src/mex/HoleFiller/HoleFiller.h	(revision 3712)
@@ -11,5 +11,7 @@
 void HoleFillerUsage(void);
 
-#include "../../c/issm.h"
+#include "../../c/modules.h"
+#include "../../c/DataSet/DataSet.h"
+#include "../../c/shared/shared.h"
 
 #undef __FUNCT__ 
Index: /issm/trunk/src/mex/InterpFromGridToMesh/InterpFromGridToMesh.h
===================================================================
--- /issm/trunk/src/mex/InterpFromGridToMesh/InterpFromGridToMesh.h	(revision 3711)
+++ /issm/trunk/src/mex/InterpFromGridToMesh/InterpFromGridToMesh.h	(revision 3712)
@@ -9,5 +9,7 @@
 void InterpFromGridToMeshUsage(void);
 
-#include "../../c/issm.h"
+#include "../../c/modules.h"
+#include "../../c/DataSet/DataSet.h"
+#include "../../c/shared/shared.h"
 
 #undef __FUNCT__ 
Index: /issm/trunk/src/mex/InterpFromMeshToGrid/InterpFromMeshToGrid.h
===================================================================
--- /issm/trunk/src/mex/InterpFromMeshToGrid/InterpFromMeshToGrid.h	(revision 3711)
+++ /issm/trunk/src/mex/InterpFromMeshToGrid/InterpFromMeshToGrid.h	(revision 3712)
@@ -11,5 +11,7 @@
 void InterpFromMeshToGridUsage(void);
 
-#include "../../c/issm.h"
+#include "../../c/modules.h"
+#include "../../c/DataSet/DataSet.h"
+#include "../../c/shared/shared.h"
 
 #undef __FUNCT__ 
Index: /issm/trunk/src/mex/InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.h
===================================================================
--- /issm/trunk/src/mex/InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.h	(revision 3711)
+++ /issm/trunk/src/mex/InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.h	(revision 3712)
@@ -9,5 +9,7 @@
 void InterpFromMeshToMesh2dUsage(void);
 
-#include "../../c/issm.h"
+#include "../../c/modules.h"
+#include "../../c/DataSet/DataSet.h"
+#include "../../c/shared/shared.h"
 
 #undef __FUNCT__ 
Index: /issm/trunk/src/mex/InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.h
===================================================================
--- /issm/trunk/src/mex/InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.h	(revision 3711)
+++ /issm/trunk/src/mex/InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.h	(revision 3712)
@@ -9,5 +9,7 @@
 void InterpFromMeshToMesh3dUsage(void);
 
-#include "../../c/issm.h"
+#include "../../c/modules.h"
+#include "../../c/DataSet/DataSet.h"
+#include "../../c/shared/shared.h"
 
 #undef __FUNCT__ 
Index: /issm/trunk/src/mex/Makefile.am
===================================================================
--- /issm/trunk/src/mex/Makefile.am	(revision 3711)
+++ /issm/trunk/src/mex/Makefile.am	(revision 3712)
@@ -245,7 +245,4 @@
 			  TriMeshRefine/TriMeshRefine.h
 
-UpdateFromInputs_SOURCES = UpdateFromInputs/UpdateFromInputs.cpp\
-			  UpdateFromInputs/UpdateFromInputs.h
-
 UpdateInputsFromSolution_SOURCES = UpdateInputsFromSolution/UpdateInputsFromSolution.cpp\
 			  UpdateInputsFromSolution/UpdateInputsFromSolution.h
Index: /issm/trunk/src/mex/MassFlux/MassFlux.cpp
===================================================================
--- /issm/trunk/src/mex/MassFlux/MassFlux.cpp	(revision 3711)
+++ /issm/trunk/src/mex/MassFlux/MassFlux.cpp	(revision 3712)
@@ -16,5 +16,5 @@
 	DataSet* loads=NULL;
 	DataSet* materials=NULL;
-	DataSet* parameters=NULL;
+	Parameters* parameters=NULL;
 	double*  segments=NULL;
 	int      num_segments;
Index: /issm/trunk/src/mex/MassFlux/MassFlux.h
===================================================================
--- /issm/trunk/src/mex/MassFlux/MassFlux.h	(revision 3711)
+++ /issm/trunk/src/mex/MassFlux/MassFlux.h	(revision 3712)
@@ -11,5 +11,7 @@
 void MassFluxUsage(void);
 
-#include "../../c/issm.h"
+#include "../../c/modules.h"
+#include "../../c/DataSet/DataSet.h"
+#include "../../c/shared/shared.h"
 
 #undef __FUNCT__ 
Index: /issm/trunk/src/mex/Mergesolutionfromftog/Mergesolutionfromftog.h
===================================================================
--- /issm/trunk/src/mex/Mergesolutionfromftog/Mergesolutionfromftog.h	(revision 3711)
+++ /issm/trunk/src/mex/Mergesolutionfromftog/Mergesolutionfromftog.h	(revision 3712)
@@ -11,5 +11,7 @@
 void MergesolutionfromftogUsage(void);
 
-#include "../../c/issm.h"
+#include "../../c/modules.h"
+#include "../../c/DataSet/DataSet.h"
+#include "../../c/shared/shared.h"
 
 #undef __FUNCT__ 
Index: /issm/trunk/src/mex/MeshPartition/MeshPartition.h
===================================================================
--- /issm/trunk/src/mex/MeshPartition/MeshPartition.h	(revision 3711)
+++ /issm/trunk/src/mex/MeshPartition/MeshPartition.h	(revision 3712)
@@ -11,5 +11,7 @@
 void MeshPartitionUsage(void);
 
-#include "../../c/issm.h"
+#include "../../c/modules.h"
+#include "../../c/DataSet/DataSet.h"
+#include "../../c/shared/shared.h"
 
 #undef CLEANUP
Index: /issm/trunk/src/mex/Misfit/Misfit.cpp
===================================================================
--- /issm/trunk/src/mex/Misfit/Misfit.cpp	(revision 3711)
+++ /issm/trunk/src/mex/Misfit/Misfit.cpp	(revision 3712)
@@ -16,5 +16,5 @@
 	DataSet* loads=NULL;
 	DataSet* materials=NULL;
-	DataSet* parameters=NULL;
+	Parameters* parameters=NULL;
 	ParameterInputs* inputs=NULL;
 	int               analysis_type;
Index: /issm/trunk/src/mex/Misfit/Misfit.h
===================================================================
--- /issm/trunk/src/mex/Misfit/Misfit.h	(revision 3711)
+++ /issm/trunk/src/mex/Misfit/Misfit.h	(revision 3712)
@@ -11,5 +11,7 @@
 void MisfitUsage(void);
 
-#include "../../c/issm.h"
+#include "../../c/modules.h"
+#include "../../c/DataSet/DataSet.h"
+#include "../../c/shared/shared.h"
 
 #undef __FUNCT__ 
Index: /issm/trunk/src/mex/ModelProcessor/ModelProcessor.cpp
===================================================================
--- /issm/trunk/src/mex/ModelProcessor/ModelProcessor.cpp	(revision 3711)
+++ /issm/trunk/src/mex/ModelProcessor/ModelProcessor.cpp	(revision 3712)
@@ -18,5 +18,5 @@
 	DataSet* loads=NULL;
 	DataSet* materials=NULL;
-	DataSet* parameters=NULL;
+	Parameters* parameters=NULL;
 
 	/*input model: */
Index: /issm/trunk/src/mex/ModelProcessor/ModelProcessor.h
===================================================================
--- /issm/trunk/src/mex/ModelProcessor/ModelProcessor.h	(revision 3711)
+++ /issm/trunk/src/mex/ModelProcessor/ModelProcessor.h	(revision 3712)
@@ -9,5 +9,7 @@
 void ModelProcessorUsage(void);
 
-#include "../../c/issm.h"
+#include "../../c/modules.h"
+#include "../../c/DataSet/DataSet.h"
+#include "../../c/shared/shared.h"
 
 #undef __FUNCT__ 
Index: /issm/trunk/src/mex/MpcNodes/MpcNodes.h
===================================================================
--- /issm/trunk/src/mex/MpcNodes/MpcNodes.h	(revision 3711)
+++ /issm/trunk/src/mex/MpcNodes/MpcNodes.h	(revision 3712)
@@ -11,5 +11,7 @@
 void MpcNodesUsage(void);
 
-#include "../../c/issm.h"
+#include "../../c/modules.h"
+#include "../../c/DataSet/DataSet.h"
+#include "../../c/shared/shared.h"
 
 #undef __FUNCT__ 
Index: /issm/trunk/src/mex/NodeConnectivity/NodeConnectivity.h
===================================================================
--- /issm/trunk/src/mex/NodeConnectivity/NodeConnectivity.h	(revision 3711)
+++ /issm/trunk/src/mex/NodeConnectivity/NodeConnectivity.h	(revision 3712)
@@ -11,5 +11,7 @@
 void NodeConnectivityUsage(void);
 
-#include "../../c/issm.h"
+#include "../../c/modules.h"
+#include "../../c/DataSet/DataSet.h"
+#include "../../c/shared/shared.h"
 
 #undef __FUNCT__ 
Index: /issm/trunk/src/mex/NormalizeConstraints/NormalizeConstraints.h
===================================================================
--- /issm/trunk/src/mex/NormalizeConstraints/NormalizeConstraints.h	(revision 3711)
+++ /issm/trunk/src/mex/NormalizeConstraints/NormalizeConstraints.h	(revision 3712)
@@ -9,5 +9,7 @@
 void NormalizeConstraintsUsage(void);
 
-#include "../../c/issm.h"
+#include "../../c/modules.h"
+#include "../../c/DataSet/DataSet.h"
+#include "../../c/shared/shared.h"
 
 /* serial input macros: */
Index: /issm/trunk/src/mex/Orth/Orth.h
===================================================================
--- /issm/trunk/src/mex/Orth/Orth.h	(revision 3711)
+++ /issm/trunk/src/mex/Orth/Orth.h	(revision 3712)
@@ -11,5 +11,7 @@
 void OrthUsage(void);
 
-#include "../../c/issm.h"
+#include "../../c/modules.h"
+#include "../../c/DataSet/DataSet.h"
+#include "../../c/shared/shared.h"
 
 #undef __FUNCT__ 
Index: /issm/trunk/src/mex/OutputRifts/OutputRifts.h
===================================================================
--- /issm/trunk/src/mex/OutputRifts/OutputRifts.h	(revision 3711)
+++ /issm/trunk/src/mex/OutputRifts/OutputRifts.h	(revision 3712)
@@ -11,5 +11,7 @@
 void OutputRiftsUsage(void);
 
-#include "../../c/issm.h"
+#include "../../c/modules.h"
+#include "../../c/DataSet/DataSet.h"
+#include "../../c/shared/shared.h"
 
 #undef __FUNCT__ 
Index: /issm/trunk/src/mex/ParameterOutput/ParameterOutput.h
===================================================================
--- /issm/trunk/src/mex/ParameterOutput/ParameterOutput.h	(revision 3711)
+++ /issm/trunk/src/mex/ParameterOutput/ParameterOutput.h	(revision 3712)
@@ -11,5 +11,7 @@
 void ParameterOutputUsage(void);
 
-#include "../../c/issm.h"
+#include "../../c/modules.h"
+#include "../../c/DataSet/DataSet.h"
+#include "../../c/shared/shared.h"
 
 #undef __FUNCT__ 
Index: /issm/trunk/src/mex/PenaltyConstraints/PenaltyConstraints.cpp
===================================================================
--- /issm/trunk/src/mex/PenaltyConstraints/PenaltyConstraints.cpp	(revision 3711)
+++ /issm/trunk/src/mex/PenaltyConstraints/PenaltyConstraints.cpp	(revision 3712)
@@ -16,5 +16,5 @@
 	DataSet* loads=NULL;
 	DataSet* materials=NULL;
-	DataSet* parameters=NULL;
+	Parameters* parameters=NULL;
 	ParameterInputs* inputs=NULL;
 	int               analysis_type;
Index: /issm/trunk/src/mex/PenaltyConstraints/PenaltyConstraints.h
===================================================================
--- /issm/trunk/src/mex/PenaltyConstraints/PenaltyConstraints.h	(revision 3711)
+++ /issm/trunk/src/mex/PenaltyConstraints/PenaltyConstraints.h	(revision 3712)
@@ -11,5 +11,7 @@
 void PenaltyConstraintsUsage(void);
 
-#include "../../c/issm.h"
+#include "../../c/modules.h"
+#include "../../c/DataSet/DataSet.h"
+#include "../../c/shared/shared.h"
 
 #undef __FUNCT__ 
Index: /issm/trunk/src/mex/PenaltySystemMatrices/PenaltySystemMatrices.cpp
===================================================================
--- /issm/trunk/src/mex/PenaltySystemMatrices/PenaltySystemMatrices.cpp	(revision 3711)
+++ /issm/trunk/src/mex/PenaltySystemMatrices/PenaltySystemMatrices.cpp	(revision 3712)
@@ -21,5 +21,5 @@
 	DataSet* loads=NULL;
 	DataSet* materials=NULL;
-	DataSet* parameters=NULL;
+	Parameters* parameters=NULL;
 	int         kflag,pflag;
 	ParameterInputs* inputs=NULL;
Index: /issm/trunk/src/mex/PenaltySystemMatrices/PenaltySystemMatrices.h
===================================================================
--- /issm/trunk/src/mex/PenaltySystemMatrices/PenaltySystemMatrices.h	(revision 3711)
+++ /issm/trunk/src/mex/PenaltySystemMatrices/PenaltySystemMatrices.h	(revision 3712)
@@ -11,5 +11,7 @@
 void PenaltySystemMatricesUsage(void);
 
-#include "../../c/issm.h"
+#include "../../c/modules.h"
+#include "../../c/DataSet/DataSet.h"
+#include "../../c/shared/shared.h"
 
 #undef __FUNCT__ 
Index: /issm/trunk/src/mex/ProcessParams/ProcessParams.cpp
===================================================================
--- /issm/trunk/src/mex/ProcessParams/ProcessParams.cpp	(revision 3711)
+++ /issm/trunk/src/mex/ProcessParams/ProcessParams.cpp	(revision 3712)
@@ -11,5 +11,5 @@
 
 	/*input datasets: */
-	DataSet* parameters=NULL;
+	Parameters* parameters=NULL;
 	Vec partition=NULL;
 
Index: /issm/trunk/src/mex/ProcessParams/ProcessParams.h
===================================================================
--- /issm/trunk/src/mex/ProcessParams/ProcessParams.h	(revision 3711)
+++ /issm/trunk/src/mex/ProcessParams/ProcessParams.h	(revision 3712)
@@ -11,5 +11,7 @@
 void ProcessParamsUsage(void);
 
-#include "../../c/issm.h"
+#include "../../c/modules.h"
+#include "../../c/DataSet/DataSet.h"
+#include "../../c/shared/shared.h"
 
 #undef __FUNCT__ 
Index: /issm/trunk/src/mex/PropagateFlagsFromConnectivity/PropagateFlagsFromConnectivity.h
===================================================================
--- /issm/trunk/src/mex/PropagateFlagsFromConnectivity/PropagateFlagsFromConnectivity.h	(revision 3711)
+++ /issm/trunk/src/mex/PropagateFlagsFromConnectivity/PropagateFlagsFromConnectivity.h	(revision 3712)
@@ -11,5 +11,7 @@
 void PropagateFlagsFromConnectivityUsage(void);
 
-#include "../../c/issm.h"
+#include "../../c/modules.h"
+#include "../../c/DataSet/DataSet.h"
+#include "../../c/shared/shared.h"
 
 #undef __FUNCT__ 
Index: /issm/trunk/src/mex/Qmu/Qmu.h
===================================================================
--- /issm/trunk/src/mex/Qmu/Qmu.h	(revision 3711)
+++ /issm/trunk/src/mex/Qmu/Qmu.h	(revision 3712)
@@ -11,5 +11,7 @@
 void QmuUsage(void);
 
-#include "../../c/issm.h"
+#include "../../c/modules.h"
+#include "../../c/DataSet/DataSet.h"
+#include "../../c/shared/shared.h"
 
 #undef __FUNCT__ 
Index: /issm/trunk/src/mex/Reduceloadfromgtof/Reduceloadfromgtof.h
===================================================================
--- /issm/trunk/src/mex/Reduceloadfromgtof/Reduceloadfromgtof.h	(revision 3711)
+++ /issm/trunk/src/mex/Reduceloadfromgtof/Reduceloadfromgtof.h	(revision 3712)
@@ -11,5 +11,7 @@
 void ReduceloadfromgtofUsage(void);
 
-#include "../../c/issm.h"
+#include "../../c/modules.h"
+#include "../../c/DataSet/DataSet.h"
+#include "../../c/shared/shared.h"
 
 #undef __FUNCT__ 
Index: /issm/trunk/src/mex/Reducematrixfromgtof/Reducematrixfromgtof.h
===================================================================
--- /issm/trunk/src/mex/Reducematrixfromgtof/Reducematrixfromgtof.h	(revision 3711)
+++ /issm/trunk/src/mex/Reducematrixfromgtof/Reducematrixfromgtof.h	(revision 3712)
@@ -11,5 +11,7 @@
 void ReducematrixfromgtofUsage(void);
 
-#include "../../c/issm.h"
+#include "../../c/modules.h"
+#include "../../c/DataSet/DataSet.h"
+#include "../../c/shared/shared.h"
 
 #undef __FUNCT__ 
Index: /issm/trunk/src/mex/Reducevectorgtof/Reducevectorgtof.h
===================================================================
--- /issm/trunk/src/mex/Reducevectorgtof/Reducevectorgtof.h	(revision 3711)
+++ /issm/trunk/src/mex/Reducevectorgtof/Reducevectorgtof.h	(revision 3712)
@@ -11,5 +11,7 @@
 void ReducevectorgtofUsage(void);
 
-#include "../../c/issm.h"
+#include "../../c/modules.h"
+#include "../../c/DataSet/DataSet.h"
+#include "../../c/shared/shared.h"
 
 #undef __FUNCT__ 
Index: /issm/trunk/src/mex/Reducevectorgtos/Reducevectorgtos.h
===================================================================
--- /issm/trunk/src/mex/Reducevectorgtos/Reducevectorgtos.h	(revision 3711)
+++ /issm/trunk/src/mex/Reducevectorgtos/Reducevectorgtos.h	(revision 3712)
@@ -11,5 +11,7 @@
 void ReducevectorgtosUsage(void);
 
-#include "../../c/issm.h"
+#include "../../c/modules.h"
+#include "../../c/DataSet/DataSet.h"
+#include "../../c/shared/shared.h"
 
 #undef __FUNCT__ 
Index: /issm/trunk/src/mex/SetStructureField/SetStructureField.h
===================================================================
--- /issm/trunk/src/mex/SetStructureField/SetStructureField.h	(revision 3711)
+++ /issm/trunk/src/mex/SetStructureField/SetStructureField.h	(revision 3712)
@@ -13,5 +13,7 @@
 #define OUTPUTHANDLE plhs[0]
 
-#include "../../c/issm.h"
+#include "../../c/modules.h"
+#include "../../c/DataSet/DataSet.h"
+#include "../../c/shared/shared.h"
 
 /* local prototypes: */
Index: /issm/trunk/src/mex/Solver/Solver.cpp
===================================================================
--- /issm/trunk/src/mex/Solver/Solver.cpp	(revision 3711)
+++ /issm/trunk/src/mex/Solver/Solver.cpp	(revision 3712)
@@ -15,5 +15,5 @@
 	Vec uf0=NULL;
 	char* solver_string=NULL;
-	DataSet* parameters=NULL;
+	Parameters* parameters=NULL;
 
 	/* output datasets: */
Index: /issm/trunk/src/mex/Solver/Solver.h
===================================================================
--- /issm/trunk/src/mex/Solver/Solver.h	(revision 3711)
+++ /issm/trunk/src/mex/Solver/Solver.h	(revision 3712)
@@ -11,5 +11,7 @@
 void SolverUsage(void);
 
-#include "../../c/issm.h"
+#include "../../c/modules.h"
+#include "../../c/DataSet/DataSet.h"
+#include "../../c/shared/shared.h"
 
 #undef __FUNCT__ 
Index: /issm/trunk/src/mex/SpcNodes/SpcNodes.h
===================================================================
--- /issm/trunk/src/mex/SpcNodes/SpcNodes.h	(revision 3711)
+++ /issm/trunk/src/mex/SpcNodes/SpcNodes.h	(revision 3712)
@@ -11,5 +11,7 @@
 void SpcNodesUsage(void);
 
-#include "../../c/issm.h"
+#include "../../c/modules.h"
+#include "../../c/DataSet/DataSet.h"
+#include "../../c/shared/shared.h"
 
 #undef __FUNCT__ 
Index: /issm/trunk/src/mex/SystemMatrices/SystemMatrices.cpp
===================================================================
--- /issm/trunk/src/mex/SystemMatrices/SystemMatrices.cpp	(revision 3711)
+++ /issm/trunk/src/mex/SystemMatrices/SystemMatrices.cpp	(revision 3712)
@@ -16,5 +16,5 @@
 	DataSet* loads=NULL;
 	DataSet* materials=NULL;
-	DataSet* parameters=NULL;
+	Parameters* parameters=NULL;
 	int         kflag,pflag;
 	int         connectivity;
Index: /issm/trunk/src/mex/SystemMatrices/SystemMatrices.h
===================================================================
--- /issm/trunk/src/mex/SystemMatrices/SystemMatrices.h	(revision 3711)
+++ /issm/trunk/src/mex/SystemMatrices/SystemMatrices.h	(revision 3712)
@@ -11,5 +11,7 @@
 void SystemMatricesUsage(void);
 
-#include "../../c/issm.h"
+#include "../../c/modules.h"
+#include "../../c/DataSet/DataSet.h"
+#include "../../c/shared/shared.h"
 
 #undef __FUNCT__ 
Index: /issm/trunk/src/mex/Test/Test.h
===================================================================
--- /issm/trunk/src/mex/Test/Test.h	(revision 3711)
+++ /issm/trunk/src/mex/Test/Test.h	(revision 3712)
@@ -9,5 +9,7 @@
 void TestUsage(void);
 
-#include "../../c/issm.h"
+#include "../../c/modules.h"
+#include "../../c/DataSet/DataSet.h"
+#include "../../c/shared/shared.h"
     
 /* serial input macros: */
Index: /issm/trunk/src/mex/TriMesh/TriMesh.h
===================================================================
--- /issm/trunk/src/mex/TriMesh/TriMesh.h	(revision 3711)
+++ /issm/trunk/src/mex/TriMesh/TriMesh.h	(revision 3712)
@@ -10,5 +10,7 @@
 #include "string.h"
 
-#include "../../c/issm.h"
+#include "../../c/modules.h"
+#include "../../c/DataSet/DataSet.h"
+#include "../../c/shared/shared.h"
 
 void TriMeshUsage(void);
Index: /issm/trunk/src/mex/TriMeshNoDensity/TriMeshNoDensity.h
===================================================================
--- /issm/trunk/src/mex/TriMeshNoDensity/TriMeshNoDensity.h	(revision 3711)
+++ /issm/trunk/src/mex/TriMeshNoDensity/TriMeshNoDensity.h	(revision 3712)
@@ -10,5 +10,7 @@
 #include "string.h"
 
-#include "../../c/issm.h"
+#include "../../c/modules.h"
+#include "../../c/DataSet/DataSet.h"
+#include "../../c/shared/shared.h"
 
 void TriMeshNoDensityUsage(void);
Index: /issm/trunk/src/mex/TriMeshProcessRifts/TriMeshProcessRifts.h
===================================================================
--- /issm/trunk/src/mex/TriMeshProcessRifts/TriMeshProcessRifts.h	(revision 3711)
+++ /issm/trunk/src/mex/TriMeshProcessRifts/TriMeshProcessRifts.h	(revision 3712)
@@ -10,5 +10,7 @@
 #include "string.h"
 
-#include "../../c/issm.h"
+#include "../../c/modules.h"
+#include "../../c/DataSet/DataSet.h"
+#include "../../c/shared/shared.h"
 
 void TriMeshProcessRiftsUsage(void);
Index: /issm/trunk/src/mex/TriMeshRefine/TriMeshRefine.h
===================================================================
--- /issm/trunk/src/mex/TriMeshRefine/TriMeshRefine.h	(revision 3711)
+++ /issm/trunk/src/mex/TriMeshRefine/TriMeshRefine.h	(revision 3712)
@@ -10,5 +10,7 @@
 #include "string.h"
 
-#include "../../c/issm.h"
+#include "../../c/modules.h"
+#include "../../c/DataSet/DataSet.h"
+#include "../../c/shared/shared.h"
 
 void TriMeshRefineUsage(void);
Index: /issm/trunk/src/mex/UpdateGeometry/UpdateGeometry.cpp
===================================================================
--- /issm/trunk/src/mex/UpdateGeometry/UpdateGeometry.cpp	(revision 3711)
+++ /issm/trunk/src/mex/UpdateGeometry/UpdateGeometry.cpp	(revision 3712)
@@ -16,5 +16,5 @@
 	DataSet* loads=NULL;
 	DataSet* materials=NULL;
-	DataSet* parameters=NULL;
+	Parameters* parameters=NULL;
 	Vec      newthickness=NULL;
 	Vec      bed=NULL;
Index: /issm/trunk/src/mex/UpdateGeometry/UpdateGeometry.h
===================================================================
--- /issm/trunk/src/mex/UpdateGeometry/UpdateGeometry.h	(revision 3711)
+++ /issm/trunk/src/mex/UpdateGeometry/UpdateGeometry.h	(revision 3712)
@@ -11,5 +11,7 @@
 void UpdateGeometryUsage(void);
 
-#include "../../c/issm.h"
+#include "../../c/modules.h"
+#include "../../c/DataSet/DataSet.h"
+#include "../../c/shared/shared.h"
 
 #undef __FUNCT__ 
Index: /issm/trunk/src/mex/UpdateInputsFromSolution/UpdateInputsFromSolution.cpp
===================================================================
--- /issm/trunk/src/mex/UpdateInputsFromSolution/UpdateInputsFromSolution.cpp	(revision 3711)
+++ /issm/trunk/src/mex/UpdateInputsFromSolution/UpdateInputsFromSolution.cpp	(revision 3712)
@@ -16,5 +16,5 @@
 DataSet* loads=NULL;
 DataSet* materials=NULL;
-DataSet* parameters=NULL;
+Parameters* parameters=NULL;
 Vec      solution=NULL;
 int               analysis_type;
Index: /issm/trunk/src/mex/UpdateInputsFromSolution/UpdateInputsFromSolution.h
===================================================================
--- /issm/trunk/src/mex/UpdateInputsFromSolution/UpdateInputsFromSolution.h	(revision 3711)
+++ /issm/trunk/src/mex/UpdateInputsFromSolution/UpdateInputsFromSolution.h	(revision 3712)
@@ -12,4 +12,6 @@
 
 #include "../../c/modules.h"
+#include "../../c/DataSet/DataSet.h"
+#include "../../c/shared/shared.h"
 
 #undef __FUNCT__ 
Index: /issm/trunk/src/mex/UpdateInputsFromVector/UpdateInputsFromVector.cpp
===================================================================
--- /issm/trunk/src/mex/UpdateInputsFromVector/UpdateInputsFromVector.cpp	(revision 3711)
+++ /issm/trunk/src/mex/UpdateInputsFromVector/UpdateInputsFromVector.cpp	(revision 3712)
@@ -16,5 +16,5 @@
 DataSet* loads=NULL;
 DataSet* materials=NULL;
-DataSet* parameters=NULL;
+Parameters* parameters=NULL;
 double*  vector=NULL;
 int      NameEnum;
Index: /issm/trunk/src/mex/UpdateInputsFromVector/UpdateInputsFromVector.h
===================================================================
--- /issm/trunk/src/mex/UpdateInputsFromVector/UpdateInputsFromVector.h	(revision 3711)
+++ /issm/trunk/src/mex/UpdateInputsFromVector/UpdateInputsFromVector.h	(revision 3712)
@@ -12,4 +12,6 @@
 
 #include "../../c/modules.h"
+#include "../../c/DataSet/DataSet.h"
+#include "../../c/shared/shared.h"
 
 #undef __FUNCT__ 
Index: /issm/trunk/src/mex/UpdateVertexPositions/UpdateVertexPositions.h
===================================================================
--- /issm/trunk/src/mex/UpdateVertexPositions/UpdateVertexPositions.h	(revision 3711)
+++ /issm/trunk/src/mex/UpdateVertexPositions/UpdateVertexPositions.h	(revision 3712)
@@ -11,5 +11,7 @@
 void UpdateVertexPositionsUsage(void);
 
-#include "../../c/issm.h"
+#include "../../c/modules.h"
+#include "../../c/DataSet/DataSet.h"
+#include "../../c/shared/shared.h"
 
 #undef __FUNCT__