Index: /issm/trunk/test/Verification/IceSheetIceFrontM2d_7/runme.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetIceFrontM2d_7/runme.m	(revision 450)
+++ /issm/trunk/test/Verification/IceSheetIceFrontM2d_7/runme.m	(revision 451)
@@ -50,10 +50,8 @@
 
 		%compute solution
-		if strcmpi(package,'cielo_parallel') & strcmpi(solution,'diagnostic'),
-			md=solve(md,'diagnostic_horiz','cielo');
-		elseif strcmpi(package,'cielo_serial'),
-			eval(['md=solve(md,''' solution ''',''cielo'');']);
+		if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')),
+			md=solve(md,solution,'cielo');
 		else
-			eval(['md=solve(md,''' solution ''',''' package ''');']);
+			md=solve(md,solution,package);
 		end
 
Index: /issm/trunk/test/Verification/IceSheetIceFrontM2d_7/updatearchive.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetIceFrontM2d_7/updatearchive.m	(revision 450)
+++ /issm/trunk/test/Verification/IceSheetIceFrontM2d_7/updatearchive.m	(revision 451)
@@ -43,10 +43,8 @@
 
 		%compute solution
-		if strcmpi(package,'cielo_parallel') & strcmpi(solution,'diagnostic'),
-			md=solve(md,'diagnostic_horiz','cielo');
-		elseif strcmpi(package,'cielo_serial'),
-			eval(['md=solve(md,''' solution ''',''cielo'');']);
+		if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')),
+			md=solve(md,solution,'cielo');
 		else
-			eval(['md=solve(md,''' solution ''',''' package ''');']);
+			md=solve(md,solution,package);
 		end
 
Index: /issm/trunk/test/Verification/IceSheetIceFrontM3d_8/runme.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetIceFrontM3d_8/runme.m	(revision 450)
+++ /issm/trunk/test/Verification/IceSheetIceFrontM3d_8/runme.m	(revision 451)
@@ -52,10 +52,8 @@
 
 		%compute solution
-		if strcmpi(package,'cielo_parallel') & strcmpi(solution,'diagnostic'),
-			md=solve(md,'diagnostic_horiz','cielo');
-		elseif strcmpi(package,'cielo_serial'),
-			eval(['md=solve(md,''' solution ''',''cielo'');']);
+		if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')),
+			md=solve(md,solution,'cielo');
 		else
-			eval(['md=solve(md,''' solution ''',''' package ''');']);
+			md=solve(md,solution,package);
 		end
 
Index: /issm/trunk/test/Verification/IceSheetIceFrontM3d_8/updatearchive.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetIceFrontM3d_8/updatearchive.m	(revision 450)
+++ /issm/trunk/test/Verification/IceSheetIceFrontM3d_8/updatearchive.m	(revision 451)
@@ -45,10 +45,8 @@
 
 		%compute solution
-		if strcmpi(package,'cielo_parallel') & strcmpi(solution,'diagnostic'),
-			md=solve(md,'diagnostic_horiz','cielo');
-		elseif strcmpi(package,'cielo_serial'),
-			eval(['md=solve(md,''' solution ''',''cielo'');']);
+		if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')),
+			md=solve(md,solution,'cielo');
 		else
-			eval(['md=solve(md,''' solution ''',''' package ''');']);
+			md=solve(md,solution,package);
 		end
 
Index: /issm/trunk/test/Verification/IceSheetIceFrontMP3d_9/runme.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetIceFrontMP3d_9/runme.m	(revision 450)
+++ /issm/trunk/test/Verification/IceSheetIceFrontMP3d_9/runme.m	(revision 451)
@@ -52,10 +52,8 @@
 
 		%compute solution
-		if strcmpi(package,'cielo_parallel') & strcmpi(solution,'diagnostic'),
-			md=solve(md,'diagnostic_horiz','cielo');
-		elseif strcmpi(package,'cielo_serial'),
-			eval(['md=solve(md,''' solution ''',''cielo'');']);
+		if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')),
+			md=solve(md,solution,'cielo');
 		else
-			eval(['md=solve(md,''' solution ''',''' package ''');']);
+			md=solve(md,solution,package);
 		end
 
Index: /issm/trunk/test/Verification/IceSheetIceFrontMP3d_9/updatearchive.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetIceFrontMP3d_9/updatearchive.m	(revision 450)
+++ /issm/trunk/test/Verification/IceSheetIceFrontMP3d_9/updatearchive.m	(revision 451)
@@ -45,10 +45,8 @@
 
 		%compute solution
-		if strcmpi(package,'cielo_parallel') & strcmpi(solution,'diagnostic'),
-			md=solve(md,'diagnostic_horiz','cielo');
-		elseif strcmpi(package,'cielo_serial'),
-			eval(['md=solve(md,''' solution ''',''cielo'');']);
+		if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')),
+			md=solve(md,solution,'cielo');
 		else
-			eval(['md=solve(md,''' solution ''',''' package ''');']);
+			md=solve(md,solution,package);
 		end
 
Index: /issm/trunk/test/Verification/IceSheetIceFrontP3d_10/runme.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetIceFrontP3d_10/runme.m	(revision 450)
+++ /issm/trunk/test/Verification/IceSheetIceFrontP3d_10/runme.m	(revision 451)
@@ -52,10 +52,8 @@
 
 		%compute solution
-		if strcmpi(package,'cielo_parallel') & strcmpi(solution,'diagnostic'),
-			md=solve(md,'diagnostic_horiz','cielo');
-		elseif strcmpi(package,'cielo_serial'),
-			eval(['md=solve(md,''' solution ''',''cielo'');']);
+		if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')),
+			md=solve(md,solution,'cielo');
 		else
-			eval(['md=solve(md,''' solution ''',''' package ''');']);
+			md=solve(md,solution,package);
 		end
 
Index: /issm/trunk/test/Verification/IceSheetIceFrontP3d_10/updatearchive.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetIceFrontP3d_10/updatearchive.m	(revision 450)
+++ /issm/trunk/test/Verification/IceSheetIceFrontP3d_10/updatearchive.m	(revision 451)
@@ -45,10 +45,8 @@
 
 		%compute solution
-		if strcmpi(package,'cielo_parallel') & strcmpi(solution,'diagnostic'),
-			md=solve(md,'diagnostic_horiz','cielo');
-		elseif strcmpi(package,'cielo_serial'),
-			eval(['md=solve(md,''' solution ''',''cielo'');']);
+		if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')),
+			md=solve(md,solution,'cielo');
 		else
-			eval(['md=solve(md,''' solution ''',''' package ''');']);
+			md=solve(md,solution,package);
 		end
 
Index: /issm/trunk/test/Verification/IceSheetIceFrontS3d_11/runme.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetIceFrontS3d_11/runme.m	(revision 450)
+++ /issm/trunk/test/Verification/IceSheetIceFrontS3d_11/runme.m	(revision 451)
@@ -52,10 +52,8 @@
 
 		%compute solution
-		if strcmpi(package,'cielo_parallel') & strcmpi(solution,'diagnostic'),
-			md=solve(md,'diagnostic_horiz','cielo');
-		elseif strcmpi(package,'cielo_serial'),
-			eval(['md=solve(md,''' solution ''',''cielo'');']);
+		if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')),
+			md=solve(md,solution,'cielo');
 		else
-			eval(['md=solve(md,''' solution ''',''' package ''');']);
+			md=solve(md,solution,package);
 		end
 
Index: /issm/trunk/test/Verification/IceSheetIceFrontS3d_11/updatearchive.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetIceFrontS3d_11/updatearchive.m	(revision 450)
+++ /issm/trunk/test/Verification/IceSheetIceFrontS3d_11/updatearchive.m	(revision 451)
@@ -45,10 +45,8 @@
 
 		%compute solution
-		if strcmpi(package,'cielo_parallel') & strcmpi(solution,'diagnostic'),
-			md=solve(md,'diagnostic_horiz','cielo');
-		elseif strcmpi(package,'cielo_serial'),
-			eval(['md=solve(md,''' solution ''',''cielo'');']);
+		if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')),
+			md=solve(md,solution,'cielo');
 		else
-			eval(['md=solve(md,''' solution ''',''' package ''');']);
+			md=solve(md,solution,package);
 		end
 
Index: /issm/trunk/test/Verification/IceSheetNoIceFrontH2d_12/runme.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetNoIceFrontH2d_12/runme.m	(revision 450)
+++ /issm/trunk/test/Verification/IceSheetNoIceFrontH2d_12/runme.m	(revision 451)
@@ -50,10 +50,8 @@
 
 		%compute solution
-		if strcmpi(package,'cielo_parallel') & strcmpi(solution,'diagnostic'),
-			md=solve(md,'diagnostic_horiz','cielo');
-		elseif strcmpi(package,'cielo_serial'),
-			eval(['md=solve(md,''' solution ''',''cielo'');']);
+		if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')),
+			md=solve(md,solution,'cielo');
 		else
-			eval(['md=solve(md,''' solution ''',''' package ''');']);
+			md=solve(md,solution,package);
 		end
 
Index: /issm/trunk/test/Verification/IceSheetNoIceFrontH2d_12/updatearchive.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetNoIceFrontH2d_12/updatearchive.m	(revision 450)
+++ /issm/trunk/test/Verification/IceSheetNoIceFrontH2d_12/updatearchive.m	(revision 451)
@@ -43,10 +43,8 @@
 
 		%compute solution
-		if strcmpi(package,'cielo_parallel') & strcmpi(solution,'diagnostic'),
-			md=solve(md,'diagnostic_horiz','cielo');
-		elseif strcmpi(package,'cielo_serial'),
-			eval(['md=solve(md,''' solution ''',''cielo'');']);
+		if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')),
+			md=solve(md,solution,'cielo');
 		else
-			eval(['md=solve(md,''' solution ''',''' package ''');']);
+			md=solve(md,solution,package);
 		end
 
Index: /issm/trunk/test/Verification/IceSheetNoIceFrontH3d_13/runme.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetNoIceFrontH3d_13/runme.m	(revision 450)
+++ /issm/trunk/test/Verification/IceSheetNoIceFrontH3d_13/runme.m	(revision 451)
@@ -52,10 +52,8 @@
 
 		%compute solution
-		if strcmpi(package,'cielo_parallel') & strcmpi(solution,'diagnostic'),
-			md=solve(md,'diagnostic_horiz','cielo');
-		elseif strcmpi(package,'cielo_serial'),
-			eval(['md=solve(md,''' solution ''',''cielo'');']);
+		if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')),
+			md=solve(md,solution,'cielo');
 		else
-			eval(['md=solve(md,''' solution ''',''' package ''');']);
+			md=solve(md,solution,package);
 		end
 
Index: /issm/trunk/test/Verification/IceSheetNoIceFrontH3d_13/updatearchive.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetNoIceFrontH3d_13/updatearchive.m	(revision 450)
+++ /issm/trunk/test/Verification/IceSheetNoIceFrontH3d_13/updatearchive.m	(revision 451)
@@ -45,10 +45,8 @@
 
 		%compute solution
-		if strcmpi(package,'cielo_parallel') & strcmpi(solution,'diagnostic'),
-			md=solve(md,'diagnostic_horiz','cielo');
-		elseif strcmpi(package,'cielo_serial'),
-			eval(['md=solve(md,''' solution ''',''cielo'');']);
+		if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')),
+			md=solve(md,solution,'cielo');
 		else
-			eval(['md=solve(md,''' solution ''',''' package ''');']);
+			md=solve(md,solution,package);
 		end
 
Index: /issm/trunk/test/Verification/IceSheetNoIceFrontHM2d_14/runme.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetNoIceFrontHM2d_14/runme.m	(revision 450)
+++ /issm/trunk/test/Verification/IceSheetNoIceFrontHM2d_14/runme.m	(revision 451)
@@ -50,10 +50,8 @@
 
 		%compute solution
-		if strcmpi(package,'cielo_parallel') & strcmpi(solution,'diagnostic'),
-			md=solve(md,'diagnostic_horiz','cielo');
-		elseif strcmpi(package,'cielo_serial'),
-			eval(['md=solve(md,''' solution ''',''cielo'');']);
+		if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')),
+			md=solve(md,solution,'cielo');
 		else
-			eval(['md=solve(md,''' solution ''',''' package ''');']);
+			md=solve(md,solution,package);
 		end
 
Index: /issm/trunk/test/Verification/IceSheetNoIceFrontHM2d_14/updatearchive.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetNoIceFrontHM2d_14/updatearchive.m	(revision 450)
+++ /issm/trunk/test/Verification/IceSheetNoIceFrontHM2d_14/updatearchive.m	(revision 451)
@@ -43,10 +43,8 @@
 
 		%compute solution
-		if strcmpi(package,'cielo_parallel') & strcmpi(solution,'diagnostic'),
-			md=solve(md,'diagnostic_horiz','cielo');
-		elseif strcmpi(package,'cielo_serial'),
-			eval(['md=solve(md,''' solution ''',''cielo'');']);
+		if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')),
+			md=solve(md,solution,'cielo');
 		else
-			eval(['md=solve(md,''' solution ''',''' package ''');']);
+			md=solve(md,solution,package);
 		end
 
Index: /issm/trunk/test/Verification/IceSheetNoIceFrontHM3d_15/runme.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetNoIceFrontHM3d_15/runme.m	(revision 450)
+++ /issm/trunk/test/Verification/IceSheetNoIceFrontHM3d_15/runme.m	(revision 451)
@@ -52,10 +52,8 @@
 
 		%compute solution
-		if strcmpi(package,'cielo_parallel') & strcmpi(solution,'diagnostic'),
-			md=solve(md,'diagnostic_horiz','cielo');
-		elseif strcmpi(package,'cielo_serial'),
-			eval(['md=solve(md,''' solution ''',''cielo'');']);
+		if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')),
+			md=solve(md,solution,'cielo');
 		else
-			eval(['md=solve(md,''' solution ''',''' package ''');']);
+			md=solve(md,solution,package);
 		end
 
Index: /issm/trunk/test/Verification/IceSheetNoIceFrontHM3d_15/updatearchive.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetNoIceFrontHM3d_15/updatearchive.m	(revision 450)
+++ /issm/trunk/test/Verification/IceSheetNoIceFrontHM3d_15/updatearchive.m	(revision 451)
@@ -45,10 +45,8 @@
 
 		%compute solution
-		if strcmpi(package,'cielo_parallel') & strcmpi(solution,'diagnostic'),
-			md=solve(md,'diagnostic_horiz','cielo');
-		elseif strcmpi(package,'cielo_serial'),
-			eval(['md=solve(md,''' solution ''',''cielo'');']);
+		if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')),
+			md=solve(md,solution,'cielo');
 		else
-			eval(['md=solve(md,''' solution ''',''' package ''');']);
+			md=solve(md,solution,package);
 		end
 
Index: /issm/trunk/test/Verification/IceSheetNoIceFrontM2d_16/runme.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetNoIceFrontM2d_16/runme.m	(revision 450)
+++ /issm/trunk/test/Verification/IceSheetNoIceFrontM2d_16/runme.m	(revision 451)
@@ -50,10 +50,8 @@
 
 		%compute solution
-		if strcmpi(package,'cielo_parallel') & strcmpi(solution,'diagnostic'),
-			md=solve(md,'diagnostic_horiz','cielo');
-		elseif strcmpi(package,'cielo_serial'),
-			eval(['md=solve(md,''' solution ''',''cielo'');']);
+		if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')),
+			md=solve(md,solution,'cielo');
 		else
-			eval(['md=solve(md,''' solution ''',''' package ''');']);
+			md=solve(md,solution,package);
 		end
 
Index: /issm/trunk/test/Verification/IceSheetNoIceFrontM2d_16/updatearchive.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetNoIceFrontM2d_16/updatearchive.m	(revision 450)
+++ /issm/trunk/test/Verification/IceSheetNoIceFrontM2d_16/updatearchive.m	(revision 451)
@@ -43,10 +43,8 @@
 
 		%compute solution
-		if strcmpi(package,'cielo_parallel') & strcmpi(solution,'diagnostic'),
-			md=solve(md,'diagnostic_horiz','cielo');
-		elseif strcmpi(package,'cielo_serial'),
-			eval(['md=solve(md,''' solution ''',''cielo'');']);
+		if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')),
+			md=solve(md,solution,'cielo');
 		else
-			eval(['md=solve(md,''' solution ''',''' package ''');']);
+			md=solve(md,solution,package);
 		end
 
Index: /issm/trunk/test/Verification/IceSheetNoIceFrontM3d_17/runme.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetNoIceFrontM3d_17/runme.m	(revision 450)
+++ /issm/trunk/test/Verification/IceSheetNoIceFrontM3d_17/runme.m	(revision 451)
@@ -52,10 +52,8 @@
 
 		%compute solution
-		if strcmpi(package,'cielo_parallel') & strcmpi(solution,'diagnostic'),
-			md=solve(md,'diagnostic_horiz','cielo');
-		elseif strcmpi(package,'cielo_serial'),
-			eval(['md=solve(md,''' solution ''',''cielo'');']);
+		if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')),
+			md=solve(md,solution,'cielo');
 		else
-			eval(['md=solve(md,''' solution ''',''' package ''');']);
+			md=solve(md,solution,package);
 		end
 
Index: /issm/trunk/test/Verification/IceSheetNoIceFrontM3d_17/updatearchive.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetNoIceFrontM3d_17/updatearchive.m	(revision 450)
+++ /issm/trunk/test/Verification/IceSheetNoIceFrontM3d_17/updatearchive.m	(revision 451)
@@ -45,10 +45,8 @@
 
 		%compute solution
-		if strcmpi(package,'cielo_parallel') & strcmpi(solution,'diagnostic'),
-			md=solve(md,'diagnostic_horiz','cielo');
-		elseif strcmpi(package,'cielo_serial'),
-			eval(['md=solve(md,''' solution ''',''cielo'');']);
+		if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')),
+			md=solve(md,solution,'cielo');
 		else
-			eval(['md=solve(md,''' solution ''',''' package ''');']);
+			md=solve(md,solution,package);
 		end
 
Index: /issm/trunk/test/Verification/IceSheetNoIceFrontP3d_18/runme.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetNoIceFrontP3d_18/runme.m	(revision 450)
+++ /issm/trunk/test/Verification/IceSheetNoIceFrontP3d_18/runme.m	(revision 451)
@@ -52,10 +52,8 @@
 
 		%compute solution
-		if strcmpi(package,'cielo_parallel') & strcmpi(solution,'diagnostic'),
-			md=solve(md,'diagnostic_horiz','cielo');
-		elseif strcmpi(package,'cielo_serial'),
-			eval(['md=solve(md,''' solution ''',''cielo'');']);
+		if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')),
+			md=solve(md,solution,'cielo');
 		else
-			eval(['md=solve(md,''' solution ''',''' package ''');']);
+			md=solve(md,solution,package);
 		end
 
Index: /issm/trunk/test/Verification/IceSheetNoIceFrontP3d_18/updatearchive.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetNoIceFrontP3d_18/updatearchive.m	(revision 450)
+++ /issm/trunk/test/Verification/IceSheetNoIceFrontP3d_18/updatearchive.m	(revision 451)
@@ -45,10 +45,8 @@
 
 		%compute solution
-		if strcmpi(package,'cielo_parallel') & strcmpi(solution,'diagnostic'),
-			md=solve(md,'diagnostic_horiz','cielo');
-		elseif strcmpi(package,'cielo_serial'),
-			eval(['md=solve(md,''' solution ''',''cielo'');']);
+		if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')),
+			md=solve(md,solution,'cielo');
 		else
-			eval(['md=solve(md,''' solution ''',''' package ''');']);
+			md=solve(md,solution,package);
 		end
 
Index: /issm/trunk/test/Verification/IceSheetNoIceFrontS3d_19/runme.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetNoIceFrontS3d_19/runme.m	(revision 450)
+++ /issm/trunk/test/Verification/IceSheetNoIceFrontS3d_19/runme.m	(revision 451)
@@ -52,10 +52,8 @@
 
 		%compute solution
-		if strcmpi(package,'cielo_parallel') & strcmpi(solution,'diagnostic'),
-			md=solve(md,'diagnostic_horiz','cielo');
-		elseif strcmpi(package,'cielo_serial'),
-			eval(['md=solve(md,''' solution ''',''cielo'');']);
+		if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')),
+			md=solve(md,solution,'cielo');
 		else
-			eval(['md=solve(md,''' solution ''',''' package ''');']);
+			md=solve(md,solution,package);
 		end
 
Index: /issm/trunk/test/Verification/IceSheetNoIceFrontS3d_19/updatearchive.m
===================================================================
--- /issm/trunk/test/Verification/IceSheetNoIceFrontS3d_19/updatearchive.m	(revision 450)
+++ /issm/trunk/test/Verification/IceSheetNoIceFrontS3d_19/updatearchive.m	(revision 451)
@@ -45,10 +45,8 @@
 
 		%compute solution
-		if strcmpi(package,'cielo_parallel') & strcmpi(solution,'diagnostic'),
-			md=solve(md,'diagnostic_horiz','cielo');
-		elseif strcmpi(package,'cielo_serial'),
-			eval(['md=solve(md,''' solution ''',''cielo'');']);
+		if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')),
+			md=solve(md,solution,'cielo');
 		else
-			eval(['md=solve(md,''' solution ''',''' package ''');']);
+			md=solve(md,solution,package);
 		end
 
Index: /issm/trunk/test/Verification/IceShelfIceFrontM3d_2/runme.m
===================================================================
--- /issm/trunk/test/Verification/IceShelfIceFrontM3d_2/runme.m	(revision 450)
+++ /issm/trunk/test/Verification/IceShelfIceFrontM3d_2/runme.m	(revision 451)
@@ -52,10 +52,8 @@
 
 		%compute solution
-		if strcmpi(package,'cielo_parallel') & strcmpi(solution,'diagnostic'),
-			md=solve(md,'diagnostic_horiz','cielo');
-		elseif strcmpi(package,'cielo_serial'),
-			eval(['md=solve(md,''' solution ''',''cielo'');']);
+		if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')),
+			md=solve(md,solution,'cielo');
 		else
-			eval(['md=solve(md,''' solution ''',''' package ''');']);
+			md=solve(md,solution,package);
 		end
 
Index: /issm/trunk/test/Verification/IceShelfIceFrontM3d_2/updatearchive.m
===================================================================
--- /issm/trunk/test/Verification/IceShelfIceFrontM3d_2/updatearchive.m	(revision 450)
+++ /issm/trunk/test/Verification/IceShelfIceFrontM3d_2/updatearchive.m	(revision 451)
@@ -7,5 +7,6 @@
 
 %packages and solutions to be tested
-packages={'macayeal','ice','cielo_serial','cielo_parallel'};
+packages={'ice','cielo_serial','cielo_parallel'};
+packages={'cielo_parallel'};
 solutions={'diagnostic','thermalsteady','thermaltransient','prognostic','transient'};
 
@@ -19,5 +20,5 @@
 
 		%check package
-		if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
+		if ~(strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
 			error(['package: ' package  ' in test: ' testname  ' not supported yet']);
 			%check solution
@@ -27,5 +28,5 @@
 		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
@@ -45,10 +46,8 @@
 
 		%compute solution
-		if strcmpi(package,'cielo_parallel') & strcmpi(solution,'diagnostic'),
-			md=solve(md,'diagnostic_horiz','cielo');
-		elseif strcmpi(package,'cielo_serial'),
-			eval(['md=solve(md,''' solution ''',''cielo'');']);
+		if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')),
+			md=solve(md,solution,'cielo');
 		else
-			eval(['md=solve(md,''' solution ''',''' package ''');']);
+			md=solve(md,solution,package);
 		end
 
Index: /issm/trunk/test/Verification/IceShelfIceFrontMP3d_3/runme.m
===================================================================
--- /issm/trunk/test/Verification/IceShelfIceFrontMP3d_3/runme.m	(revision 450)
+++ /issm/trunk/test/Verification/IceShelfIceFrontMP3d_3/runme.m	(revision 451)
@@ -52,10 +52,8 @@
 
 		%compute solution
-		if strcmpi(package,'cielo_parallel') & strcmpi(solution,'diagnostic'),
-			md=solve(md,'diagnostic_horiz','cielo');
-		elseif strcmpi(package,'cielo_serial'),
-			eval(['md=solve(md,''' solution ''',''cielo'');']);
+		if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')),
+			md=solve(md,solution,'cielo');
 		else
-			eval(['md=solve(md,''' solution ''',''' package ''');']);
+			md=solve(md,solution,package);
 		end
 
Index: /issm/trunk/test/Verification/IceShelfIceFrontMP3d_3/updatearchive.m
===================================================================
--- /issm/trunk/test/Verification/IceShelfIceFrontMP3d_3/updatearchive.m	(revision 450)
+++ /issm/trunk/test/Verification/IceShelfIceFrontMP3d_3/updatearchive.m	(revision 451)
@@ -45,10 +45,8 @@
 
 		%compute solution
-		if strcmpi(package,'cielo_parallel') & strcmpi(solution,'diagnostic'),
-			md=solve(md,'diagnostic_horiz','cielo');
-		elseif strcmpi(package,'cielo_serial'),
-			eval(['md=solve(md,''' solution ''',''cielo'');']);
+		if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')),
+			md=solve(md,solution,'cielo');
 		else
-			eval(['md=solve(md,''' solution ''',''' package ''');']);
+			md=solve(md,solution,package);
 		end
 
Index: /issm/trunk/test/Verification/IceShelfIceFrontMPS3d_4/runme.m
===================================================================
--- /issm/trunk/test/Verification/IceShelfIceFrontMPS3d_4/runme.m	(revision 450)
+++ /issm/trunk/test/Verification/IceShelfIceFrontMPS3d_4/runme.m	(revision 451)
@@ -52,10 +52,8 @@
 
 		%compute solution
-		if strcmpi(package,'cielo_parallel') & strcmpi(solution,'diagnostic'),
-			md=solve(md,'diagnostic_horiz','cielo');
-		elseif strcmpi(package,'cielo_serial'),
-			eval(['md=solve(md,''' solution ''',''cielo'');']);
+		if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')),
+			md=solve(md,solution,'cielo');
 		else
-			eval(['md=solve(md,''' solution ''',''' package ''');']);
+			md=solve(md,solution,package);
 		end
 
Index: /issm/trunk/test/Verification/IceShelfIceFrontMPS3d_4/updatearchive.m
===================================================================
--- /issm/trunk/test/Verification/IceShelfIceFrontMPS3d_4/updatearchive.m	(revision 450)
+++ /issm/trunk/test/Verification/IceShelfIceFrontMPS3d_4/updatearchive.m	(revision 451)
@@ -45,10 +45,8 @@
 
 		%compute solution
-		if strcmpi(package,'cielo_parallel') & strcmpi(solution,'diagnostic'),
-			md=solve(md,'diagnostic_horiz','cielo');
-		elseif strcmpi(package,'cielo_serial'),
-			eval(['md=solve(md,''' solution ''',''cielo'');']);
+		if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')),
+			md=solve(md,solution,'cielo');
 		else
-			eval(['md=solve(md,''' solution ''',''' package ''');']);
+			md=solve(md,solution,package);
 		end
 
Index: /issm/trunk/test/Verification/IceShelfIceFrontP3d_5/runme.m
===================================================================
--- /issm/trunk/test/Verification/IceShelfIceFrontP3d_5/runme.m	(revision 450)
+++ /issm/trunk/test/Verification/IceShelfIceFrontP3d_5/runme.m	(revision 451)
@@ -52,10 +52,8 @@
 
 		%compute solution
-		if strcmpi(package,'cielo_parallel') & strcmpi(solution,'diagnostic'),
-			md=solve(md,'diagnostic_horiz','cielo');
-		elseif strcmpi(package,'cielo_serial'),
-			eval(['md=solve(md,''' solution ''',''cielo'');']);
+		if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')),
+			md=solve(md,solution,'cielo');
 		else
-			eval(['md=solve(md,''' solution ''',''' package ''');']);
+			md=solve(md,solution,package);
 		end
 
Index: /issm/trunk/test/Verification/IceShelfIceFrontP3d_5/updatearchive.m
===================================================================
--- /issm/trunk/test/Verification/IceShelfIceFrontP3d_5/updatearchive.m	(revision 450)
+++ /issm/trunk/test/Verification/IceShelfIceFrontP3d_5/updatearchive.m	(revision 451)
@@ -45,10 +45,8 @@
 
 		%compute solution
-		if strcmpi(package,'cielo_parallel') & strcmpi(solution,'diagnostic'),
-			md=solve(md,'diagnostic_horiz','cielo');
-		elseif strcmpi(package,'cielo_serial'),
-			eval(['md=solve(md,''' solution ''',''cielo'');']);
+		if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')),
+			md=solve(md,solution,'cielo');
 		else
-			eval(['md=solve(md,''' solution ''',''' package ''');']);
+			md=solve(md,solution,package);
 		end
 
Index: /issm/trunk/test/Verification/IceShelfIceFrontS3d_6/runme.m
===================================================================
--- /issm/trunk/test/Verification/IceShelfIceFrontS3d_6/runme.m	(revision 450)
+++ /issm/trunk/test/Verification/IceShelfIceFrontS3d_6/runme.m	(revision 451)
@@ -52,10 +52,8 @@
 
 		%compute solution
-		if strcmpi(package,'cielo_parallel') & strcmpi(solution,'diagnostic'),
-			md=solve(md,'diagnostic_horiz','cielo');
-		elseif strcmpi(package,'cielo_serial'),
-			eval(['md=solve(md,''' solution ''',''cielo'');']);
+		if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')),
+			md=solve(md,solution,'cielo');
 		else
-			eval(['md=solve(md,''' solution ''',''' package ''');']);
+			md=solve(md,solution,package);
 		end
 
Index: /issm/trunk/test/Verification/IceShelfIceFrontS3d_6/updatearchive.m
===================================================================
--- /issm/trunk/test/Verification/IceShelfIceFrontS3d_6/updatearchive.m	(revision 450)
+++ /issm/trunk/test/Verification/IceShelfIceFrontS3d_6/updatearchive.m	(revision 451)
@@ -45,10 +45,8 @@
 
 		%compute solution
-		if strcmpi(package,'cielo_parallel') & strcmpi(solution,'diagnostic'),
-			md=solve(md,'diagnostic_horiz','cielo');
-		elseif strcmpi(package,'cielo_serial'),
-			eval(['md=solve(md,''' solution ''',''cielo'');']);
+		if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')),
+			md=solve(md,solution,'cielo');
 		else
-			eval(['md=solve(md,''' solution ''',''' package ''');']);
+			md=solve(md,solution,package);
 		end
 
Index: /issm/trunk/test/Verification/test_cielo/runme.m
===================================================================
--- /issm/trunk/test/Verification/test_cielo/runme.m	(revision 450)
+++ /issm/trunk/test/Verification/test_cielo/runme.m	(revision 451)
@@ -13,5 +13,5 @@
 md.cluster='wilkes';
 
-md=solve(md,'diagnostic_horiz','cielo'); pause(10);
+md=solve(md,solution,'cielo'); pause(10);
 md=loadresultsfromcluster(md,'diagnostic_horiz');
 vel_cielo=md.vel;
@@ -39,5 +39,5 @@
 md.cluster='wilkes';
 
-md=solve(md,'diagnostic_horiz','cielo'); pause(10);
+md=solve(md,solution,'cielo'); pause(10);
 md=loadresultsfromcluster(md,'diagnostic_horiz');
 vel_cielo=md.vel;
@@ -64,5 +64,5 @@
 md.cluster='wilkes';
 
-md=solve(md,'diagnostic_horiz','cielo'); pause(10);
+md=solve(md,solution,'cielo'); pause(10);
 md=loadresultsfromcluster(md,'diagnostic_horiz');
 vel_cielo=md.vel;
@@ -90,5 +90,5 @@
 md.cluster='wilkes';
 
-md=solve(md,'diagnostic_horiz','cielo'); pause(10);
+md=solve(md,solution,'cielo'); pause(10);
 md=loadresultsfromcluster(md,'diagnostic_horiz');
 vel_cielo=md.vel;
@@ -154,5 +154,5 @@
 md.drag(pos)=0;
 
-md=solve(md,'diagnostic_horiz','cielo'); pause(10);
+md=solve(md,solution,'cielo'); pause(10);
 md=loadresultsfromcluster(md,'diagnostic_horiz');
 md.vx_obs=md.vx;