Index: /issm/trunk/test/Validation/MacAyealVsPattyn/test1_iceshelf/runme.m
===================================================================
--- /issm/trunk/test/Validation/MacAyealVsPattyn/test1_iceshelf/runme.m	(revision 4870)
+++ /issm/trunk/test/Validation/MacAyealVsPattyn/test1_iceshelf/runme.m	(revision 4871)
@@ -10,19 +10,22 @@
 
 %Compute solution for a 2d model
-md=solve(md,'analysis_type','diagnostic','package','ice');
-vel_2d=md.results.diagnostic.vel;
+md=solve(md,'analysis_type',DiagnosticSolutionEnum);
+vel_2d=zeros(md.numberofgrids,1);
+vel_2d(md.results.DiagnosticSolution.Vel.index)=md.results.DiagnosticSolution.Vel.value;
 
 %Compute solution for a 3d model
 md=extrude(md,5,3);
 md=setelementstype(md,'Pattyn','Pattyn.exp','fill','Macayeal');
-md=solve(md,'analysis_type','diagnostic','package','ice');
+md=solve(md,'analysis_type',DiagnosticSolutionEnum);
 
 %Calculate the average velocity on each grid
 vel_3d=zeros(md.numberofgrids2d,1);
+vel=vel_3d;
+vel(md.results.DiagnosticSolution.Vel.index)=md.results.DiagnosticSolution.Vel.value;
 grid_vel=0;
 
 for i=1:md.numberofgrids2d
 	for j=1:(md.numlayers-1)
-		grid_vel=grid_vel+1/(2*(md.numlayers-1))*(md.results.diagnostic.vel(i+j*md.numberofgrids2d,1)+md.results.diagnostic.vel(i+(j-1)*md.numberofgrids2d,1));
+		grid_vel=grid_vel+1/(2*(md.numlayers-1))*(vel(i+j*md.numberofgrids2d,1)+vel(i+(j-1)*md.numberofgrids2d,1));
 	end
 	vel_3d(i,1)=grid_vel;
Index: /issm/trunk/test/Validation/MacAyealVsPattyn/test2_icesheet/Square.par
===================================================================
--- /issm/trunk/test/Validation/MacAyealVsPattyn/test2_icesheet/Square.par	(revision 4870)
+++ /issm/trunk/test/Validation/MacAyealVsPattyn/test2_icesheet/Square.par	(revision 4871)
@@ -33,4 +33,6 @@
 %Parallel options
 md.np=3;
+md.cluster='wilkes';
 md.time=50;
 md.waitonlock=1;
+md.name='test2';
Index: /issm/trunk/test/Validation/MacAyealVsPattyn/test2_icesheet/runme.m
===================================================================
--- /issm/trunk/test/Validation/MacAyealVsPattyn/test2_icesheet/runme.m	(revision 4870)
+++ /issm/trunk/test/Validation/MacAyealVsPattyn/test2_icesheet/runme.m	(revision 4871)
@@ -10,19 +10,22 @@
 %Compute solution for a 2d model
 md=setelementstype(md,'Macayeal','all');
-md=solve(md,'analysis_type','diagnostic','package','ice');
-vel_2d=md.results.diagnostic.vel;
+md=solve(md,'analysis_type',DiagnosticSolutionEnum);
+vel_2d=zeros(md.numberofgrids,1);
+vel_2d(md.results.DiagnosticSolution.Vel.index)=md.results.DiagnosticSolution.Vel.value;
 
 %Compute solution for a 3d model
 md=extrude(md,5,3);
 md=setelementstype(md,'Pattyn','all');
-md=solve(md,'analysis_type','diagnostic','package','ice');
+md=solve(md,'analysis_type',DiagnosticSolutionEnum);
 
 %Calculate the average velocity on each grid
 vel_3d=zeros(md.numberofgrids2d,1);
+vel=vel_3d;
+vel(md.results.DiagnosticSolution.Vel.index)=md.results.DiagnosticSolution.Vel.value;
 grid_vel=0;
 
 for i=1:md.numberofgrids2d
 	for j=1:(md.numlayers-1)
-		grid_vel=grid_vel+1/(2*(md.numlayers-1))*(md.results.diagnostic.vel(i+j*md.numberofgrids2d,1)+md.results.diagnostic.vel(i+(j-1)*md.numberofgrids2d,1));
+		grid_vel=grid_vel+1/(2*(md.numlayers-1))*(vel(i+j*md.numberofgrids2d,1)+vel(i+(j-1)*md.numberofgrids2d,1));
 	end
 	vel_3d(i,1)=grid_vel;
Index: /issm/trunk/test/Validation/MacAyealVsPattyn/test3_icesheet_iceshelf/Square.par
===================================================================
--- /issm/trunk/test/Validation/MacAyealVsPattyn/test3_icesheet_iceshelf/Square.par	(revision 4870)
+++ /issm/trunk/test/Validation/MacAyealVsPattyn/test3_icesheet_iceshelf/Square.par	(revision 4871)
@@ -28,8 +28,8 @@
 %Deal with boundary conditions:
 disp('      boundary conditions for diagnostic model: ');
-md=SetIceShelfBC(md,'Front.exp');
+md=SetMarineIceSheetBC(md,'Front.exp');
 
 %Parallel options
 md.np=3;
 md.time=50;
-md.waitonlock=1;
+md.waitonlock=10;
Index: /issm/trunk/test/Validation/MacAyealVsPattyn/test3_icesheet_iceshelf/runme.m
===================================================================
--- /issm/trunk/test/Validation/MacAyealVsPattyn/test3_icesheet_iceshelf/runme.m	(revision 4870)
+++ /issm/trunk/test/Validation/MacAyealVsPattyn/test3_icesheet_iceshelf/runme.m	(revision 4871)
@@ -10,19 +10,22 @@
 %Compute solution for a 2d model
 md=setelementstype(md,'Macayeal','all');
-md=solve(md,'analysis_type','diagnostic','package','ice');
-vel_2d=md.results.diagnostic.vel;
+md=solve(md,'analysis_type',DiagnosticSolutionEnum);
+vel_2d=zeros(md.numberofgrids,1);
+vel_2d(md.results.DiagnosticSolution.Vel.index)=md.results.DiagnosticSolution.Vel.value;
 
 %Compute solution for a 3d model
 md=extrude(md,5,3);
 md=setelementstype(md,'Pattyn','all');
-md=solve(md,'analysis_type','diagnostic','package','ice');
+md=solve(md,'analysis_type',DiagnosticSolutionEnum);
 
 %Calculate the average velocity on each grid
 vel_3d=zeros(md.numberofgrids2d,1);
+vel=vel_3d;
+vel(md.results.DiagnosticSolution.Vel.index)=md.results.DiagnosticSolution.Vel.value;
 grid_vel=0;
 
 for i=1:md.numberofgrids2d
 	for j=1:(md.numlayers-1)
-		grid_vel=grid_vel+1/(2*(md.numlayers-1))*(md.results.diagnostic.vel(i+j*md.numberofgrids2d,1)+md.results.diagnostic.vel(i+(j-1)*md.numberofgrids2d,1));
+		grid_vel=grid_vel+1/(2*(md.numlayers-1))*(vel(i+j*md.numberofgrids2d,1)+vel(i+(j-1)*md.numberofgrids2d,1));
 	end
 	vel_3d(i,1)=grid_vel;