Index: /issm/trunk/src/m/model/bamg.m
===================================================================
--- /issm/trunk/src/m/model/bamg.m	(revision 9653)
+++ /issm/trunk/src/m/model/bamg.m	(revision 9654)
@@ -330,5 +330,5 @@
 md.z=zeros(md.numberofnodes,1);
 md.nodeonbed=ones(md.numberofnodes,1);
-md.nodeonwater=zeros(md.numberofnodes,1);
+md.mask.vertexonwater=zeros(md.numberofnodes,1);
 md.nodeonsurface=ones(md.numberofnodes,1);
 md.elementonbed=ones(md.numberofelements,1);
Index: /issm/trunk/src/m/model/collapse.m
===================================================================
--- /issm/trunk/src/m/model/collapse.m	(revision 9653)
+++ /issm/trunk/src/m/model/collapse.m	(revision 9654)
@@ -50,8 +50,4 @@
 	md.elements_type=project2d(md,md.elements_type,1);
 end	
-md.nodeonhutter=project2d(md,md.nodeonhutter,1);
-md.nodeonmacayeal=project2d(md,md.nodeonmacayeal,1);
-md.nodeonpattyn=project2d(md,md.nodeonpattyn,1);
-md.nodeonstokes=project2d(md,md.nodeonstokes,1);
 
 %boundary conditions
Index: /issm/trunk/src/m/model/extrude.m
===================================================================
--- /issm/trunk/src/m/model/extrude.m	(revision 9653)
+++ /issm/trunk/src/m/model/extrude.m	(revision 9654)
@@ -158,8 +158,4 @@
 	md.elements_type=zeros(number_el3d,1);
 	md.elements_type=project3d(md,'vector',oldelements_type,'type','element');
-	md.nodeonhutter=project3d(md,'vector',md.nodeonhutter,'type','node');
-	md.nodeonmacayeal=project3d(md,'vector',md.nodeonmacayeal,'type','node');
-	md.nodeonpattyn=project3d(md,'vector',md.nodeonpattyn,'type','node');
-	md.nodeonstokes=project3d(md,'vector',md.nodeonstokes,'type','node');
 end
 
Index: /issm/trunk/src/m/model/ismodelselfconsistent.m
===================================================================
--- /issm/trunk/src/m/model/ismodelselfconsistent.m	(revision 9653)
+++ /issm/trunk/src/m/model/ismodelselfconsistent.m	(revision 9654)
@@ -386,6 +386,6 @@
 			end
 			%CHECK THAT ROTATION IS IN THE (X,Y) PLANE FOR 2D MODELS
-			if any(md.nodeonmacayeal),
-				pos=find(sum(isnan(md.diagnostic_ref),2)==0  & md.nodeonmacayeal);
+			if md.dim==2,
+				pos=find(sum(isnan(md.diagnostic_ref),2)==0  & md.vertices_type==2);
 				if any(md.diagnostic_ref(pos,3:5)~=0);
 					message(['model not consistent: model ' md.miscellaneous.name ' has problem with rotated spc. The rotation should be in the (x,y) plane for 2D diagnostic models (nodeonmacayeal)']);
Index: /issm/trunk/src/m/model/setelementstype.m
===================================================================
--- /issm/trunk/src/m/model/setelementstype.m	(revision 9653)
+++ /issm/trunk/src/m/model/setelementstype.m	(revision 9654)
@@ -73,5 +73,4 @@
 nodeonhutter=zeros(md.numberofnodes,1);
 nodeonhutter(md.elements(find(hutterflag),:))=1;
-md.nodeonhutter=nodeonhutter;
 md.elements_type(find(hutterflag))=1;