Index: /issm/trunk/src/c/DataSet/Parameters.cpp
===================================================================
--- /issm/trunk/src/c/DataSet/Parameters.cpp	(revision 3765)
+++ /issm/trunk/src/c/DataSet/Parameters.cpp	(revision 3766)
@@ -23,14 +23,12 @@
 using namespace std;
 /*}}}*/
-/*Parameters: {{{1*/
-
 
 /*Object constructors and destructor*/
-/*FUNCTION Parameters::Parameters(){{{2*/
+/*FUNCTION Parameters::Parameters(){{{1*/
 Parameters::Parameters(){
 	return;
 }
 /*}}}*/
-/*FUNCTION Parameters::Parameters(int in_enum){{{2*/
+/*FUNCTION Parameters::Parameters(int in_enum){{{1*/
 Parameters::Parameters(int in_enum): DataSet(in_enum){
 	//do nothing;
@@ -38,5 +36,5 @@
 }
 /*}}}*/
-/*FUNCTION Parameters::~Parameters(){{{2*/
+/*FUNCTION Parameters::~Parameters(){{{1*/
 Parameters::~Parameters(){
 	return;
@@ -45,5 +43,5 @@
 
 /*Object management*/
-/*FUNCTION Parameters::FindParam(bool* pbool,int enum_type){{{2*/
+/*FUNCTION Parameters::FindParam(bool* pbool,int enum_type){{{1*/
 int   Parameters::FindParam(bool* pbool,int enum_type){
 	
@@ -59,53 +57,44 @@
 	for ( object=objects.begin() ; object < objects.end(); object++ ){
 
-		/*Find param type objects: */
-		if((*object)->Enum()==ParamEnum){
-
-			/*Ok, this object is a parameter, recover it and ask which name it has: */
-			param=(Param*)(*object);
-
-			if(param->EnumType()==enum_type){
-				/*Ok, this is the one! Recover the value of this parameter: */
-				param->GetParameterValue(pbool);
-				found=1;
-				break;
-			}
-		}
-	}
-	return found;
-}
-/*}}}*/
-/*FUNCTION Parameters::FindParam(int* pinteger,int enum_type){{{2*/
+		/*Ok, this object is a parameter, recover it and ask which name it has: */
+		param=(Param*)(*object);
+
+		if(param->EnumType()==enum_type){
+			/*Ok, this is the one! Recover the value of this parameter: */
+			param->GetParameterValue(pbool);
+			found=1;
+			break;
+		}
+	}
+	return found;
+}
+/*}}}*/
+/*FUNCTION Parameters::FindParam(int* pinteger,int enum_type){{{1*/
 int   Parameters::FindParam(int* pinteger,int enum_type){
 	
-	
-	/*Go through a dataset, and find a Param* object 
-	 *which parameter name is "name" : */
-	
-	vector<Object*>::iterator object;
-	Param* param=NULL;
-
-	int found=0;
-
-	for ( object=objects.begin() ; object < objects.end(); object++ ){
-
-		/*Find param type objects: */
-		if((*object)->Enum()==ParamEnum){
-
-			/*Ok, this object is a parameter, recover it and ask which name it has: */
-			param=(Param*)(*object);
-
-			if(param->EnumType()==enum_type){
-				/*Ok, this is the one! Recover the value of this parameter: */
-				param->GetParameterValue(pinteger);
-				found=1;
-				break;
-			}
-		}
-	}
-	return found;
-}
-/*}}}*/
-/*FUNCTION Parameters::FindParam(double* pscalar, int enum_type){{{2*/
+	/*Go through a dataset, and find a Param* object 
+	 *which parameter name is "name" : */
+	
+	vector<Object*>::iterator object;
+	Param* param=NULL;
+
+	int found=0;
+
+	for ( object=objects.begin() ; object < objects.end(); object++ ){
+
+		/*Ok, this object is a parameter, recover it and ask which name it has: */
+		param=(Param*)(*object);
+
+		if(param->EnumType()==enum_type){
+			/*Ok, this is the one! Recover the value of this parameter: */
+			param->GetParameterValue(pinteger);
+			found=1;
+			break;
+		}
+	}
+	return found;
+}
+/*}}}*/
+/*FUNCTION Parameters::FindParam(double* pscalar, int enum_type){{{1*/
 int   Parameters::FindParam(double* pscalar, int enum_type){
 	
@@ -120,22 +109,18 @@
 	for ( object=objects.begin() ; object < objects.end(); object++ ){
 
-		/*Find param type objects: */
-		if((*object)->Enum()==ParamEnum){
-
-			/*Ok, this object is a parameter, recover it and ask which name it has: */
-			param=(Param*)(*object);
-
-			if(param->EnumType()==enum_type){
-				/*Ok, this is the one! Recover the value of this parameter: */
-				param->GetParameterValue(pscalar);
-				found=1;
-				break;
-			}
-		}
-	}
-	return found;
-}
-/*}}}*/
-/*FUNCTION Parameters::FindParam(char** pstring,int enum_type){{{2*/
+		/*Ok, this object is a parameter, recover it and ask which name it has: */
+		param=(Param*)(*object);
+
+		if(param->EnumType()==enum_type){
+			/*Ok, this is the one! Recover the value of this parameter: */
+			param->GetParameterValue(pscalar);
+			found=1;
+			break;
+		}
+	}
+	return found;
+}
+/*}}}*/
+/*FUNCTION Parameters::FindParam(char** pstring,int enum_type){{{1*/
 int   Parameters::FindParam(char** pstring,int enum_type){
 	
@@ -150,23 +135,19 @@
 	for ( object=objects.begin() ; object < objects.end(); object++ ){
 
-		/*Find param type objects: */
-		if((*object)->Enum()==ParamEnum){
-
-			/*Ok, this object is a parameter, recover it and ask which name it has: */
-			param=(Param*)(*object);
-
-			if(param->EnumType()==enum_type){
-				/*Ok, this is the one! Recover the value of this parameter: */
-				param->GetParameterValue(pstring);
-				found=1;
-				break;
-			}
-		}
-	}
-	return found;
-
-}
-/*}}}*/
-/*FUNCTION Parameters::FindParam(char*** pstringarray,int* pM,int enum_type){{{2*/
+		/*Ok, this object is a parameter, recover it and ask which name it has: */
+		param=(Param*)(*object);
+
+		if(param->EnumType()==enum_type){
+			/*Ok, this is the one! Recover the value of this parameter: */
+			param->GetParameterValue(pstring);
+			found=1;
+			break;
+		}
+	}
+	return found;
+
+}
+/*}}}*/
+/*FUNCTION Parameters::FindParam(char*** pstringarray,int* pM,int enum_type){{{1*/
 int   Parameters::FindParam(char*** pstringarray,int* pM,int enum_type){
 	
@@ -181,23 +162,19 @@
 	for ( object=objects.begin() ; object < objects.end(); object++ ){
 
-		/*Find param type objects: */
-		if((*object)->Enum()==ParamEnum){
-
-			/*Ok, this object is a parameter, recover it and ask which name it has: */
-			param=(Param*)(*object);
-
-			if(param->EnumType()==enum_type){
-				/*Ok, this is the one! Recover the value of this parameter: */
-				param->GetParameterValue(pstringarray,pM);
-				found=1;
-				break;
-			}
-		}
-	}
-	return found;
-
-}
-/*}}}*/
-/*FUNCTION Parameters::FindParam(double** pdoublearray,int* pM,int enum_type){{{2*/
+		/*Ok, this object is a parameter, recover it and ask which name it has: */
+		param=(Param*)(*object);
+
+		if(param->EnumType()==enum_type){
+			/*Ok, this is the one! Recover the value of this parameter: */
+			param->GetParameterValue(pstringarray,pM);
+			found=1;
+			break;
+		}
+	}
+	return found;
+
+}
+/*}}}*/
+/*FUNCTION Parameters::FindParam(double** pdoublearray,int* pM,int enum_type){{{1*/
 int   Parameters::FindParam(double** pdoublearray,int* pM, int enum_type){
 	
@@ -212,23 +189,19 @@
 	for ( object=objects.begin() ; object < objects.end(); object++ ){
 
-		/*Find param type objects: */
-		if((*object)->Enum()==ParamEnum){
-
-			/*Ok, this object is a parameter, recover it and ask which name it has: */
-			param=(Param*)(*object);
-
-			if(param->EnumType()==enum_type){
-				/*Ok, this is the one! Recover the value of this parameter: */
-				param->GetParameterValue(pdoublearray,pM);
-				found=1;
-				break;
-			}
-		}
-	}
-	return found;
-
-}
-/*}}}*/
-/*FUNCTION Parameters::FindParam(double** pdoublearray,int* pM, int* pN,int enum_type){{{2*/
+		/*Ok, this object is a parameter, recover it and ask which name it has: */
+		param=(Param*)(*object);
+
+		if(param->EnumType()==enum_type){
+			/*Ok, this is the one! Recover the value of this parameter: */
+			param->GetParameterValue(pdoublearray,pM);
+			found=1;
+			break;
+		}
+	}
+	return found;
+
+}
+/*}}}*/
+/*FUNCTION Parameters::FindParam(double** pdoublearray,int* pM, int* pN,int enum_type){{{1*/
 int   Parameters::FindParam(double** pdoublearray,int* pM, int* pN,int enum_type){
 	
@@ -243,23 +216,19 @@
 	for ( object=objects.begin() ; object < objects.end(); object++ ){
 
-		/*Find param type objects: */
-		if((*object)->Enum()==ParamEnum){
-
-			/*Ok, this object is a parameter, recover it and ask which name it has: */
-			param=(Param*)(*object);
-
-			if(param->EnumType()==enum_type){
-				/*Ok, this is the one! Recover the value of this parameter: */
-				param->GetParameterValue(pdoublearray,pM,pN);
-				found=1;
-				break;
-			}
-		}
-	}
-	return found;
-
-}
-/*}}}*/
-/*FUNCTION Parameters::FindParam(Vec* pvec,int enum_type){{{2*/
+		/*Ok, this object is a parameter, recover it and ask which name it has: */
+		param=(Param*)(*object);
+
+		if(param->EnumType()==enum_type){
+			/*Ok, this is the one! Recover the value of this parameter: */
+			param->GetParameterValue(pdoublearray,pM,pN);
+			found=1;
+			break;
+		}
+	}
+	return found;
+
+}
+/*}}}*/
+/*FUNCTION Parameters::FindParam(Vec* pvec,int enum_type){{{1*/
 int   Parameters::FindParam(Vec* pvec,int enum_type){
 	
@@ -274,23 +243,19 @@
 	for ( object=objects.begin() ; object < objects.end(); object++ ){
 
-		/*Find param type objects: */
-		if((*object)->Enum()==ParamEnum){
-
-			/*Ok, this object is a parameter, recover it and ask which name it has: */
-			param=(Param*)(*object);
-
-			if(param->EnumType()==enum_type){
-				/*Ok, this is the one! Recover the value of this parameter: */
-				param->GetParameterValue(pvec);
-				found=1;
-				break;
-			}
-		}
-	}
-	return found;
-
-}
-/*}}}*/
-/*FUNCTION Parameters::FindParamMat* pmat,int enum_type){{{2*/
+		/*Ok, this object is a parameter, recover it and ask which name it has: */
+		param=(Param*)(*object);
+
+		if(param->EnumType()==enum_type){
+			/*Ok, this is the one! Recover the value of this parameter: */
+			param->GetParameterValue(pvec);
+			found=1;
+			break;
+		}
+	}
+	return found;
+
+}
+/*}}}*/
+/*FUNCTION Parameters::FindParamMat* pmat,int enum_type){{{1*/
 int   Parameters::FindParam(Mat* pmat,int enum_type){
 	
@@ -305,23 +270,19 @@
 	for ( object=objects.begin() ; object < objects.end(); object++ ){
 
-		/*Find param type objects: */
-		if((*object)->Enum()==ParamEnum){
-
-			/*Ok, this object is a parameter, recover it and ask which name it has: */
-			param=(Param*)(*object);
-
-			if(param->EnumType()==enum_type){
-				/*Ok, this is the one! Recover the value of this parameter: */
-				param->GetParameterValue(pmat);
-				found=1;
-				break;
-			}
-		}
-	}
-	return found;
-
-}
-/*}}}*/
-/*FUNCTION Parameters::FindParamObject{{{2*/
+		/*Ok, this object is a parameter, recover it and ask which name it has: */
+		param=(Param*)(*object);
+
+		if(param->EnumType()==enum_type){
+			/*Ok, this is the one! Recover the value of this parameter: */
+			param->GetParameterValue(pmat);
+			found=1;
+			break;
+		}
+	}
+	return found;
+
+}
+/*}}}*/
+/*FUNCTION Parameters::FindParamObject{{{1*/
 Object* Parameters::FindParamObject(int enum_type){
 
@@ -334,14 +295,10 @@
 	for ( object=objects.begin() ; object < objects.end(); object++ ){
 
-		/*Find param type objects: */
-		if((*object)->Enum()==ParamEnum){
-
-			/*Ok, this object is a parameter, recover it and ask which name it has: */
-			param=(Param*)(*object);
-
-			if(param->EnumType()==enum_type){
-				/*Ok, this is the one! Return the object: */
-				return (*object);
-			}
+		/*Ok, this object is a parameter, recover it and ask which name it has: */
+		param=(Param*)(*object);
+
+		if(param->EnumType()==enum_type){
+			/*Ok, this is the one! Return the object: */
+			return (*object);
 		}
 	}
@@ -349,7 +306,2 @@
 }
 /*}}}*/
-
-/*Object functions*/
-
-
-/*}}}*/
Index: /issm/trunk/src/c/ModelProcessorx/CreateParameters.cpp
===================================================================
--- /issm/trunk/src/c/ModelProcessorx/CreateParameters.cpp	(revision 3765)
+++ /issm/trunk/src/c/ModelProcessorx/CreateParameters.cpp	(revision 3766)
@@ -30,5 +30,5 @@
 	if (strcmp(iomodel->meshtype,"2d")==0) parameters->AddObject(new IntParam(DimEnum,2));
 	else parameters->AddObject(new IntParam(DimEnum,3));
-	parameters->AddObject(new   StringParam(OutputFileNameEnum,iomodel->outputfilename));
+	parameters->AddObject(new StringParam(OutputFileNameEnum,iomodel->outputfilename));
 	parameters->AddObject(new   BoolParam(IsHutterEnum,iomodel->ishutter));
 	parameters->AddObject(new   BoolParam(IsMacAyealPattynEnum,iomodel->ismacayealpattyn));
@@ -58,5 +58,5 @@
 	parameters->AddObject(new DoubleParam(ViscosityOvershootEnum,iomodel->viscosity_overshoot));
 	parameters->AddObject(new   BoolParam(WaitOnLockEnum,iomodel->waitonlock));
-	parameters->AddObject(new   StringParam(SolverStringEnum,iomodel->solverstring));
+	parameters->AddObject(new StringParam(SolverStringEnum,iomodel->solverstring));
 	parameters->AddObject(new    IntParam(NumberOfVerticesEnum,iomodel->numberofvertices));
 	parameters->AddObject(new    IntParam(NumberOfElementsEnum,iomodel->numberofelements));