Index: /issm/trunk/src/m/solutions/jpl/convergence.m
===================================================================
--- /issm/trunk/src/m/solutions/jpl/convergence.m	(revision 3849)
+++ /issm/trunk/src/m/solutions/jpl/convergence.m	(revision 3850)
@@ -1,10 +1,10 @@
-function converged=convergence(K_ff,p_f,u_f,u_f_old,params)
+function converged=convergence(K_ff,p_f,u_f,u_f_old,parameters)
 
 %Get convergence options
-verbose=params.verbose;
-yts=params.yts;
-eps_res=params.eps_res;
-eps_rel=params.eps_rel;
-eps_abs=params.eps_abs;
+verbose=parameters.Verbose;
+yts=parameters.Yts;
+eps_res=parameters.EpsRes;
+eps_rel=parameters.EpsRel;
+eps_abs=parameters.EpsAbs;
 
 %initialization
Index: /issm/trunk/src/m/solutions/jpl/diagnostic_core_nonlinear.m
===================================================================
--- /issm/trunk/src/m/solutions/jpl/diagnostic_core_nonlinear.m	(revision 3849)
+++ /issm/trunk/src/m/solutions/jpl/diagnostic_core_nonlinear.m	(revision 3850)
@@ -18,12 +18,9 @@
 	converged=0; count=1;
 
-	ug=GetSolutionFromInputs(m.elements, m.nodes, m.vertices, m.loads, m.materials, m.parameters, analysis_type, sub_analysis_type);
-	uf=Reducevectorgtof( ug, m.nodesets);
+	soln(count).u_g=GetSolutionFromInputs(m.elements, m.nodes, m.vertices, m.loads, m.materials, m.parameters, analysis_type, sub_analysis_type);
+	soln(count).u_f=Reducevectorgtof( soln(count).u_g, m.nodesets);
 
 	displaystring(m.parameters.Verbose,'\n%s',['   starting direct shooting method']);
 	while(~converged),
-		
-		old_ug=ug;
-		old_uf=uf;
 		
 		%system matrices 
@@ -49,9 +46,8 @@
 
 		%Update elements with new solution
-		m=UpdateInputsFromSolution(m,soln(count).u_g,analysis_type,sub_analysis_type);
+		m.elements=UpdateInputsFromSolution(m.elements,m.nodes,m.vertices,loads,m.materials,m.parameters,soln(count).u_g,analysis_type,sub_analysis_type);
 		
 		%penalty constraints
 		[loads,constraints_converged,num_unstable_constraints] =PenaltyConstraints( m.elements,m.nodes,m.vertices,loads, m.materials,m.parameters,analysis_type,sub_analysis_type);
-		error;
 		
 		displaystring(m.parameters.Verbose,'%s%i','      number of unstable constraints: ',num_unstable_constraints);
@@ -61,5 +57,5 @@
 			
 		%add convergence status into 
-		inputs=add(inputs,'converged',converged,'double');
+		m.elements=UpdateInputsFromConstant(m.elements,m.nodes,m.vertices,loads,m.materials,m.parameters,converged,analysis_type,sub_analysis_type);
 
 		%rift convergence criterion