Index: /issm/trunk/src/m/classes/@model/model.m
===================================================================
--- /issm/trunk/src/m/classes/@model/model.m	(revision 44)
+++ /issm/trunk/src/m/classes/@model/model.m	(revision 45)
@@ -150,5 +150,4 @@
 	md.eps_rel=0.01;
 	md.eps_abs=10;
-	md.acceleration=0;
 	md.sparsity=0.001;
 	md.connectivity=10;
@@ -172,5 +171,5 @@
 
 	%Control
-	md.control_type={'drag'};
+	md.control_type='drag';
 	md.cont_vx=NaN;
 	md.cont_vy=NaN;
Index: /issm/trunk/src/m/classes/@pentaelem/CreatePVector.m
===================================================================
--- /issm/trunk/src/m/classes/@pentaelem/CreatePVector.m	(revision 44)
+++ /issm/trunk/src/m/classes/@pentaelem/CreatePVector.m	(revision 45)
@@ -10,6 +10,4 @@
 %
 %   See also CREATEKMATRIX
-
-
 if strcmpi(analysis_type,'diagnostic_horiz'),
 
@@ -895,5 +893,4 @@
 		element.meanvel=pentaelem.meanvel;
 		element.epsvel=pentaelem.epsvel;
-		element.acceleration=pentaelem.acceleration;
 
 		%Call CreateKMatrix for this new element.
Index: /issm/trunk/src/m/classes/@pentaelem/PentaCollapseIntoTriaMatrix.m
===================================================================
--- /issm/trunk/src/m/classes/@pentaelem/PentaCollapseIntoTriaMatrix.m	(revision 44)
+++ /issm/trunk/src/m/classes/@pentaelem/PentaCollapseIntoTriaMatrix.m	(revision 45)
@@ -27,7 +27,5 @@
 	element.meanvel=pentaelem.meanvel;
 	element.epsvel=pentaelem.epsvel;
-	element.acceleration=pentaelem.acceleration;
 
 	%Call CreateKMatrix for this new element.
 	Ke=CreateKMatrix(element,grids,materials,inputs,analysis_type);
-
Index: /issm/trunk/src/m/classes/@pentaelem/PentaCollapseIntoTriaVector.m
===================================================================
--- /issm/trunk/src/m/classes/@pentaelem/PentaCollapseIntoTriaVector.m	(revision 44)
+++ /issm/trunk/src/m/classes/@pentaelem/PentaCollapseIntoTriaVector.m	(revision 45)
@@ -27,7 +27,5 @@
 	element.meanvel=pentaelem.meanvel;
 	element.epsvel=pentaelem.epsvel;
-	element.acceleration=pentaelem.acceleration;
 
 	%Call CreateKMatrix for this new element.
 	Pe=CreatePVector(element,grids,materials,inputs,analysis_type);
-
Index: /issm/trunk/src/m/classes/@pentaelem/display.m
===================================================================
--- /issm/trunk/src/m/classes/@pentaelem/display.m	(revision 44)
+++ /issm/trunk/src/m/classes/@pentaelem/display.m	(revision 45)
@@ -21,5 +21,4 @@
 disp(sprintf('   meanvel: %g',pentaelem.meanvel));
 disp(sprintf('   epsvel: %g',pentaelem.epsvel));
-disp(sprintf('   acceleration (use MacAyeal''s accelerated formulation''): %g',pentaelem.acceleration));
 disp(sprintf('   collapse (collapse penta into tria at the base): %g',pentaelem.collapse));
 disp(sprintf('   melting: %g %g %g',pentaelem.melting(1),pentaelem.melting(2),pentaelem.melting(3)));
Index: /issm/trunk/src/m/classes/@pentaelem/pentaelem.m
===================================================================
--- /issm/trunk/src/m/classes/@pentaelem/pentaelem.m	(revision 44)
+++ /issm/trunk/src/m/classes/@pentaelem/pentaelem.m	(revision 45)
@@ -24,5 +24,4 @@
 	pentaelem.meanvel=NaN;
 	pentaelem.epsvel=NaN;
-	pentaelem.acceleration=0;
 	pentaelem.collapse=0;
 	pentaelem.melting=zeros(6,1);
Index: /issm/trunk/src/m/classes/@triaelem/CreateKMatrix.m
===================================================================
--- /issm/trunk/src/m/classes/@triaelem/CreateKMatrix.m	(revision 44)
+++ /issm/trunk/src/m/classes/@triaelem/CreateKMatrix.m	(revision 45)
@@ -199,11 +199,4 @@
 
 global element_debug  element_debugid
-
-
-%Check if MacAyeal's acceleration is not on? 
-if triaelem.acceleration==1,
-	Ke=elemmatrix(0);
-	return;
-end
 
 %some variables
Index: /issm/trunk/src/m/classes/@triaelem/CreatePVector.m
===================================================================
--- /issm/trunk/src/m/classes/@triaelem/CreatePVector.m	(revision 44)
+++ /issm/trunk/src/m/classes/@triaelem/CreatePVector.m	(revision 45)
@@ -123,9 +123,4 @@
 	global element_debug  element_debugid
 
-	%Check if MacAyeal's acceleration is not on? 
-	if triaelem.acceleration==1,
-		pe={};
-	end
-
 	%some variables
 	numgrids=3;
Index: /issm/trunk/src/m/classes/@triaelem/display.m
===================================================================
--- /issm/trunk/src/m/classes/@triaelem/display.m	(revision 44)
+++ /issm/trunk/src/m/classes/@triaelem/display.m	(revision 45)
@@ -20,3 +20,2 @@
 disp(sprintf('   epsvel: %g',triaelem.epsvel));
 disp(sprintf('   artificial_diffusivity: %i',triaelem.artificial_diffusivity));
-disp(sprintf('   acceleration: %i',triaelem.acceleration));
Index: /issm/trunk/src/m/classes/@triaelem/triaelem.m
===================================================================
--- /issm/trunk/src/m/classes/@triaelem/triaelem.m	(revision 44)
+++ /issm/trunk/src/m/classes/@triaelem/triaelem.m	(revision 45)
@@ -23,5 +23,4 @@
 	triaelem.epsvel=NaN;
 	triaelem.artificial_diffusivity=0;
-	triaelem.acceleration=0;
 	
 	triaelem=class(triaelem,'triaelem');
Index: /issm/trunk/src/m/classes/public/displaycontrol.m
===================================================================
--- /issm/trunk/src/m/classes/public/displaycontrol.m	(revision 44)
+++ /issm/trunk/src/m/classes/public/displaycontrol.m	(revision 45)
@@ -21,5 +21,5 @@
 end
 control_string=control_string(1:length(control_string)-5);
-disp(sprintf('         control_type: %s %s',control_string,'(list of parameters where inverse control is carried out; ex: {''drag''}, or {''drag'',''B''})'));
+disp(sprintf('         control_type: %s %s',control_string,'(parameter where inverse control is carried out; ex: ''drag'', or ''B'')'));
 disp(sprintf('         fit: (%i)      (''absolute: 0'', ''relative: 1'', or ''logarithmic: 2''. default is ''absolute: 0'', for each optimization steps)',length(md.fit)));
 disp(sprintf('         meanvel: %g      (velocity scaling factor when evaluating relative or logarithmic misfit)',md.meanvel));
Index: /issm/trunk/src/m/classes/public/displaysolutionparameters.m
===================================================================
--- /issm/trunk/src/m/classes/public/displaysolutionparameters.m	(revision 44)
+++ /issm/trunk/src/m/classes/public/displaysolutionparameters.m	(revision 45)
@@ -21,5 +21,4 @@
 disp(sprintf('         sparsity: %g      (matrix sparsity. Set to .001 for < 1M dof, .0001 for 5M dof, and .00001 for > 10M dof',md.sparsity));
 disp(sprintf('         connectivity: %i      (element connectivity)',md.connectivity)); 
-disp(sprintf('         acceleration: %i      (accelerate MacAyeal''s formulation? yes -> 1, no -> 0 )',md.acceleration));
 disp(sprintf('         debug: %i      (output debug statements when possible yes-> 1, no -> 0. Default is 1',md.debug));
 disp(sprintf('         element_debug: %i      (output debug statements for elementswhen possible yes-> 1, no -> 0. Default is 0',md.element_debug));
Index: /issm/trunk/src/m/classes/public/ismodelselfconsistent.m
===================================================================
--- /issm/trunk/src/m/classes/public/ismodelselfconsistent.m	(revision 44)
+++ /issm/trunk/src/m/classes/public/ismodelselfconsistent.m	(revision 45)
@@ -269,10 +269,4 @@
 	end
 
-	%ACCELERATION
-	if strcmpi(md.type,'2d') & md.acceleration
-		disp(['solution requires acceleration=0']);
-		bool=0;return;
-	end
-
 	%HUTTER
 	if any(md.elements_type(:,1)==hutterenum); 
@@ -286,6 +280,6 @@
 
 	%CONTROL TYPE
-	if ~iscell(md.control_type),
-		disp('control_type should be a cell array of strings');
+	if ~ischar(md.control_type),
+		disp('control_type should be a string');
 		bool=0;return;
 	end