Index: /issm/trunk/test/Verification/IceSheetIceFrontM2d_7/runme.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetIceFrontM2d_7/runme.m	(revision 486)
+++ /issm/trunk/test/Verification/IceSheetIceFrontM2d_7/runme.m	(revision 487)
@@ -30,11 +30,4 @@
 		solution=solutions{j};
 
-		%check package
-		if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
-			error(['package: ' package  ' in test: ' testname  ' not supported yet']);
-		%check solution
-		elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'prognostic'));
-			error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
-		end
 		%check solution requested
 		if (~strcmpi(package,'ice') & strcmpi(solution,'prognostic')),
Index: /issm/trunk/test/Verification/IceSheetIceFrontM2d_7/updatearchive.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetIceFrontM2d_7/updatearchive.m	(revision 486)
+++ /issm/trunk/test/Verification/IceSheetIceFrontM2d_7/updatearchive.m	(revision 487)
@@ -23,11 +23,4 @@
 		solution=solutions{j};
 
-		%check package
-		if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
-			error(['package: ' package  ' in test: ' testname  ' not supported yet']);
-			%check solution
-		elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'prognostic'));
-			error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
-		end
 		%check solution requested
 		if (~strcmpi(package,'ice') & strcmpi(solution,'prognostic')),
Index: /issm/trunk/test/Verification/IceSheetIceFrontM3d_8/runme.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetIceFrontM3d_8/runme.m	(revision 486)
+++ /issm/trunk/test/Verification/IceSheetIceFrontM3d_8/runme.m	(revision 487)
@@ -30,14 +30,6 @@
 		solution=solutions{j};
 
-		%check package
-		if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
-			error(['package: ' package  ' in test: ' testname  ' not supported yet']);
-		%check solution
-		elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'thermalsteady') | strcmpi(solution,'thermaltransient') |...
-				strcmpi(solution,'prognostic') | strcmpi(solution,'transient'));
-			error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
-		end
 		%check solution requested
-		if (~(strcmpi(package,'ice') | (strcmpi(package,'cielo_serial') & strcmpi(solution,'diagnostic'))) | strcmpi(solution,'transient')),
+		if (~(strcmpi(package,'ice') | strcmpi(solution,'diagnostic')) | strcmpi(solution,'transient')),
 			disp(sprintf(['\nsolution: ' solution  ', with package: ' package  ', in test: ' testname  ', not supported yet.\n']));
 			continue
Index: /issm/trunk/test/Verification/IceSheetIceFrontM3d_8/updatearchive.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetIceFrontM3d_8/updatearchive.m	(revision 486)
+++ /issm/trunk/test/Verification/IceSheetIceFrontM3d_8/updatearchive.m	(revision 487)
@@ -23,14 +23,6 @@
 		solution=solutions{j};
 
-		%check package
-		if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
-			error(['package: ' package  ' in test: ' testname  ' not supported yet']);
-			%check solution
-		elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'thermalsteady') | strcmpi(solution,'thermaltransient') |...
-				strcmpi(solution,'prognostic') | strcmpi(solution,'transient'));
-			error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
-		end
 		%check solution requested
-		if (~(strcmpi(package,'ice') | (strcmpi(package,'cielo_serial') & strcmpi(solution,'diagnostic'))) | strcmpi(solution,'transient')),
+		if (~(strcmpi(package,'ice') | strcmpi(solution,'diagnostic')) | strcmpi(solution,'transient')),
 			disp(sprintf(['\nsolution: ' solution  ', with package: ' package  ', in test: ' testname  ', not supported yet.\n']));
 			continue
Index: /issm/trunk/test/Verification/IceSheetIceFrontMP3d_9/runme.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetIceFrontMP3d_9/runme.m	(revision 486)
+++ /issm/trunk/test/Verification/IceSheetIceFrontMP3d_9/runme.m	(revision 487)
@@ -30,14 +30,6 @@
 		solution=solutions{j};
 
-		%check package
-		if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
-			error(['package: ' package  ' in test: ' testname  ' not supported yet']);
-		%check solution
-		elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'thermalsteady') | strcmpi(solution,'thermaltransient') |...
-				strcmpi(solution,'prognostic') | strcmpi(solution,'transient'));
-			error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
-		end
 		%check solution requested
-		if (~(strcmpi(package,'ice') | (strcmpi(package,'cielo_serial') & strcmpi(solution,'diagnostic'))) | strcmpi(solution,'transient')),
+		if (~(strcmpi(package,'ice') | strcmpi(solution,'diagnostic')) | strcmpi(solution,'transient')),
 			disp(sprintf(['\nsolution: ' solution  ', with package: ' package  ', in test: ' testname  ', not supported yet.\n']));
 			continue
Index: /issm/trunk/test/Verification/IceSheetIceFrontMP3d_9/updatearchive.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetIceFrontMP3d_9/updatearchive.m	(revision 486)
+++ /issm/trunk/test/Verification/IceSheetIceFrontMP3d_9/updatearchive.m	(revision 487)
@@ -23,14 +23,5 @@
 		solution=solutions{j};
 
-		%check package
-		if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
-			error(['package: ' package  ' in test: ' testname  ' not supported yet']);
-			%check solution
-		elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'thermalsteady') | strcmpi(solution,'thermaltransient') |...
-				strcmpi(solution,'prognostic') | strcmpi(solution,'transient'));
-			error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
-		end
-		%check solution requested
-		if (~(strcmpi(package,'ice') | (strcmpi(package,'cielo_serial') & strcmpi(solution,'diagnostic'))) | strcmpi(solution,'transient')),
+		if (~(strcmpi(package,'ice') | strcmpi(solution,'diagnostic')) | strcmpi(solution,'transient')),
 			disp(sprintf(['\nsolution: ' solution  ', with package: ' package  ', in test: ' testname  ', not supported yet.\n']));
 			continue
Index: /issm/trunk/test/Verification/IceSheetIceFrontP3d_10/runme.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetIceFrontP3d_10/runme.m	(revision 486)
+++ /issm/trunk/test/Verification/IceSheetIceFrontP3d_10/runme.m	(revision 487)
@@ -30,14 +30,6 @@
 		solution=solutions{j};
 
-		%check package
-		if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
-			error(['package: ' package  ' in test: ' testname  ' not supported yet']);
-		%check solution
-		elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'thermalsteady') | strcmpi(solution,'thermaltransient') |...
-				strcmpi(solution,'prognostic') | strcmpi(solution,'transient'));
-			error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
-		end
 		%check solution requested
-		if (~(strcmpi(package,'ice') | (strcmpi(package,'cielo_serial') & strcmpi(solution,'diagnostic'))) | strcmpi(solution,'transient')),
+		if (~(strcmpi(package,'ice') | strcmpi(solution,'diagnostic')) | strcmpi(solution,'transient')),
 			disp(sprintf(['\nsolution: ' solution  ', with package: ' package  ', in test: ' testname  ', not supported yet.\n']));
 			continue
Index: /issm/trunk/test/Verification/IceSheetIceFrontP3d_10/updatearchive.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetIceFrontP3d_10/updatearchive.m	(revision 486)
+++ /issm/trunk/test/Verification/IceSheetIceFrontP3d_10/updatearchive.m	(revision 487)
@@ -23,14 +23,6 @@
 		solution=solutions{j};
 
-		%check package
-		if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
-			error(['package: ' package  ' in test: ' testname  ' not supported yet']);
-			%check solution
-		elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'thermalsteady') | strcmpi(solution,'thermaltransient') |...
-				strcmpi(solution,'prognostic') | strcmpi(solution,'transient'));
-			error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
-		end
 		%check solution requested
-		if (~(strcmpi(package,'ice') | (strcmpi(package,'cielo_serial') & strcmpi(solution,'diagnostic'))) | strcmpi(solution,'transient')),
+		if (~(strcmpi(package,'ice') | strcmpi(solution,'diagnostic')) | strcmpi(solution,'transient')),
 			disp(sprintf(['\nsolution: ' solution  ', with package: ' package  ', in test: ' testname  ', not supported yet.\n']));
 			continue
Index: /issm/trunk/test/Verification/IceSheetIceFrontS3d_11/runme.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetIceFrontS3d_11/runme.m	(revision 486)
+++ /issm/trunk/test/Verification/IceSheetIceFrontS3d_11/runme.m	(revision 487)
@@ -30,12 +30,4 @@
 		solution=solutions{j};
 
-		%check package
-		if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
-			error(['package: ' package  ' in test: ' testname  ' not supported yet']);
-		%check solution
-		elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'thermalsteady') | strcmpi(solution,'thermaltransient') |...
-				strcmpi(solution,'prognostic') | strcmpi(solution,'transient'));
-			error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
-		end
 		%check solution requested
 		if (~strcmpi(package,'ice') | strcmpi(solution,'transient')),
Index: /issm/trunk/test/Verification/IceSheetIceFrontS3d_11/updatearchive.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetIceFrontS3d_11/updatearchive.m	(revision 486)
+++ /issm/trunk/test/Verification/IceSheetIceFrontS3d_11/updatearchive.m	(revision 487)
@@ -23,12 +23,4 @@
 		solution=solutions{j};
 
-		%check package
-		if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
-			error(['package: ' package  ' in test: ' testname  ' not supported yet']);
-			%check solution
-		elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'thermalsteady') | strcmpi(solution,'thermaltransient') |...
-				strcmpi(solution,'prognostic') | strcmpi(solution,'transient'));
-			error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
-		end
 		%check solution requested
 		if (~strcmpi(package,'ice') | strcmpi(solution,'transient')),
Index: /issm/trunk/test/Verification/IceSheetNoIceFrontH2d_12/runme.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetNoIceFrontH2d_12/runme.m	(revision 486)
+++ /issm/trunk/test/Verification/IceSheetNoIceFrontH2d_12/runme.m	(revision 487)
@@ -30,13 +30,6 @@
 		solution=solutions{j};
 
-		%check package
-		if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
-			error(['package: ' package  ' in test: ' testname  ' not supported yet']);
-		%check solution
-		elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'prognostic'));
-			error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
-		end
 		%check solution requested
-		if (~(strcmpi(package,'ice') | (strcmpi(package,'cielo_serial') & strcmpi(solution,'diagnostic'))) ),
+		if (~(strcmpi(package,'ice') | strcmpi(solution,'diagnostic')) ),
 			disp(sprintf(['\nsolution: ' solution  ', with package: ' package  ', in test: ' testname  ', not supported yet.\n']));
 			continue
Index: /issm/trunk/test/Verification/IceSheetNoIceFrontH2d_12/updatearchive.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetNoIceFrontH2d_12/updatearchive.m	(revision 486)
+++ /issm/trunk/test/Verification/IceSheetNoIceFrontH2d_12/updatearchive.m	(revision 487)
@@ -23,13 +23,6 @@
 		solution=solutions{j};
 
-		%check package
-		if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
-			error(['package: ' package  ' in test: ' testname  ' not supported yet']);
-			%check solution
-		elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'prognostic'));
-			error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
-		end
 		%check solution requested
-		if (~(strcmpi(package,'ice') | (strcmpi(package,'cielo_serial') & strcmpi(solution,'diagnostic'))) ),
+		if (~(strcmpi(package,'ice') | strcmpi(solution,'diagnostic')) ),
 			disp(sprintf(['\nsolution: ' solution  ', with package: ' package  ', in test: ' testname  ', not supported yet.\n']));
 			continue
Index: /issm/trunk/test/Verification/IceSheetNoIceFrontH3d_13/runme.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetNoIceFrontH3d_13/runme.m	(revision 486)
+++ /issm/trunk/test/Verification/IceSheetNoIceFrontH3d_13/runme.m	(revision 487)
@@ -30,14 +30,6 @@
 		solution=solutions{j};
 
-		%check package
-		if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
-			error(['package: ' package  ' in test: ' testname  ' not supported yet']);
-		%check solution
-		elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'thermalsteady') | strcmpi(solution,'thermaltransient') |...
-				strcmpi(solution,'prognostic') | strcmpi(solution,'transient'));
-			error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
-		end
 		%check solution requested
-		if (~(strcmpi(package,'ice') | (strcmpi(package,'cielo_serial') & strcmpi(solution,'diagnostic'))) | strcmpi(solution,'transient')),
+		if (~(strcmpi(package,'ice') | strcmpi(solution,'diagnostic')) | strcmpi(solution,'transient')),
 			disp(sprintf(['\nsolution: ' solution  ', with package: ' package  ', in test: ' testname  ', not supported yet.\n']));
 			continue
Index: /issm/trunk/test/Verification/IceSheetNoIceFrontH3d_13/updatearchive.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetNoIceFrontH3d_13/updatearchive.m	(revision 486)
+++ /issm/trunk/test/Verification/IceSheetNoIceFrontH3d_13/updatearchive.m	(revision 487)
@@ -23,14 +23,6 @@
 		solution=solutions{j};
 
-		%check package
-		if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
-			error(['package: ' package  ' in test: ' testname  ' not supported yet']);
-			%check solution
-		elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'thermalsteady') | strcmpi(solution,'thermaltransient') |...
-				strcmpi(solution,'prognostic') | strcmpi(solution,'transient'));
-			error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
-		end
 		%check solution requested
-		if (~(strcmpi(package,'ice') | (strcmpi(package,'cielo_serial') & strcmpi(solution,'diagnostic'))) | strcmpi(solution,'transient')),
+		if (~(strcmpi(package,'ice') | strcmpi(solution,'diagnostic')) | strcmpi(solution,'transient')),
 			disp(sprintf(['\nsolution: ' solution  ', with package: ' package  ', in test: ' testname  ', not supported yet.\n']));
 			continue
Index: /issm/trunk/test/Verification/IceSheetNoIceFrontHM2d_14/runme.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetNoIceFrontHM2d_14/runme.m	(revision 486)
+++ /issm/trunk/test/Verification/IceSheetNoIceFrontHM2d_14/runme.m	(revision 487)
@@ -30,11 +30,4 @@
 		solution=solutions{j};
 
-		%check package
-		if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
-			error(['package: ' package  ' in test: ' testname  ' not supported yet']);
-		%check solution
-		elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'prognostic'));
-			error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
-		end
 		%check solution requested
 		if (~strcmpi(package,'ice')),
Index: /issm/trunk/test/Verification/IceSheetNoIceFrontHM2d_14/updatearchive.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetNoIceFrontHM2d_14/updatearchive.m	(revision 486)
+++ /issm/trunk/test/Verification/IceSheetNoIceFrontHM2d_14/updatearchive.m	(revision 487)
@@ -23,11 +23,4 @@
 		solution=solutions{j};
 
-		%check package
-		if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
-			error(['package: ' package  ' in test: ' testname  ' not supported yet']);
-			%check solution
-		elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'prognostic'));
-			error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
-		end
 		%check solution requested
 		if (~strcmpi(package,'ice')),
Index: /issm/trunk/test/Verification/IceSheetNoIceFrontHM3d_15/runme.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetNoIceFrontHM3d_15/runme.m	(revision 486)
+++ /issm/trunk/test/Verification/IceSheetNoIceFrontHM3d_15/runme.m	(revision 487)
@@ -30,12 +30,4 @@
 		solution=solutions{j};
 
-		%check package
-		if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
-			error(['package: ' package  ' in test: ' testname  ' not supported yet']);
-		%check solution
-		elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'thermalsteady') | strcmpi(solution,'thermaltransient') |...
-				strcmpi(solution,'prognostic') | strcmpi(solution,'transient'));
-			error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
-		end
 		%check solution requested
 		if (~strcmpi(package,'ice') | strcmpi(solution,'transient')),
Index: /issm/trunk/test/Verification/IceSheetNoIceFrontHM3d_15/updatearchive.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetNoIceFrontHM3d_15/updatearchive.m	(revision 486)
+++ /issm/trunk/test/Verification/IceSheetNoIceFrontHM3d_15/updatearchive.m	(revision 487)
@@ -23,12 +23,4 @@
 		solution=solutions{j};
 
-		%check package
-		if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
-			error(['package: ' package  ' in test: ' testname  ' not supported yet']);
-			%check solution
-		elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'thermalsteady') | strcmpi(solution,'thermaltransient') |...
-				strcmpi(solution,'prognostic') | strcmpi(solution,'transient'));
-			error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
-		end
 		%check solution requested
 		if (~strcmpi(package,'ice') | strcmpi(solution,'transient')),
Index: /issm/trunk/test/Verification/IceSheetNoIceFrontM2d_16/runme.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetNoIceFrontM2d_16/runme.m	(revision 486)
+++ /issm/trunk/test/Verification/IceSheetNoIceFrontM2d_16/runme.m	(revision 487)
@@ -30,11 +30,4 @@
 		solution=solutions{j};
 
-		%check package
-		if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
-			error(['package: ' package  ' in test: ' testname  ' not supported yet']);
-		%check solution
-		elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'prognostic'));
-			error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
-		end
 		%check solution requested
 		if (~strcmpi(package,'ice') & strcmpi(solution,'prognostic')),
Index: /issm/trunk/test/Verification/IceSheetNoIceFrontM2d_16/updatearchive.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetNoIceFrontM2d_16/updatearchive.m	(revision 486)
+++ /issm/trunk/test/Verification/IceSheetNoIceFrontM2d_16/updatearchive.m	(revision 487)
@@ -23,11 +23,4 @@
 		solution=solutions{j};
 
-		%check package
-		if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
-			error(['package: ' package  ' in test: ' testname  ' not supported yet']);
-			%check solution
-		elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'prognostic'));
-			error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
-		end
 		%check solution requested
 		if (~strcmpi(package,'ice') & strcmpi(solution,'prognostic')),
Index: /issm/trunk/test/Verification/IceSheetNoIceFrontM3d_17/runme.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetNoIceFrontM3d_17/runme.m	(revision 486)
+++ /issm/trunk/test/Verification/IceSheetNoIceFrontM3d_17/runme.m	(revision 487)
@@ -30,14 +30,6 @@
 		solution=solutions{j};
 
-		%check package
-		if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
-			error(['package: ' package  ' in test: ' testname  ' not supported yet']);
-		%check solution
-		elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'thermalsteady') | strcmpi(solution,'thermaltransient') |...
-				strcmpi(solution,'prognostic') | strcmpi(solution,'transient'));
-			error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
-		end
 		%check solution requested
-		if (~(strcmpi(package,'ice') | (strcmpi(package,'cielo_serial') & strcmpi(solution,'diagnostic'))) | strcmpi(solution,'transient')),
+		if (~(strcmpi(package,'ice') | strcmpi(solution,'diagnostic')) | strcmpi(solution,'transient')),
 			disp(sprintf(['\nsolution: ' solution  ', with package: ' package  ', in test: ' testname  ', not supported yet.\n']));
 			continue
Index: /issm/trunk/test/Verification/IceSheetNoIceFrontM3d_17/updatearchive.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetNoIceFrontM3d_17/updatearchive.m	(revision 486)
+++ /issm/trunk/test/Verification/IceSheetNoIceFrontM3d_17/updatearchive.m	(revision 487)
@@ -23,14 +23,6 @@
 		solution=solutions{j};
 
-		%check package
-		if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
-			error(['package: ' package  ' in test: ' testname  ' not supported yet']);
-			%check solution
-		elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'thermalsteady') | strcmpi(solution,'thermaltransient') |...
-				strcmpi(solution,'prognostic') | strcmpi(solution,'transient'));
-			error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
-		end
 		%check solution requested
-		if (~(strcmpi(package,'ice') | (strcmpi(package,'cielo_serial') & strcmpi(solution,'diagnostic'))) | strcmpi(solution,'transient')),
+		if (~(strcmpi(package,'ice') | strcmpi(solution,'diagnostic')) | strcmpi(solution,'transient')),
 			disp(sprintf(['\nsolution: ' solution  ', with package: ' package  ', in test: ' testname  ', not supported yet.\n']));
 			continue
Index: /issm/trunk/test/Verification/IceSheetNoIceFrontP3d_18/runme.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetNoIceFrontP3d_18/runme.m	(revision 486)
+++ /issm/trunk/test/Verification/IceSheetNoIceFrontP3d_18/runme.m	(revision 487)
@@ -30,14 +30,6 @@
 		solution=solutions{j};
 
-		%check package
-		if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
-			error(['package: ' package  ' in test: ' testname  ' not supported yet']);
-		%check solution
-		elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'thermalsteady') | strcmpi(solution,'thermaltransient') |...
-				strcmpi(solution,'prognostic') | strcmpi(solution,'transient'));
-			error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
-		end
 		%check solution requested
-		if (~(strcmpi(package,'ice') | (strcmpi(package,'cielo_serial') & strcmpi(solution,'diagnostic'))) | strcmpi(solution,'transient')),
+		if (~(strcmpi(package,'ice') | strcmpi(solution,'diagnostic')) | strcmpi(solution,'transient')),
 			disp(sprintf(['\nsolution: ' solution  ', with package: ' package  ', in test: ' testname  ', not supported yet.\n']));
 			continue
Index: /issm/trunk/test/Verification/IceSheetNoIceFrontP3d_18/updatearchive.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetNoIceFrontP3d_18/updatearchive.m	(revision 486)
+++ /issm/trunk/test/Verification/IceSheetNoIceFrontP3d_18/updatearchive.m	(revision 487)
@@ -23,14 +23,6 @@
 		solution=solutions{j};
 
-		%check package
-		if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
-			error(['package: ' package  ' in test: ' testname  ' not supported yet']);
-			%check solution
-		elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'thermalsteady') | strcmpi(solution,'thermaltransient') |...
-				strcmpi(solution,'prognostic') | strcmpi(solution,'transient'));
-			error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
-		end
 		%check solution requested
-		if (~(strcmpi(package,'ice') | (strcmpi(package,'cielo_serial') & strcmpi(solution,'diagnostic'))) | strcmpi(solution,'transient')),
+		if (~(strcmpi(package,'ice') | strcmpi(solution,'diagnostic')) | strcmpi(solution,'transient')),
 			disp(sprintf(['\nsolution: ' solution  ', with package: ' package  ', in test: ' testname  ', not supported yet.\n']));
 			continue
Index: /issm/trunk/test/Verification/IceSheetNoIceFrontS3d_19/runme.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetNoIceFrontS3d_19/runme.m	(revision 486)
+++ /issm/trunk/test/Verification/IceSheetNoIceFrontS3d_19/runme.m	(revision 487)
@@ -30,12 +30,4 @@
 		solution=solutions{j};
 
-		%check package
-		if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
-			error(['package: ' package  ' in test: ' testname  ' not supported yet']);
-		%check solution
-		elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'thermalsteady') | strcmpi(solution,'thermaltransient') |...
-				strcmpi(solution,'prognostic') | strcmpi(solution,'transient'));
-			error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
-		end
 		%check solution requested
 		if (~strcmpi(package,'ice') | strcmpi(solution,'transient')),
Index: /issm/trunk/test/Verification/IceSheetNoIceFrontS3d_19/updatearchive.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetNoIceFrontS3d_19/updatearchive.m	(revision 486)
+++ /issm/trunk/test/Verification/IceSheetNoIceFrontS3d_19/updatearchive.m	(revision 487)
@@ -23,12 +23,4 @@
 		solution=solutions{j};
 
-		%check package
-		if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
-			error(['package: ' package  ' in test: ' testname  ' not supported yet']);
-			%check solution
-		elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'thermalsteady') | strcmpi(solution,'thermaltransient') |...
-				strcmpi(solution,'prognostic') | strcmpi(solution,'transient'));
-			error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
-		end
 		%check solution requested
 		if (~strcmpi(package,'ice') | strcmpi(solution,'transient')),
Index: /issm/trunk/test/Verification/IceShelfIceFrontM2d_1/runme.m
===================================================================
--- /issm/trunk/test/Verification/IceShelfIceFrontM2d_1/runme.m	(revision 486)
+++ /issm/trunk/test/Verification/IceShelfIceFrontM2d_1/runme.m	(revision 487)
@@ -30,11 +30,4 @@
 		solution=solutions{j};
 
-		%check package
-		if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
-			error(['package: ' package  ' in test: ' testname  ' not supported yet']);
-		%check solution
-		elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'prognostic'));
-			error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
-		end
 		%check solution requested
 		if (~strcmpi(package,'ice') & strcmpi(solution,'prognostic')),
Index: /issm/trunk/test/Verification/IceShelfIceFrontM2d_1/updatearchive.m
===================================================================
--- /issm/trunk/test/Verification/IceShelfIceFrontM2d_1/updatearchive.m	(revision 486)
+++ /issm/trunk/test/Verification/IceShelfIceFrontM2d_1/updatearchive.m	(revision 487)
@@ -23,11 +23,4 @@
 		solution=solutions{j};
 
-		%check package
-		if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
-			error(['package: ' package  ' in test: ' testname  ' not supported yet']);
-			%check solution
-		elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'prognostic'));
-			error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
-		end
 		%check solution requested
 		if (~strcmpi(package,'ice') & strcmpi(solution,'prognostic')),
Index: /issm/trunk/test/Verification/IceShelfIceFrontM3d_2/runme.m
===================================================================
--- /issm/trunk/test/Verification/IceShelfIceFrontM3d_2/runme.m	(revision 486)
+++ /issm/trunk/test/Verification/IceShelfIceFrontM3d_2/runme.m	(revision 487)
@@ -30,14 +30,6 @@
 		solution=solutions{j};
 
-		%check package
-		if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
-			error(['package: ' package  ' in test: ' testname  ' not supported yet']);
-		%check solution
-		elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'thermalsteady') | strcmpi(solution,'thermaltransient') |...
-				strcmpi(solution,'prognostic') | strcmpi(solution,'transient'));
-			error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
-		end
 		%check solution requested
-		if (~(strcmpi(package,'ice') | (strcmpi(package,'cielo_serial') & strcmpi(solution,'diagnostic'))) | strcmpi(solution,'transient')),
+		if (~(strcmpi(package,'ice') | strcmpi(solution,'diagnostic')) | strcmpi(solution,'transient')),
 			disp(sprintf(['\nsolution: ' solution  ', with package: ' package  ', in test: ' testname  ', not supported yet.\n']));
 			continue
Index: /issm/trunk/test/Verification/IceShelfIceFrontM3d_2/updatearchive.m
===================================================================
--- /issm/trunk/test/Verification/IceShelfIceFrontM3d_2/updatearchive.m	(revision 486)
+++ /issm/trunk/test/Verification/IceShelfIceFrontM3d_2/updatearchive.m	(revision 487)
@@ -23,12 +23,4 @@
 		solution=solutions{j};
 
-		%check package
-		if ~(strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
-			error(['package: ' package  ' in test: ' testname  ' not supported yet']);
-			%check solution
-		elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'thermalsteady') | strcmpi(solution,'thermaltransient') |...
-				strcmpi(solution,'prognostic') | strcmpi(solution,'transient'));
-			error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
-		end
 		%check solution requested
 		if (~(strcmpi(package,'ice') | strcmpi(solution,'diagnostic')) | strcmpi(solution,'transient')),
Index: /issm/trunk/test/Verification/IceShelfIceFrontMP3d_3/runme.m
===================================================================
--- /issm/trunk/test/Verification/IceShelfIceFrontMP3d_3/runme.m	(revision 486)
+++ /issm/trunk/test/Verification/IceShelfIceFrontMP3d_3/runme.m	(revision 487)
@@ -30,14 +30,6 @@
 		solution=solutions{j};
 
-		%check package
-		if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
-			error(['package: ' package  ' in test: ' testname  ' not supported yet']);
-		%check solution
-		elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'thermalsteady') | strcmpi(solution,'thermaltransient') |...
-				strcmpi(solution,'prognostic') | strcmpi(solution,'transient'));
-			error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
-		end
 		%check solution requested
-		if (~(strcmpi(package,'ice') | (strcmpi(package,'cielo_serial') & strcmpi(solution,'diagnostic'))) | strcmpi(solution,'transient')),
+		if (~(strcmpi(package,'ice') | strcmpi(solution,'diagnostic')) | strcmpi(solution,'transient')),
 			disp(sprintf(['\nsolution: ' solution  ', with package: ' package  ', in test: ' testname  ', not supported yet.\n']));
 			continue
Index: /issm/trunk/test/Verification/IceShelfIceFrontMP3d_3/updatearchive.m
===================================================================
--- /issm/trunk/test/Verification/IceShelfIceFrontMP3d_3/updatearchive.m	(revision 486)
+++ /issm/trunk/test/Verification/IceShelfIceFrontMP3d_3/updatearchive.m	(revision 487)
@@ -23,14 +23,6 @@
 		solution=solutions{j};
 
-		%check package
-		if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
-			error(['package: ' package  ' in test: ' testname  ' not supported yet']);
-			%check solution
-		elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'thermalsteady') | strcmpi(solution,'thermaltransient') |...
-				strcmpi(solution,'prognostic') | strcmpi(solution,'transient'));
-			error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
-		end
 		%check solution requested
-		if (~(strcmpi(package,'ice') | (strcmpi(package,'cielo_serial') & strcmpi(solution,'diagnostic'))) | strcmpi(solution,'transient')),
+		if (~(strcmpi(package,'ice') | strcmpi(solution,'diagnostic')) | strcmpi(solution,'transient')),
 			disp(sprintf(['\nsolution: ' solution  ', with package: ' package  ', in test: ' testname  ', not supported yet.\n']));
 			continue
Index: /issm/trunk/test/Verification/IceShelfIceFrontMPS3d_4/runme.m
===================================================================
--- /issm/trunk/test/Verification/IceShelfIceFrontMPS3d_4/runme.m	(revision 486)
+++ /issm/trunk/test/Verification/IceShelfIceFrontMPS3d_4/runme.m	(revision 487)
@@ -30,12 +30,4 @@
 		solution=solutions{j};
 
-		%check package
-		if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
-			error(['package: ' package  ' in test: ' testname  ' not supported yet']);
-		%check solution
-		elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'thermalsteady') | strcmpi(solution,'thermaltransient') |...
-				strcmpi(solution,'prognostic') | strcmpi(solution,'transient'));
-			error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
-		end
 		%check solution requested
 		if (~strcmpi(package,'ice') | strcmpi(solution,'transient')),
Index: /issm/trunk/test/Verification/IceShelfIceFrontMPS3d_4/updatearchive.m
===================================================================
--- /issm/trunk/test/Verification/IceShelfIceFrontMPS3d_4/updatearchive.m	(revision 486)
+++ /issm/trunk/test/Verification/IceShelfIceFrontMPS3d_4/updatearchive.m	(revision 487)
@@ -23,12 +23,4 @@
 		solution=solutions{j};
 
-		%check package
-		if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
-			error(['package: ' package  ' in test: ' testname  ' not supported yet']);
-			%check solution
-		elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'thermalsteady') | strcmpi(solution,'thermaltransient') |...
-				strcmpi(solution,'prognostic') | strcmpi(solution,'transient'));
-			error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
-		end
 		%check solution requested
 		if (~strcmpi(package,'ice') | strcmpi(solution,'transient')),
Index: /issm/trunk/test/Verification/IceShelfIceFrontP3d_5/runme.m
===================================================================
--- /issm/trunk/test/Verification/IceShelfIceFrontP3d_5/runme.m	(revision 486)
+++ /issm/trunk/test/Verification/IceShelfIceFrontP3d_5/runme.m	(revision 487)
@@ -30,14 +30,6 @@
 		solution=solutions{j};
 
-		%check package
-		if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
-			error(['package: ' package  ' in test: ' testname  ' not supported yet']);
-		%check solution
-		elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'thermalsteady') | strcmpi(solution,'thermaltransient') |...
-				strcmpi(solution,'prognostic') | strcmpi(solution,'transient'));
-			error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
-		end
 		%check solution requested
-		if (~(strcmpi(package,'ice') | (strcmpi(package,'cielo_serial') & strcmpi(solution,'diagnostic'))) | strcmpi(solution,'transient')),
+		if (~(strcmpi(package,'ice') | strcmpi(solution,'diagnostic')) | strcmpi(solution,'transient')),
 			disp(sprintf(['\nsolution: ' solution  ', with package: ' package  ', in test: ' testname  ', not supported yet.\n']));
 			continue
Index: /issm/trunk/test/Verification/IceShelfIceFrontP3d_5/updatearchive.m
===================================================================
--- /issm/trunk/test/Verification/IceShelfIceFrontP3d_5/updatearchive.m	(revision 486)
+++ /issm/trunk/test/Verification/IceShelfIceFrontP3d_5/updatearchive.m	(revision 487)
@@ -23,14 +23,6 @@
 		solution=solutions{j};
 
-		%check package
-		if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
-			error(['package: ' package  ' in test: ' testname  ' not supported yet']);
-			%check solution
-		elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'thermalsteady') | strcmpi(solution,'thermaltransient') |...
-				strcmpi(solution,'prognostic') | strcmpi(solution,'transient'));
-			error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
-		end
 		%check solution requested
-		if (~(strcmpi(package,'ice') | (strcmpi(package,'cielo_serial') & strcmpi(solution,'diagnostic'))) | strcmpi(solution,'transient')),
+		if (~(strcmpi(package,'ice') | strcmpi(solution,'diagnostic')) | strcmpi(solution,'transient')),
 			disp(sprintf(['\nsolution: ' solution  ', with package: ' package  ', in test: ' testname  ', not supported yet.\n']));
 			continue
Index: /issm/trunk/test/Verification/IceShelfIceFrontS3d_6/runme.m
===================================================================
--- /issm/trunk/test/Verification/IceShelfIceFrontS3d_6/runme.m	(revision 486)
+++ /issm/trunk/test/Verification/IceShelfIceFrontS3d_6/runme.m	(revision 487)
@@ -30,12 +30,4 @@
 		solution=solutions{j};
 
-		%check package
-		if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
-			error(['package: ' package  ' in test: ' testname  ' not supported yet']);
-		%check solution
-		elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'thermalsteady') | strcmpi(solution,'thermaltransient') |...
-				strcmpi(solution,'prognostic') | strcmpi(solution,'transient'));
-			error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
-		end
 		%check solution requested
 		if (~strcmpi(package,'ice') | strcmpi(solution,'transient')),
Index: /issm/trunk/test/Verification/IceShelfIceFrontS3d_6/updatearchive.m
===================================================================
--- /issm/trunk/test/Verification/IceShelfIceFrontS3d_6/updatearchive.m	(revision 486)
+++ /issm/trunk/test/Verification/IceShelfIceFrontS3d_6/updatearchive.m	(revision 487)
@@ -23,12 +23,4 @@
 		solution=solutions{j};
 
-		%check package
-		if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
-			error(['package: ' package  ' in test: ' testname  ' not supported yet']);
-			%check solution
-		elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'thermalsteady') | strcmpi(solution,'thermaltransient') |...
-				strcmpi(solution,'prognostic') | strcmpi(solution,'transient'));
-			error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
-		end
 		%check solution requested
 		if (~strcmpi(package,'ice') | strcmpi(solution,'transient')),
Index: /issm/trunk/test/Verification/PigControlMethodBM2d_21/runme.m
===================================================================
--- /issm/trunk/test/Verification/PigControlMethodBM2d_21/runme.m	(revision 486)
+++ /issm/trunk/test/Verification/PigControlMethodBM2d_21/runme.m	(revision 487)
@@ -30,11 +30,4 @@
 		misfit=misfits{j};
 
-		%check package
-		if ~(strcmpi(package,'macayeal') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
-			error(['package: ' package  ' in test: ' testname  ' not supported yet']);
-			%check solution
-		elseif ~(strcmpi(misfit,'absolute') | strcmpi(misfit,'relative') | strcmpi(misfit,'logarithmic')),
-			error(['misfit: ' misfit  ' in test: ' testname  ' not supported yet']);
-		end
 		%check solution requested
 		if strcmpi(package,'macayeal') & ~strcmpi(misfit,'absolute')
Index: /issm/trunk/test/Verification/PigControlMethodBM2d_21/updatearchive.m
===================================================================
--- /issm/trunk/test/Verification/PigControlMethodBM2d_21/updatearchive.m	(revision 486)
+++ /issm/trunk/test/Verification/PigControlMethodBM2d_21/updatearchive.m	(revision 487)
@@ -25,11 +25,4 @@
 		misfit=misfits{j};
 
-		%check package
-		if ~(strcmpi(package,'macayeal') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
-			error(['package: ' package  ' in test: ' testname  ' not supported yet']);
-			%check solution
-		elseif ~(strcmpi(misfit,'absolute') | strcmpi(misfit,'relative') | strcmpi(misfit,'logarithmic')),
-			error(['misfit: ' misfit  ' in test: ' testname  ' not supported yet']);
-		end
 		%check solution requested
 		if strcmpi(package,'macayeal') & ~strcmpi(misfit,'absolute')
Index: /issm/trunk/test/Verification/PigControlMethodDragM2d_20/runme.m
===================================================================
--- /issm/trunk/test/Verification/PigControlMethodDragM2d_20/runme.m	(revision 486)
+++ /issm/trunk/test/Verification/PigControlMethodDragM2d_20/runme.m	(revision 487)
@@ -32,8 +32,6 @@
 		%check package
 		if ~(strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
-			error(['package: ' package  ' in test: ' testname  ' not supported yet']);
-			%check solution
-		elseif ~(strcmpi(misfit,'absolute') | strcmpi(misfit,'relative') | strcmpi(misfit,'logarithmic')),
-			error(['misfit: ' misfit  ' in test: ' testname  ' not supported yet']);
+			disp(['package: ' package  ' in test: ' testname  ' not supported yet']);
+			continue
 		end
 
Index: /issm/trunk/test/Verification/PigControlMethodDragM2d_20/updatearchive.m
===================================================================
--- /issm/trunk/test/Verification/PigControlMethodDragM2d_20/updatearchive.m	(revision 486)
+++ /issm/trunk/test/Verification/PigControlMethodDragM2d_20/updatearchive.m	(revision 487)
@@ -27,8 +27,6 @@
 		%check package
 		if ~(strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
-			error(['package: ' package  ' in test: ' testname  ' not supported yet']);
-			%check solution
-		elseif ~(strcmpi(misfit,'absolute') | strcmpi(misfit,'relative') | strcmpi(misfit,'logarithmic')),
-			error(['misfit: ' misfit  ' in test: ' testname  ' not supported yet']);
+			disp(['package: ' package  ' in test: ' testname  ' not supported yet']);
+			continue
 		end