Index: /issm/trunk/src/c/solvers/solver_adjoint_linear.cpp
===================================================================
--- /issm/trunk/src/c/solvers/solver_adjoint_linear.cpp	(revision 8814)
+++ /issm/trunk/src/c/solvers/solver_adjoint_linear.cpp	(revision 8815)
@@ -18,11 +18,11 @@
 	Vec  df  = NULL;
 	Vec  ys  = NULL;
-	int  analysis_type;
+	int  configuration_type;
 
 	/*Recover parameters: */
-	femmodel->parameters->FindParam(&analysis_type,AnalysisTypeEnum);
+	femmodel->parameters->FindParam(&configuration_type,ConfigurationTypeEnum);
 
 	SystemMatricesx(&Kff, &Kfs, &pf, &df, NULL,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
-	CreateNodalConstraintsx(&ys,femmodel->nodes,analysis_type);
+	CreateNodalConstraintsx(&ys,femmodel->nodes,configuration_type);
 	Reduceloadx(pf, Kfs, ys,true); MatFree(&Kfs); //true means spc = 0
 	Solverx(&uf, Kff, pf, NULL, df, femmodel->parameters); MatFree(&Kff); VecFree(&pf); VecFree(&df);
Index: /issm/trunk/src/c/solvers/solver_nonlinear.cpp
===================================================================
--- /issm/trunk/src/c/solvers/solver_nonlinear.cpp	(revision 8814)
+++ /issm/trunk/src/c/solvers/solver_nonlinear.cpp	(revision 8815)
@@ -29,5 +29,5 @@
 	int min_mechanical_constraints;
 	int max_nonlinear_iterations;
-	int  analysis_type;
+	int  configuration_type;
 
 
@@ -35,5 +35,5 @@
 	femmodel->parameters->FindParam(&min_mechanical_constraints,MinMechanicalConstraintsEnum);
 	femmodel->parameters->FindParam(&max_nonlinear_iterations,MaxNonlinearIterationsEnum);
-	femmodel->parameters->FindParam(&analysis_type,AnalysisTypeEnum);
+	femmodel->parameters->FindParam(&configuration_type,ConfigurationTypeEnum);
 
 	/*Were loads requested as output? : */
@@ -58,5 +58,5 @@
 
 		SystemMatricesx(&Kff, &Kfs, &pf, &df, NULL,femmodel->elements,femmodel->nodes,femmodel->vertices,loads,femmodel->materials,femmodel->parameters);
-		CreateNodalConstraintsx(&ys,femmodel->nodes,analysis_type);
+		CreateNodalConstraintsx(&ys,femmodel->nodes,configuration_type);
 		Reduceloadx(pf, Kfs, ys); MatFree(&Kfs);
 		Solverx(&uf, Kff, pf, old_uf, df, femmodel->parameters);
Index: /issm/trunk/src/c/solvers/solver_stokescoupling_nonlinear.cpp
===================================================================
--- /issm/trunk/src/c/solvers/solver_stokescoupling_nonlinear.cpp	(revision 8814)
+++ /issm/trunk/src/c/solvers/solver_stokescoupling_nonlinear.cpp	(revision 8815)
@@ -30,5 +30,5 @@
 	int min_mechanical_constraints;
 	int max_nonlinear_iterations;
-	int analysis_type;
+	int configuration_type;
 
 	/*Recover parameters: */
@@ -49,5 +49,5 @@
 		/*First diagnostic horiz:*/
 		femmodel->SetCurrentConfiguration(DiagnosticHorizAnalysisEnum);
-		femmodel->parameters->FindParam(&analysis_type,AnalysisTypeEnum);
+		femmodel->parameters->FindParam(&configuration_type,ConfigurationTypeEnum);
 	
 		//Update once again the solution to make sure that vx and vxold are similar (for next step in transient or steadystate)
@@ -59,5 +59,5 @@
 		/*solve: */
 		SystemMatricesx(&Kff_horiz, &Kfs_horiz, &pf_horiz, &df_horiz, NULL,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
-		CreateNodalConstraintsx(&ys,femmodel->nodes,analysis_type);
+		CreateNodalConstraintsx(&ys,femmodel->nodes,configuration_type);
 		Reduceloadx(pf_horiz, Kfs_horiz, ys); MatFree(&Kfs_horiz);
 		Solverx(&uf_horiz, Kff_horiz, pf_horiz, old_uf_horiz, df_horiz,femmodel->parameters);
@@ -69,9 +69,9 @@
 		/*Second compute vertical velocity: */
 		femmodel->SetCurrentConfiguration(DiagnosticVertAnalysisEnum);
-		femmodel->parameters->FindParam(&analysis_type,AnalysisTypeEnum);
+		femmodel->parameters->FindParam(&configuration_type,ConfigurationTypeEnum);
 		
 		/*solve: */
 		SystemMatricesx(&Kff_vert, &Kfs_vert, &pf_vert,  &df_vert,NULL,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
-		CreateNodalConstraintsx(&ys,femmodel->nodes,analysis_type);
+		CreateNodalConstraintsx(&ys,femmodel->nodes,configuration_type);
 		Reduceloadx(pf_vert, Kfs_vert, ys); MatFree(&Kfs_vert);
 		Solverx(&uf_vert, Kff_vert, pf_vert, NULL, df_vert,femmodel->parameters); MatFree(&Kff_vert); VecFree(&pf_vert); VecFree(&df_vert);
Index: /issm/trunk/src/c/solvers/solver_thermal_nonlinear.cpp
===================================================================
--- /issm/trunk/src/c/solvers/solver_thermal_nonlinear.cpp	(revision 8814)
+++ /issm/trunk/src/c/solvers/solver_thermal_nonlinear.cpp	(revision 8815)
@@ -33,5 +33,5 @@
 	int kflag,pflag;
 	bool lowmem=0;
-	int  analysis_type;
+	int  configuration_type;
 
 
@@ -40,5 +40,5 @@
 	femmodel->parameters->FindParam(&lowmem,LowmemEnum);
 	femmodel->parameters->FindParam(&min_thermal_constraints,MinThermalConstraintsEnum);
-	femmodel->parameters->FindParam(&analysis_type,AnalysisTypeEnum);
+	femmodel->parameters->FindParam(&configuration_type,ConfigurationTypeEnum);
 
 	count=1;
@@ -51,5 +51,5 @@
 
 		SystemMatricesx(&Kff, &Kfs, &pf,&df, &melting_offset,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
-		CreateNodalConstraintsx(&ys,femmodel->nodes,analysis_type);
+		CreateNodalConstraintsx(&ys,femmodel->nodes,configuration_type);
 		Reduceloadx(pf, Kfs, ys); MatFree(&Kfs); VecFree(&tf);
 		Solverx(&tf, Kff, pf,tf_old, df, femmodel->parameters);