Index: /issm/trunk/src/m/classes/@model/model.m
===================================================================
--- /issm/trunk/src/m/classes/@model/model.m	(revision 683)
+++ /issm/trunk/src/m/classes/@model/model.m	(revision 684)
@@ -177,10 +177,4 @@
 	%Control
 	md.control_type='';
-	md.cont_vx=NaN;
-	md.cont_vy=NaN;
-	md.cont_vz=NaN;
-	md.cont_vel=NaN;
-	md.cont_parameter=NaN;
-	md.cont_J=[];
 	md.nsteps=0;
 	md.maxiter=[];
Index: /issm/trunk/src/m/classes/public/isresultconsistent.m
===================================================================
--- /issm/trunk/src/m/classes/public/isresultconsistent.m	(revision 683)
+++ /issm/trunk/src/m/classes/public/isresultconsistent.m	(revision 684)
@@ -173,9 +173,9 @@
 end % end function
 
-function bool=testsize(md,fields,sizefield)
+function bool=testsize(md,fields,fieldsize)
 	%TESTSIZE - test size of a field
 	bool=1;
 	for i=1:length(fields),
-		if length(eval(['md.' fields{i}]))~=sizefield
+		if length(eval(['md.' fields{i}]))~=fieldsize
 			disp(['results not consistent: field ' fields{i} ' size should be ' num2str(md.numberofgrids)]);
 			bool=0; return;
Index: /issm/trunk/src/m/solutions/cielo/loadcontrolfinalsol.m
===================================================================
--- /issm/trunk/src/m/solutions/cielo/loadcontrolfinalsol.m	(revision 683)
+++ /issm/trunk/src/m/solutions/cielo/loadcontrolfinalsol.m	(revision 684)
@@ -1,7 +1,7 @@
 function md=loadfinalcontrolsol(md,solution);
 
-md.cont_vx=solution.vx*md.yts;
-md.cont_vy=solution.vy*md.yts;
-md.cont_vel=solution.vel*md.yts;
-md.cont_J=solution.J;
-md.cont_parameter=solution.parameter;
+md.control.vx=solution.vx*md.yts;
+md.control.vy=solution.vy*md.yts;
+md.control.vel=solution.vel*md.yts;
+md.control.J=solution.J;
+md.control.parameter=solution.parameter;