Index: /issm/trunk/src/m/solutions/macayeal/control.m
===================================================================
--- /issm/trunk/src/m/solutions/macayeal/control.m	(revision 1758)
+++ /issm/trunk/src/m/solutions/macayeal/control.m	(revision 1759)
@@ -40,5 +40,5 @@
 index_icefront=md.pressureload; index_icefront=index_icefront(:,1:2); %we strip the last column, which holds the element number for the boundary segment
 nodes_on_boundary=md.gridonboundary;
-nodes_on_dirichlet=md.gridondirichlet_diag;
+nodes_on_dirichlet=md.spcvelocity(:,1);
 nodes_on_icefront=zeros(nods,1); nodes_on_icefront(index_icefront)=1;
 nodes_on_iceshelf=md.gridoniceshelf;
Index: /issm/trunk/src/m/solutions/macayeal/diagnostic.m
===================================================================
--- /issm/trunk/src/m/solutions/macayeal/diagnostic.m	(revision 1758)
+++ /issm/trunk/src/m/solutions/macayeal/diagnostic.m	(revision 1759)
@@ -249,6 +249,6 @@
 specified_velocity=zeros(2*nods,1);
 pos=find(node_on_dirichlet);
-specified_velocity(pos)=md.spcvelocity(pos,1)/md.yts;
-specified_velocity(nods+pos)=md.spcvelocity(pos,2)/md.yts;
+specified_velocity(pos)=md.spcvelocity(pos,4)/md.yts;
+specified_velocity(nods+pos)=md.spcvelocity(pos,5)/md.yts;