Index: /issm/trunk/test/Verification/IceSheetIceFrontM2d_7/runme.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetIceFrontM2d_7/runme.m	(revision 519)
+++ /issm/trunk/test/Verification/IceSheetIceFrontM2d_7/runme.m	(revision 520)
@@ -49,5 +49,5 @@
 		[analysis_type sub_analysis_type]=testsgetanalysis(solution);
 		[md packagefinal]=testsgetpackage(md,package);
-		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package);
+		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',packagefinal);
 
 		%compute fields to be checked
Index: /issm/trunk/test/Verification/IceSheetIceFrontM2d_7/updatearchive.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetIceFrontM2d_7/updatearchive.m	(revision 519)
+++ /issm/trunk/test/Verification/IceSheetIceFrontM2d_7/updatearchive.m	(revision 520)
@@ -42,5 +42,5 @@
 		[analysis_type sub_analysis_type]=testsgetanalysis(solution);
 		[md packagefinal]=testsgetpackage(md,package);
-		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package);
+		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',packagefinal);
 
 		%compute fields to be checked
Index: /issm/trunk/test/Verification/IceSheetIceFrontM3d_8/runme.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetIceFrontM3d_8/runme.m	(revision 519)
+++ /issm/trunk/test/Verification/IceSheetIceFrontM3d_8/runme.m	(revision 520)
@@ -52,5 +52,5 @@
 		[analysis_type sub_analysis_type]=testsgetanalysis(solution);
 		[md packagefinal]=testsgetpackage(md,package);
-		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package);
+		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',packagefinal);
 
 		%compute fields to be checked
Index: /issm/trunk/test/Verification/IceSheetIceFrontM3d_8/updatearchive.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetIceFrontM3d_8/updatearchive.m	(revision 519)
+++ /issm/trunk/test/Verification/IceSheetIceFrontM3d_8/updatearchive.m	(revision 520)
@@ -45,5 +45,5 @@
 		[analysis_type sub_analysis_type]=testsgetanalysis(solution);
 		[md packagefinal]=testsgetpackage(md,package);
-		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package);
+		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',packagefinal);
 
 		%compute fields to be checked
Index: /issm/trunk/test/Verification/IceSheetIceFrontMP3d_9/runme.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetIceFrontMP3d_9/runme.m	(revision 519)
+++ /issm/trunk/test/Verification/IceSheetIceFrontMP3d_9/runme.m	(revision 520)
@@ -52,5 +52,5 @@
 		[analysis_type sub_analysis_type]=testsgetanalysis(solution);
 		[md packagefinal]=testsgetpackage(md,package);
-		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package);
+		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',packagefinal);
 
 		%compute fields to be checked
Index: /issm/trunk/test/Verification/IceSheetIceFrontMP3d_9/updatearchive.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetIceFrontMP3d_9/updatearchive.m	(revision 519)
+++ /issm/trunk/test/Verification/IceSheetIceFrontMP3d_9/updatearchive.m	(revision 520)
@@ -45,5 +45,5 @@
 		[analysis_type sub_analysis_type]=testsgetanalysis(solution);
 		[md packagefinal]=testsgetpackage(md,package);
-		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package);
+		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',packagefinal);
 
 		%compute fields to be checked
Index: /issm/trunk/test/Verification/IceSheetIceFrontP3d_10/runme.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetIceFrontP3d_10/runme.m	(revision 519)
+++ /issm/trunk/test/Verification/IceSheetIceFrontP3d_10/runme.m	(revision 520)
@@ -52,5 +52,5 @@
 		[analysis_type sub_analysis_type]=testsgetanalysis(solution);
 		[md packagefinal]=testsgetpackage(md,package);
-		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package);
+		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',packagefinal);
 
 		%compute fields to be checked
Index: /issm/trunk/test/Verification/IceSheetIceFrontP3d_10/updatearchive.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetIceFrontP3d_10/updatearchive.m	(revision 519)
+++ /issm/trunk/test/Verification/IceSheetIceFrontP3d_10/updatearchive.m	(revision 520)
@@ -45,5 +45,5 @@
 		[analysis_type sub_analysis_type]=testsgetanalysis(solution);
 		[md packagefinal]=testsgetpackage(md,package);
-		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package);
+		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',packagefinal);
 
 		%compute fields to be checked
Index: /issm/trunk/test/Verification/IceSheetIceFrontS3d_11/runme.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetIceFrontS3d_11/runme.m	(revision 519)
+++ /issm/trunk/test/Verification/IceSheetIceFrontS3d_11/runme.m	(revision 520)
@@ -50,5 +50,5 @@
 		[analysis_type sub_analysis_type]=testsgetanalysis(solution);
 		[md packagefinal]=testsgetpackage(md,package);
-		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package);
+		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',packagefinal);
 
 		%compute fields to be checked
Index: /issm/trunk/test/Verification/IceSheetIceFrontS3d_11/updatearchive.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetIceFrontS3d_11/updatearchive.m	(revision 519)
+++ /issm/trunk/test/Verification/IceSheetIceFrontS3d_11/updatearchive.m	(revision 520)
@@ -43,5 +43,5 @@
 		[analysis_type sub_analysis_type]=testsgetanalysis(solution);
 		[md packagefinal]=testsgetpackage(md,package);
-		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package);
+		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',packagefinal);
 
 		%compute fields to be checked
Index: /issm/trunk/test/Verification/IceSheetNoIceFrontH2d_12/runme.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetNoIceFrontH2d_12/runme.m	(revision 519)
+++ /issm/trunk/test/Verification/IceSheetNoIceFrontH2d_12/runme.m	(revision 520)
@@ -49,5 +49,5 @@
 		[analysis_type sub_analysis_type]=testsgetanalysis(solution);
 		[md packagefinal]=testsgetpackage(md,package);
-		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package);
+		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',packagefinal);
 
 		%compute fields to be checked
Index: /issm/trunk/test/Verification/IceSheetNoIceFrontH2d_12/updatearchive.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetNoIceFrontH2d_12/updatearchive.m	(revision 519)
+++ /issm/trunk/test/Verification/IceSheetNoIceFrontH2d_12/updatearchive.m	(revision 520)
@@ -42,8 +42,8 @@
 		[analysis_type sub_analysis_type]=testsgetanalysis(solution);
 		[md packagefinal]=testsgetpackage(md,package);
-		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package);
+		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',packagefinal);
 
 		%compute fields to be checked
-fields=testsgetfields(md.type,solution);
+		fields=testsgetfields(md.type,solution);
 
 		%save new archive
Index: /issm/trunk/test/Verification/IceSheetNoIceFrontH3d_13/runme.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetNoIceFrontH3d_13/runme.m	(revision 519)
+++ /issm/trunk/test/Verification/IceSheetNoIceFrontH3d_13/runme.m	(revision 520)
@@ -52,5 +52,5 @@
 		[analysis_type sub_analysis_type]=testsgetanalysis(solution);
 		[md packagefinal]=testsgetpackage(md,package);
-		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package);
+		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',packagefinal);
 
 		%compute fields to be checked
Index: /issm/trunk/test/Verification/IceSheetNoIceFrontH3d_13/updatearchive.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetNoIceFrontH3d_13/updatearchive.m	(revision 519)
+++ /issm/trunk/test/Verification/IceSheetNoIceFrontH3d_13/updatearchive.m	(revision 520)
@@ -45,5 +45,5 @@
 		[analysis_type sub_analysis_type]=testsgetanalysis(solution);
 		[md packagefinal]=testsgetpackage(md,package);
-		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package);
+		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',packagefinal);
 
 		%compute fields to be checked
Index: /issm/trunk/test/Verification/IceSheetNoIceFrontHM2d_14/runme.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetNoIceFrontHM2d_14/runme.m	(revision 519)
+++ /issm/trunk/test/Verification/IceSheetNoIceFrontHM2d_14/runme.m	(revision 520)
@@ -49,5 +49,5 @@
 		[analysis_type sub_analysis_type]=testsgetanalysis(solution);
 		[md packagefinal]=testsgetpackage(md,package);
-		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package);
+		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',packagefinal);
 
 		%compute fields to be checked
Index: /issm/trunk/test/Verification/IceSheetNoIceFrontHM2d_14/updatearchive.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetNoIceFrontHM2d_14/updatearchive.m	(revision 519)
+++ /issm/trunk/test/Verification/IceSheetNoIceFrontHM2d_14/updatearchive.m	(revision 520)
@@ -42,8 +42,8 @@
 		[analysis_type sub_analysis_type]=testsgetanalysis(solution);
 		[md packagefinal]=testsgetpackage(md,package);
-		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package);
+		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',packagefinal);
 
 		%compute fields to be checked
-fields=testsgetfields(md.type,solution);
+		fields=testsgetfields(md.type,solution);
 
 		%save new archive
Index: /issm/trunk/test/Verification/IceSheetNoIceFrontHM3d_15/runme.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetNoIceFrontHM3d_15/runme.m	(revision 519)
+++ /issm/trunk/test/Verification/IceSheetNoIceFrontHM3d_15/runme.m	(revision 520)
@@ -50,5 +50,5 @@
 		[analysis_type sub_analysis_type]=testsgetanalysis(solution);
 		[md packagefinal]=testsgetpackage(md,package);
-		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package);
+		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',packagefinal);
 
 		%compute fields to be checked
Index: /issm/trunk/test/Verification/IceSheetNoIceFrontHM3d_15/updatearchive.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetNoIceFrontHM3d_15/updatearchive.m	(revision 519)
+++ /issm/trunk/test/Verification/IceSheetNoIceFrontHM3d_15/updatearchive.m	(revision 520)
@@ -43,5 +43,5 @@
 		[analysis_type sub_analysis_type]=testsgetanalysis(solution);
 		[md packagefinal]=testsgetpackage(md,package);
-		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package);
+		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',packagefinal);
 
 		%compute fields to be checked
Index: /issm/trunk/test/Verification/IceSheetNoIceFrontM2d_16/runme.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetNoIceFrontM2d_16/runme.m	(revision 519)
+++ /issm/trunk/test/Verification/IceSheetNoIceFrontM2d_16/runme.m	(revision 520)
@@ -49,5 +49,5 @@
 		[analysis_type sub_analysis_type]=testsgetanalysis(solution);
 		[md packagefinal]=testsgetpackage(md,package);
-		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package);
+		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',packagefinal);
 
 		%compute fields to be checked
Index: /issm/trunk/test/Verification/IceSheetNoIceFrontM2d_16/updatearchive.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetNoIceFrontM2d_16/updatearchive.m	(revision 519)
+++ /issm/trunk/test/Verification/IceSheetNoIceFrontM2d_16/updatearchive.m	(revision 520)
@@ -42,8 +42,8 @@
 		[analysis_type sub_analysis_type]=testsgetanalysis(solution);
 		[md packagefinal]=testsgetpackage(md,package);
-		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package);
+		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',packagefinal);
 
 		%compute fields to be checked
-fields=testsgetfields(md.type,solution);
+		fields=testsgetfields(md.type,solution);
 
 		%save new archive
Index: /issm/trunk/test/Verification/IceSheetNoIceFrontM3d_17/runme.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetNoIceFrontM3d_17/runme.m	(revision 519)
+++ /issm/trunk/test/Verification/IceSheetNoIceFrontM3d_17/runme.m	(revision 520)
@@ -52,5 +52,5 @@
 		[analysis_type sub_analysis_type]=testsgetanalysis(solution);
 		[md packagefinal]=testsgetpackage(md,package);
-		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package);
+		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',packagefinal);
 
 		%compute fields to be checked
Index: /issm/trunk/test/Verification/IceSheetNoIceFrontM3d_17/updatearchive.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetNoIceFrontM3d_17/updatearchive.m	(revision 519)
+++ /issm/trunk/test/Verification/IceSheetNoIceFrontM3d_17/updatearchive.m	(revision 520)
@@ -45,5 +45,5 @@
 		[analysis_type sub_analysis_type]=testsgetanalysis(solution);
 		[md packagefinal]=testsgetpackage(md,package);
-		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package);
+		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',packagefinal);
 
 		%compute fields to be checked
Index: /issm/trunk/test/Verification/IceSheetNoIceFrontP3d_18/runme.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetNoIceFrontP3d_18/runme.m	(revision 519)
+++ /issm/trunk/test/Verification/IceSheetNoIceFrontP3d_18/runme.m	(revision 520)
@@ -52,5 +52,5 @@
 		[analysis_type sub_analysis_type]=testsgetanalysis(solution);
 		[md packagefinal]=testsgetpackage(md,package);
-		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package);
+		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',packagefinal);
 
 		%compute fields to be checked
Index: /issm/trunk/test/Verification/IceSheetNoIceFrontP3d_18/updatearchive.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetNoIceFrontP3d_18/updatearchive.m	(revision 519)
+++ /issm/trunk/test/Verification/IceSheetNoIceFrontP3d_18/updatearchive.m	(revision 520)
@@ -45,5 +45,5 @@
 		[analysis_type sub_analysis_type]=testsgetanalysis(solution);
 		[md packagefinal]=testsgetpackage(md,package);
-		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package);
+		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',packagefinal);
 
 		%compute fields to be checked
Index: /issm/trunk/test/Verification/IceSheetNoIceFrontS3d_19/runme.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetNoIceFrontS3d_19/runme.m	(revision 519)
+++ /issm/trunk/test/Verification/IceSheetNoIceFrontS3d_19/runme.m	(revision 520)
@@ -50,5 +50,5 @@
 		[analysis_type sub_analysis_type]=testsgetanalysis(solution);
 		[md packagefinal]=testsgetpackage(md,package);
-		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package);
+		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',packagefinal);
 
 		%compute fields to be checked
Index: /issm/trunk/test/Verification/IceSheetNoIceFrontS3d_19/updatearchive.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetNoIceFrontS3d_19/updatearchive.m	(revision 519)
+++ /issm/trunk/test/Verification/IceSheetNoIceFrontS3d_19/updatearchive.m	(revision 520)
@@ -43,5 +43,5 @@
 		[analysis_type sub_analysis_type]=testsgetanalysis(solution);
 		[md packagefinal]=testsgetpackage(md,package);
-		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package);
+		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',packagefinal);
 
 		%compute fields to be checked
Index: /issm/trunk/test/Verification/IceShelfIceFrontM2d_1/runme.m
===================================================================
--- /issm/trunk/test/Verification/IceShelfIceFrontM2d_1/runme.m	(revision 519)
+++ /issm/trunk/test/Verification/IceShelfIceFrontM2d_1/runme.m	(revision 520)
@@ -49,5 +49,5 @@
 		[analysis_type sub_analysis_type]=testsgetanalysis(solution);
 		[md packagefinal]=testsgetpackage(md,package);
-		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package);
+		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',packagefinal);
 
 		%compute fields to be checked
Index: /issm/trunk/test/Verification/IceShelfIceFrontM2d_1/updatearchive.m
===================================================================
--- /issm/trunk/test/Verification/IceShelfIceFrontM2d_1/updatearchive.m	(revision 519)
+++ /issm/trunk/test/Verification/IceShelfIceFrontM2d_1/updatearchive.m	(revision 520)
@@ -42,8 +42,8 @@
 		[analysis_type sub_analysis_type]=testsgetanalysis(solution);
 		[md packagefinal]=testsgetpackage(md,package);
-		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package);
+		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',packagefinal);
 
 		%compute fields to be checked
-fields=testsgetfields(md.type,solution);
+		fields=testsgetfields(md.type,solution);
 
 		%save new archive
Index: /issm/trunk/test/Verification/IceShelfIceFrontM3d_2/runme.m
===================================================================
--- /issm/trunk/test/Verification/IceShelfIceFrontM3d_2/runme.m	(revision 519)
+++ /issm/trunk/test/Verification/IceShelfIceFrontM3d_2/runme.m	(revision 520)
@@ -52,5 +52,5 @@
 		[analysis_type sub_analysis_type]=testsgetanalysis(solution);
 		[md packagefinal]=testsgetpackage(md,package);
-		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package);
+		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',packagefinal);
 
 		%compute fields to be checked
Index: /issm/trunk/test/Verification/IceShelfIceFrontM3d_2/updatearchive.m
===================================================================
--- /issm/trunk/test/Verification/IceShelfIceFrontM3d_2/updatearchive.m	(revision 519)
+++ /issm/trunk/test/Verification/IceShelfIceFrontM3d_2/updatearchive.m	(revision 520)
@@ -45,5 +45,5 @@
 		[analysis_type sub_analysis_type]=testsgetanalysis(solution);
 		[md packagefinal]=testsgetpackage(md,package);
-		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package);
+		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',packagefinal);
 
 		%compute fields to be checked
Index: /issm/trunk/test/Verification/IceShelfIceFrontMP3d_3/runme.m
===================================================================
--- /issm/trunk/test/Verification/IceShelfIceFrontMP3d_3/runme.m	(revision 519)
+++ /issm/trunk/test/Verification/IceShelfIceFrontMP3d_3/runme.m	(revision 520)
@@ -52,5 +52,5 @@
 		[analysis_type sub_analysis_type]=testsgetanalysis(solution);
 		[md packagefinal]=testsgetpackage(md,package);
-		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package);
+		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',packagefinal);
 
 		%compute fields to be checked
Index: /issm/trunk/test/Verification/IceShelfIceFrontMP3d_3/updatearchive.m
===================================================================
--- /issm/trunk/test/Verification/IceShelfIceFrontMP3d_3/updatearchive.m	(revision 519)
+++ /issm/trunk/test/Verification/IceShelfIceFrontMP3d_3/updatearchive.m	(revision 520)
@@ -45,5 +45,5 @@
 		[analysis_type sub_analysis_type]=testsgetanalysis(solution);
 		[md packagefinal]=testsgetpackage(md,package);
-		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package);
+		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',packagefinal);
 
 		%compute fields to be checked
Index: /issm/trunk/test/Verification/IceShelfIceFrontMPS3d_4/runme.m
===================================================================
--- /issm/trunk/test/Verification/IceShelfIceFrontMPS3d_4/runme.m	(revision 519)
+++ /issm/trunk/test/Verification/IceShelfIceFrontMPS3d_4/runme.m	(revision 520)
@@ -50,5 +50,5 @@
 		[analysis_type sub_analysis_type]=testsgetanalysis(solution);
 		[md packagefinal]=testsgetpackage(md,package);
-		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package);
+		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',packagefinal);
 
 		%compute fields to be checked
Index: /issm/trunk/test/Verification/IceShelfIceFrontMPS3d_4/updatearchive.m
===================================================================
--- /issm/trunk/test/Verification/IceShelfIceFrontMPS3d_4/updatearchive.m	(revision 519)
+++ /issm/trunk/test/Verification/IceShelfIceFrontMPS3d_4/updatearchive.m	(revision 520)
@@ -43,5 +43,5 @@
 		[analysis_type sub_analysis_type]=testsgetanalysis(solution);
 		[md packagefinal]=testsgetpackage(md,package);
-		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package);
+		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',packagefinal);
 
 		%compute fields to be checked
Index: /issm/trunk/test/Verification/IceShelfIceFrontP3d_5/runme.m
===================================================================
--- /issm/trunk/test/Verification/IceShelfIceFrontP3d_5/runme.m	(revision 519)
+++ /issm/trunk/test/Verification/IceShelfIceFrontP3d_5/runme.m	(revision 520)
@@ -52,5 +52,5 @@
 		[analysis_type sub_analysis_type]=testsgetanalysis(solution);
 		[md packagefinal]=testsgetpackage(md,package);
-		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package);
+		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',packagefinal);
 
 		%compute fields to be checked
Index: /issm/trunk/test/Verification/IceShelfIceFrontP3d_5/updatearchive.m
===================================================================
--- /issm/trunk/test/Verification/IceShelfIceFrontP3d_5/updatearchive.m	(revision 519)
+++ /issm/trunk/test/Verification/IceShelfIceFrontP3d_5/updatearchive.m	(revision 520)
@@ -45,5 +45,5 @@
 		[analysis_type sub_analysis_type]=testsgetanalysis(solution);
 		[md packagefinal]=testsgetpackage(md,package);
-		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package);
+		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',packagefinal);
 
 		%compute fields to be checked
Index: /issm/trunk/test/Verification/IceShelfIceFrontS3d_6/runme.m
===================================================================
--- /issm/trunk/test/Verification/IceShelfIceFrontS3d_6/runme.m	(revision 519)
+++ /issm/trunk/test/Verification/IceShelfIceFrontS3d_6/runme.m	(revision 520)
@@ -50,5 +50,5 @@
 		[analysis_type sub_analysis_type]=testsgetanalysis(solution);
 		[md packagefinal]=testsgetpackage(md,package);
-		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package);
+		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',packagefinal);
 
 		%compute fields to be checked
Index: /issm/trunk/test/Verification/IceShelfIceFrontS3d_6/updatearchive.m
===================================================================
--- /issm/trunk/test/Verification/IceShelfIceFrontS3d_6/updatearchive.m	(revision 519)
+++ /issm/trunk/test/Verification/IceShelfIceFrontS3d_6/updatearchive.m	(revision 520)
@@ -43,5 +43,5 @@
 		[analysis_type sub_analysis_type]=testsgetanalysis(solution);
 		[md packagefinal]=testsgetpackage(md,package);
-		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package);
+		md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',packagefinal);
 
 		%compute fields to be checked
Index: /issm/trunk/test/Verification/PigControlMethodBM2d_21/runme.m
===================================================================
--- /issm/trunk/test/Verification/PigControlMethodBM2d_21/runme.m	(revision 519)
+++ /issm/trunk/test/Verification/PigControlMethodBM2d_21/runme.m	(revision 520)
@@ -52,13 +52,9 @@
 
 		%launch control method
-		if (strcmpi(package,'cielo_parallel') | strcmpi(package,'cielo_serial')),
-			md=solve(md,'analysis_type','control','package','cielo');
-		else
-			md=solve(md,'analysis_type','control','package',package);
-		end
+		[md packagefinal]=testsgetpackage(md,package);                        
+		md=solve(md,'analysis_type','control','package',packagefinal);
 
 		%compute fields to be checked
-fields=testsgetfields(md.type,solution);
-		fields={'cont_vel','cont_J','cont_parameter'};
+		fields=testsgetfields(md.type,'control');
 
 		%load archive
Index: /issm/trunk/test/Verification/PigControlMethodBM2d_21/updatearchive.m
===================================================================
--- /issm/trunk/test/Verification/PigControlMethodBM2d_21/updatearchive.m	(revision 519)
+++ /issm/trunk/test/Verification/PigControlMethodBM2d_21/updatearchive.m	(revision 520)
@@ -47,13 +47,9 @@
 
 		%launch control method
-		if (strcmpi(package,'cielo_parallel') | strcmpi(package,'cielo_serial')),
-			md=solve(md,'analysis_type','control','package','cielo');
-		else
-			md=solve(md,'analysis_type','control','package',package);
-		end
+		[md packagefinal]=testsgetpackage(md,package);                        
+		md=solve(md,'analysis_type','control','package',packagefinal);
 
 		%compute fields to be checked
-fields=testsgetfields(md.type,solution);
-		fields={'cont_vel','cont_J','cont_parameter'};
+		fields=testsgetfields(md.type,'control');
 
 		%save new archive
Index: /issm/trunk/test/Verification/PigControlMethodDragM2d_20/runme.m
===================================================================
--- /issm/trunk/test/Verification/PigControlMethodDragM2d_20/runme.m	(revision 519)
+++ /issm/trunk/test/Verification/PigControlMethodDragM2d_20/runme.m	(revision 520)
@@ -51,13 +51,9 @@
 
 		%launch control method
-		if (strcmpi(package,'cielo_parallel') | strcmpi(package,'cielo_serial')),
-			md=solve(md,'analysis_type','control','package','cielo');
-		else
-			md=solve(md,'analysis_type','control','package',package);
-		end
+		[md packagefinal]=testsgetpackage(md,package);
+		md=solve(md,'analysis_type','control','package',packagefinal);
 
 		%compute fields to be checked
-fields=testsgetfields(md.type,solution);
-		fields={'cont_vel','cont_J','cont_parameter'};
+		fields=testsgetfields(md.type,'control');
 
 		%load archive
Index: /issm/trunk/test/Verification/PigControlMethodDragM2d_20/updatearchive.m
===================================================================
--- /issm/trunk/test/Verification/PigControlMethodDragM2d_20/updatearchive.m	(revision 519)
+++ /issm/trunk/test/Verification/PigControlMethodDragM2d_20/updatearchive.m	(revision 520)
@@ -46,13 +46,9 @@
 
 		%launch control method
-		if (strcmpi(package,'cielo_parallel') | strcmpi(package,'cielo_serial')),
-			md=solve(md,'analysis_type','control','package','cielo');
-		else
-			md=solve(md,'analysis_type','control','package',package);
-		end
+		[md packagefinal]=testsgetpackage(md,package);                        
+		md=solve(md,'analysis_type','control','package',packagefinal);
 
 		%compute fields to be checked
-fields=testsgetfields(md.type,solution);
-		fields={'cont_vel','cont_J','cont_parameter'};
+		fields=testsgetfields(md.type,'control');
 
 		%save new archive