Index: /issm/trunk/test/Verification/IceShelfIceFrontM2d_1/runme.m
===================================================================
--- /issm/trunk/test/Verification/IceShelfIceFrontM2d_1/runme.m	(revision 444)
+++ /issm/trunk/test/Verification/IceShelfIceFrontM2d_1/runme.m	(revision 445)
@@ -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/IceShelfIceFrontM2d_1/updatearchive.m
===================================================================
--- /issm/trunk/test/Verification/IceShelfIceFrontM2d_1/updatearchive.m	(revision 444)
+++ /issm/trunk/test/Verification/IceShelfIceFrontM2d_1/updatearchive.m	(revision 445)
@@ -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