Index: /issm/trunk/test/Verification/PigControlMethodBM2d_21/runme.m
===================================================================
--- /issm/trunk/test/Verification/PigControlMethodBM2d_21/runme.m	(revision 1918)
+++ /issm/trunk/test/Verification/PigControlMethodBM2d_21/runme.m	(revision 1919)
@@ -72,5 +72,5 @@
 
 		%compute fields to be checked
-		fields=testsgetfields(md.type,'control');
+		fields=testsgetfields(md.type,solution);
 
 		%load archive
Index: /issm/trunk/test/Verification/PigControlMethodBM2d_21/updatearchive.m
===================================================================
--- /issm/trunk/test/Verification/PigControlMethodBM2d_21/updatearchive.m	(revision 1918)
+++ /issm/trunk/test/Verification/PigControlMethodBM2d_21/updatearchive.m	(revision 1919)
@@ -26,9 +26,9 @@
 end
 
-%packages and misfits to be tested
+%packages and solutions to be tested
 if nargin==2,
-	misfits=varargin{2};
+	solutions=varargin{2};
 else
-	misfits={'absolute','relative','logarithmic'};
+	solutions={'diagnostic_absolute','diagnostic_relative','diagnostic_logarithmic'};
 end
 if nargin,
@@ -45,10 +45,10 @@
 	package=packages{i};
 
-	for j=1:length(misfits),
-		misfit=misfits{j};
+	for j=1:length(solutions),
+		solution=solutions{j};
 
 		%check solution requested
-		if ((strcmpi(package,'macayeal') & ~strcmpi(misfit,'absolute')) | strcmpi(package,'ice')),
-			disp(['package: ' package  ' and misfit: ' misfit  ' in test: ' testname  ' not supported yet']);
+		if ((strcmpi(package,'macayeal') & ~strcmpi(solution,'absolute')) | strcmpi(package,'ice')),
+			disp(['package: ' package  ' and solution: ' solution  ' in test: ' testname  ' not supported yet']);
 			continue
 		end
@@ -60,26 +60,20 @@
 		md=parameterize(md,'Pig.par');
 		md=setelementstype(md,'macayeal','all');
-		if strcmpi(misfit,'absolute'),
-			md.fit(:)=0;
-		elseif strcmpi(misfit,'relative'),
-			md.fit(:)=1;
-		elseif strcmpi(misfit,'logarithmic'),
-			md.fit(:)=2;
-		end
 		md=modelextract(md,md.elementoniceshelf);
 
-		%launch control method
-		if ~testscheckmisfit(misfit), continue; end
-		md=solve(md,'analysis_type','control','package',packagefinal);
+		%compute solution
+		[md analysis_type sub_analysis_type packagefinal]=testsparameterization(md,solution,package);
+		if ~testschecksolution(md.type,solution), continue; end
+		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',packagefinal);
 
 		%compute fields to be checked
-		fields=testsgetfields(md.type,'control');
+		fields=testsgetfields(md.type,solution);
 
 		%save new archive
 		for k=1:length(fields),
 			field=fields{k};
-			eval(['Archive' package misfit '_field' num2str(k) '=md.results.' field  ';']);
+			eval(['Archive' package solution '_field' num2str(k) '=md.results.' field  ';']);
 		end
-		eval(['save Archive' package misfit ' Archive' package misfit '_field*']);
+		eval(['save Archive' package solution ' Archive' package solution '_field*']);
 	end
 end
Index: /issm/trunk/test/Verification/PigControlMethodDragM2d_20/runme.m
===================================================================
--- /issm/trunk/test/Verification/PigControlMethodDragM2d_20/runme.m	(revision 1918)
+++ /issm/trunk/test/Verification/PigControlMethodDragM2d_20/runme.m	(revision 1919)
@@ -71,5 +71,5 @@
 
 		%compute fields to be checked
-		fields=testsgetfields(md.type,'control');
+		fields=testsgetfields(md.type,solution);
 
 		%load archive
Index: /issm/trunk/test/Verification/PigControlMethodDragM2d_20/updatearchive.m
===================================================================
--- /issm/trunk/test/Verification/PigControlMethodDragM2d_20/updatearchive.m	(revision 1918)
+++ /issm/trunk/test/Verification/PigControlMethodDragM2d_20/updatearchive.m	(revision 1919)
@@ -26,9 +26,9 @@
 end
 
-%packages and misfits to be tested
+%packages and solutions to be tested
 if nargin==2,
-	misfits=varargin{2};
+	solutions=varargin{2};
 else
-	misfits={'absolute','relative','logarithmic'};
+	solutions={'diagnostic_absolute','diagnostic_relative','diagnostic_logarithmic'};
 end
 if nargin,
@@ -45,6 +45,6 @@
 	package=packages{i};
 
-	for j=1:length(misfits),
-		misfit=misfits{j};
+	for j=1:length(solutions),
+		solution=solutions{j};
 
 		%check package
@@ -60,25 +60,19 @@
 		md=parameterize(md,'Pig.par');
 		md=setelementstype(md,'macayeal','all');
-		if strcmpi(misfit,'absolute'),
-			md.fit(:)=0;
-		elseif strcmpi(misfit,'relative'),
-			md.fit(:)=1;
-		elseif strcmpi(misfit,'logarithmic'),
-			md.fit(:)=2;
-		end
 
-		%launch control method
-		if ~testscheckmisfit(misfit), continue; end
-		md=solve(md,'analysis_type','control','package',packagefinal);
+		%compute solution
+		[md analysis_type sub_analysis_type packagefinal]=testsparameterization(md,solution,package);
+		if ~testschecksolution(md.type,solution), continue; end
+		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',packagefinal);
 
 		%compute fields to be checked
-		fields=testsgetfields(md.type,'control');
+		fields=testsgetfields(md.type,solution);
 
 		%save new archive
 		for k=1:length(fields),
 			field=fields{k};
-			eval(['Archive' package misfit '_field' num2str(k) '=md.results.' field  ';']);
+			eval(['Archive' package solution '_field' num2str(k) '=md.results.' field  ';']);
 		end
-		eval(['save Archive' package misfit ' Archive' package misfit '_field*']);
+		eval(['save Archive' package solution ' Archive' package solution '_field*']);
 	end
 end
Index: /issm/trunk/test/Verification/PigControlMethodDragP3d_22/runme.m
===================================================================
--- /issm/trunk/test/Verification/PigControlMethodDragP3d_22/runme.m	(revision 1918)
+++ /issm/trunk/test/Verification/PigControlMethodDragP3d_22/runme.m	(revision 1919)
@@ -72,5 +72,5 @@
 
 		%compute fields to be checked
-		fields=testsgetfields(md.type,'control');
+		fields=testsgetfields(md.type,solution);
 
 		%load archive
Index: /issm/trunk/test/Verification/PigControlMethodDragP3d_22/updatearchive.m
===================================================================
--- /issm/trunk/test/Verification/PigControlMethodDragP3d_22/updatearchive.m	(revision 1918)
+++ /issm/trunk/test/Verification/PigControlMethodDragP3d_22/updatearchive.m	(revision 1919)
@@ -26,9 +26,9 @@
 end
 
-%packages and misfits to be tested
+%packages and solutions to be tested
 if nargin==2,
-	misfits=varargin{2};
+	solutions=varargin{2};
 else
-	misfits={'absolute','relative','logarithmic'};
+	solutions={'diagnostic_absolute','diagnostic_relative','diagnostic_logarithmic'};
 end
 if nargin,
@@ -45,6 +45,6 @@
 	package=packages{i};
 
-	for j=1:length(misfits),
-		misfit=misfits{j};
+	for j=1:length(solutions),
+		solution=solutions{j};
 
 		%check package
@@ -61,25 +61,19 @@
 		md=extrude(md,4,2);
 		md=setelementstype(md,'pattyn','all');
-		if strcmpi(misfit,'absolute'),
-			md.fit(:)=0;
-		elseif strcmpi(misfit,'relative'),
-			md.fit(:)=1;
-		elseif strcmpi(misfit,'logarithmic'),
-			md.fit(:)=2;
-		end
 
-		%launch control method
-		if ~testscheckmisfit(misfit), continue; end
-		md=solve(md,'analysis_type','control','package',packagefinal);
+		%compute solution
+		[md analysis_type sub_analysis_type packagefinal]=testsparameterization(md,solution,package);
+		if ~testschecksolution(md.type,solution), continue; end
+		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',packagefinal);
 
 		%compute fields to be checked
-		fields=testsgetfields(md.type,'control');
+		fields=testsgetfields(md.type,solution);
 
 		%save new archive
 		for k=1:length(fields),
 			field=fields{k};
-			eval(['Archive' package misfit '_field' num2str(k) '=md.results.' field  ';']);
+			eval(['Archive' package solution '_field' num2str(k) '=md.results.' field  ';']);
 		end
-		eval(['save Archive' package misfit ' Archive' package misfit '_field*']);
+		eval(['save Archive' package solution ' Archive' package solution '_field*']);
 	end
 end
Index: /issm/trunk/test/Verification/PigControlMethodDragS3d_23/runme.m
===================================================================
--- /issm/trunk/test/Verification/PigControlMethodDragS3d_23/runme.m	(revision 1918)
+++ /issm/trunk/test/Verification/PigControlMethodDragS3d_23/runme.m	(revision 1919)
@@ -72,5 +72,5 @@
 
 		%compute fields to be checked
-		fields=testsgetfields(md.type,'control');
+		fields=testsgetfields(md.type,solution);
 
 		%load archive
Index: /issm/trunk/test/Verification/PigControlMethodDragS3d_23/updatearchive.m
===================================================================
--- /issm/trunk/test/Verification/PigControlMethodDragS3d_23/updatearchive.m	(revision 1918)
+++ /issm/trunk/test/Verification/PigControlMethodDragS3d_23/updatearchive.m	(revision 1919)
@@ -26,9 +26,9 @@
 end
 
-%packages and misfits to be tested
+%packages and solutions to be tested
 if nargin==2,
-	misfits=varargin{2};
+	solutions=varargin{2};
 else
-	misfits={'absolute','relative','logarithmic'};
+	solutions={'diagnostic_absolute','diagnostic_relative','diagnostic_logarithmic'};
 end
 if nargin,
@@ -45,6 +45,6 @@
 	package=packages{i};
 
-	for j=1:length(misfits),
-		misfit=misfits{j};
+	for j=1:length(solutions),
+		solution=solutions{j};
 
 		%check package
@@ -61,25 +61,19 @@
 		md=extrude(md,4,3);
 		md=setelementstype(md,'pattyn','all','stokes','all');
-		if strcmpi(misfit,'absolute'),
-			md.fit(:)=0;
-		elseif strcmpi(misfit,'relative'),
-			md.fit(:)=1;
-		elseif strcmpi(misfit,'logarithmic'),
-			md.fit(:)=2;
-		end
 
-		%launch control method
-		if ~testscheckmisfit(misfit), continue; end
-		md=solve(md,'analysis_type','control','package',packagefinal);
+		%compute solution
+		[md analysis_type sub_analysis_type packagefinal]=testsparameterization(md,solution,package);
+		if ~testschecksolution(md.type,solution), continue; end
+		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',packagefinal);
 
 		%compute fields to be checked
-		fields=testsgetfields(md.type,'control');
+		fields=testsgetfields(md.type,solution);
 
 		%save new archive
 		for k=1:length(fields),
 			field=fields{k};
-			eval(['Archive' package misfit '_field' num2str(k) '=md.results.' field  ';']);
+			eval(['Archive' package solution '_field' num2str(k) '=md.results.' field  ';']);
 		end
-		eval(['save Archive' package misfit ' Archive' package misfit '_field*']);
+		eval(['save Archive' package solution ' Archive' package solution '_field*']);
 	end
 end