Index: /issm/trunk/src/m/solutions/cielo/control.m
===================================================================
--- /issm/trunk/src/m/solutions/cielo/control.m	(revision 772)
+++ /issm/trunk/src/m/solutions/cielo/control.m	(revision 773)
@@ -15,5 +15,5 @@
 	u_g_obs=m.parameters.u_g_obs;
 	u_g=m.parameters.u_g;
-	p_g=m.parameters.p_g;
+	param_g=m.parameters.param_g;
 	grad_g=zeros(m.nodesets.gsize,1);
 		
@@ -23,5 +23,5 @@
 	%initialize inputs, ie m.nparameters on which we invert.
 	inputs=inputlist;
-	inputs=add(inputs,m.parameters.control_type,p_g,'doublevec',2,m.parameters.numberofnodes);
+	inputs=add(inputs,m.parameters.control_type,param_g,'doublevec',2,m.parameters.numberofnodes);
 	inputs=add(inputs,'velocity',u_g,'doublevec',3,m.parameters.numberofnodes);
 
@@ -35,5 +35,5 @@
 		%update inputs with new fit
 		inputs=add(inputs,'fit',m.parameters.fit(n),'double');
-		inputs=add(inputs,m.parameters.control_type,p_g,'doublevec',2,m.parameters.numberofnodes);
+		inputs=add(inputs,m.parameters.control_type,param_g,'doublevec',2,m.parameters.numberofnodes);
 
 		%Update inputs in datasets
@@ -59,13 +59,13 @@
 		
 		disp('      optimizing along gradient direction...'); 
-		[search_scalar c(n).J]=ControlOptimization('objectivefunctionC',0,1,options,m,inputs,p_g,u_g_obs,c(n).grad_g,n,md.analysis_type,md.sub_analysis_type);
+		[search_scalar c(n).J]=ControlOptimization('objectivefunctionC',0,1,options,m,inputs,param_g,u_g_obs,c(n).grad_g,n,md.analysis_type,md.sub_analysis_type);
 		disp('      done.');
 
 		disp('      updating parameter using optimized search scalar...');
-		p_g=p_g+search_scalar*m.parameters.optscal(n)*c(n).grad_g;
+		param_g=param_g+search_scalar*m.parameters.optscal(n)*c(n).grad_g;
 		disp('      done.');
 
 		disp('      constraining the new distribution...');    
-		p_g=ControlConstrain(p_g,m.parameters);
+		param_g=ControlConstrain(param_g,m.parameters);
 		disp('      done.');
 
@@ -77,5 +77,5 @@
 		%some temporary saving 
 		if(mod(n,5)==0),
-			solution=controlfinalsol(c,m,p_g,inputs,md.analysis_type,md.sub_analysis_type);
+			solution=controlfinalsol(c,m,param_g,inputs,md.analysis_type,md.sub_analysis_type);
 			save temporary_control_results solution
 		end
@@ -86,5 +86,5 @@
 	%Create final solution
 	disp('      preparing final velocity solution...');
-	solution=controlfinalsol(c,m,p_g,inputs,md.analysis_type,md.sub_analysis_type);
+	solution=controlfinalsol(c,m,param_g,inputs,md.analysis_type,md.sub_analysis_type);
 	disp('      done.');
 	
Index: /issm/trunk/src/m/solutions/cielo/loadcontrolfinalsol.m
===================================================================
--- /issm/trunk/src/m/solutions/cielo/loadcontrolfinalsol.m	(revision 772)
+++ /issm/trunk/src/m/solutions/cielo/loadcontrolfinalsol.m	(revision 773)
@@ -1,4 +1,5 @@
 function md=loadfinalcontrolsol(md,solution);
 
+if isnan(md.results), md.results=struct(); end
 md.results.control.vx=solution.vx*md.yts;
 md.results.control.vy=solution.vy*md.yts;