Index: /issm/trunk/src/mex/Du/Du.cpp
===================================================================
--- /issm/trunk/src/mex/Du/Du.cpp	(revision 1648)
+++ /issm/trunk/src/mex/Du/Du.cpp	(revision 1649)
@@ -16,7 +16,5 @@
 	DataSet* materials=NULL;
 	ParameterInputs* inputs=NULL;
-	char*             analysis_type_string=NULL;
 	int               analysis_type;
-	char*             sub_analysis_type_string=NULL;
 	int               sub_analysis_type;
 
@@ -36,8 +34,6 @@
 	FetchData((void**)&loads,NULL,NULL,LOADS,"DataSet",NULL);
 	FetchData((void**)&materials,NULL,NULL,MATERIALS,"DataSet",NULL);
-	FetchData((void**)&analysis_type_string,NULL,NULL,ANALYSIS,"String",NULL);
-	analysis_type=AnalysisTypeAsEnum(analysis_type_string);
-	FetchData((void**)&sub_analysis_type_string,NULL,NULL,SUBANALYSIS,"String",NULL);
-	sub_analysis_type=AnalysisTypeAsEnum(sub_analysis_type_string);
+	FetchData((void**)&analysis_type,NULL,NULL,ANALYSIS,"Integer",NULL);
+	FetchData((void**)&sub_analysis_type,NULL,NULL,SUBANALYSIS,"Integer",NULL);
 
 	/*Fetch inputs: */
@@ -58,6 +54,4 @@
 	VecFree(&du_g);
 	delete inputs;
-	xfree((void**)&analysis_type_string);
-	xfree((void**)&sub_analysis_type_string);
 
 	/*end module: */
Index: /issm/trunk/src/mex/Gradj/Gradj.cpp
===================================================================
--- /issm/trunk/src/mex/Gradj/Gradj.cpp	(revision 1648)
+++ /issm/trunk/src/mex/Gradj/Gradj.cpp	(revision 1649)
@@ -17,7 +17,5 @@
 	char*    control_type=NULL;
 	ParameterInputs* inputs=NULL;
-	char*    analysis_type_string=NULL;
 	int      analysis_type;
-	char*    sub_analysis_type_string=NULL;
 	int      sub_analysis_type;
 	int      numberofnodes;
@@ -40,8 +38,6 @@
 	FetchData((void**)&numberofnodes,NULL,NULL,mxGetField(PARAMETERS,0,"numberofnodes"),"Integer",NULL);
 	FetchData((void**)&control_type,NULL,NULL,mxGetField(PARAMETERS,0,"control_type"),"String",NULL);
-	FetchData((void**)&analysis_type_string,NULL,NULL,ANALYSIS,"String",NULL);
-	analysis_type=AnalysisTypeAsEnum(analysis_type_string);
-	FetchData((void**)&sub_analysis_type_string,NULL,NULL,SUBANALYSIS,"String",NULL);
-	sub_analysis_type=AnalysisTypeAsEnum(sub_analysis_type_string);
+	FetchData((void**)&analysis_type,NULL,NULL,ANALYSIS,"Integer",NULL);
+	FetchData((void**)&sub_analysis_type,NULL,NULL,SUBANALYSIS,"Integer",NULL);
 
 	/*Fetch inputs: */
@@ -63,6 +59,4 @@
 	delete inputs;
 	VecFree(&grad_g);
-	xfree((void**)&analysis_type_string);
-	xfree((void**)&sub_analysis_type_string);
 
 	/*end module: */
Index: /issm/trunk/src/mex/Misfit/Misfit.cpp
===================================================================
--- /issm/trunk/src/mex/Misfit/Misfit.cpp	(revision 1648)
+++ /issm/trunk/src/mex/Misfit/Misfit.cpp	(revision 1649)
@@ -16,7 +16,5 @@
 	DataSet* materials=NULL;
 	ParameterInputs* inputs=NULL;
-	char*             analysis_type_string=NULL;
 	int               analysis_type;
-	char*             sub_analysis_type_string=NULL;
 	int               sub_analysis_type;
 
@@ -35,8 +33,6 @@
 	FetchData((void**)&loads,NULL,NULL,LOADS,"DataSet",NULL);
 	FetchData((void**)&materials,NULL,NULL,MATERIALS,"DataSet",NULL);
-	FetchData((void**)&analysis_type_string,NULL,NULL,ANALYSIS,"String",NULL);
-	analysis_type=AnalysisTypeAsEnum(analysis_type_string);
-	FetchData((void**)&sub_analysis_type_string,NULL,NULL,SUBANALYSIS,"String",NULL);
-	sub_analysis_type=AnalysisTypeAsEnum(sub_analysis_type_string);
+	FetchData((void**)&analysis_type,NULL,NULL,ANALYSIS,"Integer",NULL);
+	FetchData((void**)&sub_analysis_type,NULL,NULL,SUBANALYSIS,"Integer",NULL);
 
 	/*Fetch inputs: */
@@ -56,6 +52,4 @@
 	delete materials;
 	delete inputs;
-	xfree((void**)&analysis_type_string);
-	xfree((void**)&sub_analysis_type_string);
 
 	/*end module: */
Index: /issm/trunk/src/mex/PenaltyConstraints/PenaltyConstraints.cpp
===================================================================
--- /issm/trunk/src/mex/PenaltyConstraints/PenaltyConstraints.cpp	(revision 1648)
+++ /issm/trunk/src/mex/PenaltyConstraints/PenaltyConstraints.cpp	(revision 1649)
@@ -16,7 +16,5 @@
 	DataSet* materials=NULL;
 	ParameterInputs* inputs=NULL;
-	char*             analysis_type_string=NULL;
 	int               analysis_type;
-	char*             sub_analysis_type_string=NULL;
 	int               sub_analysis_type;
 
@@ -38,9 +36,6 @@
 
 	/*parameters: */
-	FetchData((void**)&analysis_type_string,NULL,NULL,ANALYSIS,"String",NULL);
-	analysis_type=AnalysisTypeAsEnum(analysis_type_string);
-
-	FetchData((void**)&sub_analysis_type_string,NULL,NULL,SUBANALYSIS,"String",NULL);
-	sub_analysis_type=AnalysisTypeAsEnum(sub_analysis_type_string);
+	FetchData((void**)&analysis_type,NULL,NULL,ANALYSIS,"Integer",NULL);
+	FetchData((void**)&sub_analysis_type,NULL,NULL,SUBANALYSIS,"Integer",NULL);
 
 	/*Fetch inputs: */
@@ -63,6 +58,4 @@
 	delete materials;
 	delete inputs;
-	xfree((void**)&analysis_type_string);
-	xfree((void**)&sub_analysis_type_string);
 
 	/*end module: */
Index: /issm/trunk/src/mex/PenaltySystemMatrices/PenaltySystemMatrices.cpp
===================================================================
--- /issm/trunk/src/mex/PenaltySystemMatrices/PenaltySystemMatrices.cpp	(revision 1648)
+++ /issm/trunk/src/mex/PenaltySystemMatrices/PenaltySystemMatrices.cpp	(revision 1649)
@@ -23,7 +23,5 @@
 	ParameterInputs* inputs=NULL;
 	int               analysis_type;
-	char*             analysis_type_string=NULL;
 	int               sub_analysis_type;
-	char*             sub_analysis_type_string=NULL;
 	
 	/*Boot module: */
@@ -43,11 +41,6 @@
 	FetchData((void**)&kflag,NULL,NULL,mxGetField(PARAMETERS,0,"kflag"),"Integer",NULL);
 	FetchData((void**)&pflag,NULL,NULL,mxGetField(PARAMETERS,0,"pflag"),"Integer",NULL);
-
-	FetchData((void**)&analysis_type_string,NULL,NULL,ANALYSIS,"String",NULL);
-	analysis_type=AnalysisTypeAsEnum(analysis_type_string);
-
-	FetchData((void**)&sub_analysis_type_string,NULL,NULL,SUBANALYSIS,"String",NULL);
-	sub_analysis_type=AnalysisTypeAsEnum(sub_analysis_type_string);
-
+	FetchData((void**)&analysis_type,NULL,NULL,ANALYSIS,"Integer",NULL);
+	FetchData((void**)&sub_analysis_type,NULL,NULL,SUBANALYSIS,"Integer",NULL);
 
 	/*Fetch inputs: */
@@ -71,6 +64,4 @@
 	MatFree(&Kgg);
 	VecFree(&pg);
-	xfree((void**)&analysis_type_string);
-	xfree((void**)&sub_analysis_type_string);
 
 	/*end module: */
Index: /issm/trunk/src/mex/SystemMatrices/SystemMatrices.cpp
===================================================================
--- /issm/trunk/src/mex/SystemMatrices/SystemMatrices.cpp	(revision 1648)
+++ /issm/trunk/src/mex/SystemMatrices/SystemMatrices.cpp	(revision 1649)
@@ -19,7 +19,5 @@
 	int         numberofdofspernode;
 	ParameterInputs* inputs=NULL;
-	char*             analysis_type_string=NULL;
 	int               analysis_type;
-	char*             sub_analysis_type_string=NULL;
 	int               sub_analysis_type;
 	
@@ -44,10 +42,6 @@
 	FetchData((void**)&connectivity,NULL,NULL,mxGetField(PARAMETERS,0,"connectivity"),"Integer",NULL);
 	FetchData((void**)&numberofdofspernode,NULL,NULL,mxGetField(PARAMETERS,0,"numberofdofspernode"),"Integer",NULL);
-
-	FetchData((void**)&analysis_type_string,NULL,NULL,ANALYSIS,"String",NULL);
-	analysis_type=AnalysisTypeAsEnum(analysis_type_string);
-
-	FetchData((void**)&sub_analysis_type_string,NULL,NULL,SUBANALYSIS,"String",NULL);
-	sub_analysis_type=AnalysisTypeAsEnum(sub_analysis_type_string);
+	FetchData((void**)&analysis_type,NULL,NULL,ANALYSIS,"Integer",NULL);
+	FetchData((void**)&sub_analysis_type,NULL,NULL,SUBANALYSIS,"Integer",NULL);
 
 	/*Fetch inputs: */
@@ -64,6 +58,4 @@
 	
 	/*Free ressources: */
-	xfree((void**)&analysis_type_string);
-	xfree((void**)&sub_analysis_type_string);
 	delete elements;
 	delete nodes;