Index: /issm/trunk/src/c/solvers/solver_adjoint_linear.cpp
===================================================================
--- /issm/trunk/src/c/solvers/solver_adjoint_linear.cpp	(revision 5694)
+++ /issm/trunk/src/c/solvers/solver_adjoint_linear.cpp	(revision 5695)
@@ -12,17 +12,8 @@
 	 * use the flag "true" so that all spc are taken as 0*/
 
-	/*parameters:*/
-	int kflag,pflag;
-
-	/*output: */
-	Vec ug=NULL;
-	Vec uf=NULL; 
-	
 	/*intermediary: */
-	Mat Kgg=NULL;
-	Mat Kff=NULL;
-	Mat Kfs=NULL;
-	Vec pg=NULL;
-	Vec pf=NULL;
+	Mat Kgg = NULL, Kff=NULL, Kfs=NULL;
+	Vec ug  = NULL, uf=NULL;
+	Vec pg  = NULL, pf=NULL;
 
 	SystemMatricesx(&Kgg, &pg,NULL,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
@@ -33,9 +24,6 @@
 	Solverx(&uf, Kff, pf, NULL, femmodel->parameters); MatFree(&Kff); VecFree(&pf);
 
-	Mergesolutionfromftogx(&ug, uf,femmodel->ys,femmodel->nodesets,femmodel->parameters,true);VecFree(&uf);//true means spc0
+	Mergesolutionfromftogx(&ug, uf,femmodel->ys,femmodel->nodesets,femmodel->parameters,true); VecFree(&uf);//true means spc0
 
-	InputUpdateFromSolutionx( femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,ug);
-
-	VecFree(&ug);
-	VecFree(&uf);
+	InputUpdateFromSolutionx( femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,ug); VecFree(&ug); VecFree(&uf);
 }
Index: /issm/trunk/src/c/solvers/solver_diagnostic_nonlinear.cpp
===================================================================
--- /issm/trunk/src/c/solvers/solver_diagnostic_nonlinear.cpp	(revision 5694)
+++ /issm/trunk/src/c/solvers/solver_diagnostic_nonlinear.cpp	(revision 5695)
@@ -12,18 +12,9 @@
 void solver_diagnostic_nonlinear(FemModel* femmodel,bool conserve_loads){
 
-
-	/*solution : */
-	Vec ug=NULL; 
-	Vec uf=NULL; 
-	Vec old_ug=NULL; 
-	Vec old_uf=NULL; 
+	/*intermediary: */
+	Mat Kgg = NULL, Kff = NULL, Kfs   = NULL;
+	Vec ug  = NULL, uf  = NULL, old_ug= NULL, old_uf = NULL;
+	Vec pg  = NULL, pf  = NULL;
 	Loads* loads=NULL;
-
-	/*intermediary: */
-	Mat Kgg=NULL;
-	Mat Kff=NULL;
-	Mat Kfs=NULL;
-	Vec pg=NULL;
-	Vec pf=NULL;
 	int converged;
 	int constraints_converged;
@@ -67,10 +58,7 @@
 		SystemMatricesx(&Kgg, &pg,NULL,femmodel->elements,femmodel->nodes,femmodel->vertices,loads,femmodel->materials,femmodel->parameters);
 		
-		Reducematrixfromgtofx(&Kff,&Kfs,Kgg,femmodel->nodesets,femmodel->parameters);
-		MatFree(&Kgg);
+		Reducematrixfromgtofx(&Kff,&Kfs,Kgg,femmodel->nodesets,femmodel->parameters); MatFree(&Kgg);
 	
-		Reduceloadfromgtofx(&pf, pg, Kfs, femmodel->ys, femmodel->nodesets,femmodel->parameters);
-		VecFree(&pg); 
-		MatFree(&Kfs);
+		Reduceloadfromgtofx(&pf, pg, Kfs, femmodel->ys, femmodel->nodesets,femmodel->parameters); VecFree(&pg); MatFree(&Kfs);
 
 		Solverx(&uf, Kff, pf, old_uf, femmodel->parameters);
@@ -83,6 +71,5 @@
 		if(verbose)_printf_("   number of unstable constraints: %i\n",num_unstable_constraints);
 
-		convergence(&converged,Kff,pf,uf,old_uf,femmodel->parameters);
-		MatFree(&Kff);VecFree(&pf);
+		convergence(&converged,Kff,pf,uf,old_uf,femmodel->parameters); MatFree(&Kff);VecFree(&pf);
 		
 		InputUpdateFromConstantx( femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,converged,ConvergedEnum);
Index: /issm/trunk/src/c/solvers/solver_linear.cpp
===================================================================
--- /issm/trunk/src/c/solvers/solver_linear.cpp	(revision 5694)
+++ /issm/trunk/src/c/solvers/solver_linear.cpp	(revision 5695)
@@ -10,14 +10,8 @@
 void solver_linear(FemModel* femmodel){
 
-	/*output: */
-	Vec ug=NULL;
-	Vec uf=NULL; 
-	
 	/*intermediary: */
-	Mat Kgg=NULL;
-	Mat Kff=NULL;
-	Mat Kfs=NULL;
-	Vec pg=NULL;
-	Vec pf=NULL;
+	Mat Kgg = NULL, Kff = NULL, Kfs   = NULL;
+	Vec ug  = NULL, uf  = NULL;
+	Vec pg  = NULL, pf  = NULL;
 
 	SystemMatricesx(&Kgg,&pg,NULL,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
@@ -30,7 +24,4 @@
 	Mergesolutionfromftogx(&ug, uf,femmodel->ys,femmodel->nodesets,femmodel->parameters);VecFree(&uf);
 
-	InputUpdateFromSolutionx( femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,ug);
-
-	VecFree(&ug);
-	VecFree(&uf);
+	InputUpdateFromSolutionx( femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,ug); VecFree(&ug); VecFree(&uf);
 }