Index: /issm/trunk/src/m/solvers/solver_adjoint_linear.m
===================================================================
--- /issm/trunk/src/m/solvers/solver_adjoint_linear.m	(revision 8813)
+++ /issm/trunk/src/m/solvers/solver_adjoint_linear.m	(revision 8814)
@@ -6,13 +6,13 @@
 
 	%Get parameters
-	analysis_type=femmodel.parameters.AnalysisType;
+	configuration_type=femmodel.parameters.ConfigurationType;
 
 	[K_ff,K_fs,p_f,df,kmax]=SystemMatrices(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters);
-	ys=CreateNodalConstraints(femmodel.nodes,analysis_type);
-	p_f = Reduceload( p_f, K_fs, ys,true);
+	ys =CreateNodalConstraints(femmodel.nodes,configuration_type);
+	p_f=Reduceload( p_f, K_fs, ys,true);
 
 	issmprintf(VerboseSolver(),'%s%g','      condition number of stiffness matrix: ',condest(K_ff));
 	u_f=Solver(K_ff,p_f,[],df,femmodel.parameters);
-	u_g= Mergesolutionfromftog( u_f, femmodel.ys, femmodel.nodes,femmodel.parameters,true); 
+	u_g=Mergesolutionfromftog( u_f, ys, femmodel.nodes,femmodel.parameters,true); 
 
 	[femmodel.elements,femmodel.materials]=InputUpdateFromSolution(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,u_g);
Index: /issm/trunk/src/m/solvers/solver_linear.m
===================================================================
--- /issm/trunk/src/m/solvers/solver_linear.m	(revision 8813)
+++ /issm/trunk/src/m/solvers/solver_linear.m	(revision 8814)
@@ -9,6 +9,6 @@
 
 	[K_ff,K_fs,p_f,df,kmax]=SystemMatrices(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters);
-	ys=CreateNodalConstraints(femmodel.nodes,configuration_type);
-	p_f = Reduceload( p_f, K_fs, ys);
+	ys  =CreateNodalConstraints(femmodel.nodes,configuration_type);
+	p_f =Reduceload( p_f, K_fs, ys);
 
 	issmprintf(VerboseSolver(),'%s%g','      condition number of stiffness matrix: ',condest(K_ff));
Index: /issm/trunk/src/m/solvers/solver_nonlinear.m
===================================================================
--- /issm/trunk/src/m/solvers/solver_nonlinear.m	(revision 8813)
+++ /issm/trunk/src/m/solvers/solver_nonlinear.m	(revision 8814)
@@ -7,5 +7,5 @@
 	%Branch on partitioning schema requested
 	min_mechanical_constraints=femmodel.parameters.MinMechanicalConstraints;
-	analysis_type=femmodel.parameters.AnalysisType;
+	configuration_type=femmodel.parameters.ConfigurationType;
 
 	%keep a copy of loads for now
@@ -29,5 +29,5 @@
 
 		[K_ff,K_fs,p_f,df,kmax]=SystemMatrices(femmodel.elements,femmodel.nodes,femmodel.vertices,loads,femmodel.materials,femmodel.parameters);
-		ys=CreateNodalConstraints(femmodel.nodes,analysis_type);
+		ys=CreateNodalConstraints(femmodel.nodes,configuration_type);
 		p_f = Reduceload( p_f, K_fs, ys);
 
Index: /issm/trunk/src/m/solvers/solver_stokescoupling_nonlinear.m
===================================================================
--- /issm/trunk/src/m/solvers/solver_stokescoupling_nonlinear.m	(revision 8813)
+++ /issm/trunk/src/m/solvers/solver_stokescoupling_nonlinear.m	(revision 8814)
@@ -17,5 +17,5 @@
 		%First compute the horizontal velocity
 		femmodel=SetCurrentConfiguration(femmodel,DiagnosticHorizAnalysisEnum);
-		analysis_type=femmodel.parameters.AnalysisType;
+		configuration_type=femmodel.parameters.ConfigurationType;
 
 		%Update the solution to make sure that vx and vxold are similar
@@ -27,5 +27,5 @@
 
 		[K_ff_horiz,K_fs_horiz,p_f_horiz,d_f_horiz,kmax_horiz]=SystemMatrices(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters);
-		ys=CreateNodalConstraints(femmodel.nodes,analysis_type);
+		ys=CreateNodalConstraints(femmodel.nodes,configuration_type);
 		p_f_horiz = Reduceload( p_f_horiz, K_fs_horiz, ys);
 
@@ -40,8 +40,8 @@
 		%Then compute vertical velocity
 		femmodel=SetCurrentConfiguration(femmodel,DiagnosticVertAnalysisEnum);
-		analysis_type=femmodel.parameters.AnalysisType;
+		configuration_type=femmodel.parameters.ConfigurationType;
 
 		[K_ff_vert,K_fs_vert,p_f_vert,d_f_vert,kmax_vert]=SystemMatrices(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters);
-		ys=CreateNodalConstraints(femmodel.nodes,analysis_type);
+		ys=CreateNodalConstraints(femmodel.nodes,configuration_type);
 		p_f_vert = Reduceload( p_f_vert, K_fs_vert, ys);
 
Index: /issm/trunk/src/m/solvers/solver_thermal_nonlinear.m
===================================================================
--- /issm/trunk/src/m/solvers/solver_thermal_nonlinear.m	(revision 8813)
+++ /issm/trunk/src/m/solvers/solver_thermal_nonlinear.m	(revision 8814)
@@ -10,5 +10,5 @@
 
 	%Get parameters
-	analysis_type=femmodel.parameters.AnalysisType;
+	configuration_type=femmodel.parameters.ConfigurationType;
 
 	%stiffness and load generation only:
@@ -24,5 +24,5 @@
 
 		[K_ff,K_fs,p_f,d_f,melting_offset]=SystemMatrices(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters);
-		ys=CreateNodalConstraints(femmodel.nodes,analysis_type);
+		ys=CreateNodalConstraints(femmodel.nodes,configuration_type);
 		p_f = Reduceload( p_f, K_fs, ys);