Index: /issm/trunk/src/m/model/mesh/meshadaptation.m
===================================================================
--- /issm/trunk/src/m/model/mesh/meshadaptation.m	(revision 9735)
+++ /issm/trunk/src/m/model/mesh/meshadaptation.m	(revision 9736)
@@ -92,3 +92,3 @@
 disp(sprintf('      initial number of element: %i', md.mesh.numberofelements))
 md2=meshrefine(md,full(metric));
-disp(sprintf('      new number of elements:    %i', md2.numberofelements))
+disp(sprintf('      new number of elements:    %i', md2.mesh.numberofelements))
Index: /issm/trunk/src/m/model/mesh/rifts/meshaddrifts.m
===================================================================
--- /issm/trunk/src/m/model/mesh/rifts/meshaddrifts.m	(revision 9735)
+++ /issm/trunk/src/m/model/mesh/rifts/meshaddrifts.m	(revision 9736)
@@ -35,13 +35,13 @@
 	
 	%create domain of md2 model: 
-	md2.segments=contourenvelope(md2,'Meshaddrifts.Contour.exp');
-	domain_index=md2.segments(1,1:2);
+	md2.mesh.segments=contourenvelope(md2,'Meshaddrifts.Contour.exp');
+	domain_index=md2.mesh.segments(1,1:2);
 	while (domain_index(end)~=domain_index(1)),
-		pos=find(md2.segments(:,1)==domain_index(end));
-		domain_index(end+1)=md2.segments(pos,2);
+		pos=find(md2.mesh.segments(:,1)==domain_index(end));
+		domain_index(end+1)=md2.mesh.segments(pos,2);
 	end
 	
-	domain.x=md2.x(domain_index);
-	domain.y=md2.y(domain_index);
+	domain.x=md2.mesh.x(domain_index);
+	domain.y=md2.mesh.y(domain_index);
 	domain.name='Meshaddrifts.Domain.exp';
 	domain.density=1;
@@ -57,5 +57,5 @@
 	%plug md2 mesh into md mesh: 
 	[md.mesh.elements,md.mesh.x,md.mesh.y,md.mesh.z,md.mesh.numberofelements,md.mesh.numberofvertices,elconv,nodeconv,elconv2,nodeconv2]=meshplug(md.mesh.elements,md.mesh.x,md.mesh.y,md.mesh.z,...
-								md2.mesh.elements,md2.x,md2.y,md2.z,md2.extractednodes,md2.extractedelements,domain_index);
+								md2.mesh.elements,md2.mesh.x,md2.mesh.y,md2.mesh.z,md2.extractednodes,md2.extractedelements,domain_index);
 
 	%update md2 rifts using elconv and nodeconv, and plug them into md: 
Index: /issm/trunk/src/m/model/modelextract.m
===================================================================
--- /issm/trunk/src/m/model/modelextract.m	(revision 9735)
+++ /issm/trunk/src/m/model/modelextract.m	(revision 9736)
@@ -39,5 +39,5 @@
 spc_elem=find(~flag_elem);
 spc_node=sort(unique(md1.mesh.elements(spc_elem,:)));
-flag=ones(md1.numberofnodes,1);
+flag=ones(md1.mesh.numberofvertices,1);
 flag(spc_node)=0;
 pos=find(sum(flag(md1.mesh.elements),2)==0);
@@ -49,9 +49,9 @@
 
 %keep track of some fields
-numberofnodes1=md1.numberofnodes;
-numberofelements1=md1.numberofelements;
-numberofnodes2=length(pos_node);
+numberofvertices1=md1.mesh.numberofvertices;
+numberofelements1=md1.mesh.numberofelements;
+numberofvertices2=length(pos_node);
 numberofelements2=length(pos_elem);
-flag_node=zeros(numberofnodes1,1);
+flag_node=zeros(numberofvertices1,1);
 flag_node(pos_node)=1;
 
@@ -59,6 +59,6 @@
 Pelem=zeros(numberofelements1,1);
 Pelem(pos_elem)=[1:numberofelements2]';
-Pnode=zeros(numberofnodes1,1);
-Pnode(pos_node)=[1:numberofnodes2]';
+Pnode=zeros(numberofvertices1,1);
+Pnode(pos_node)=[1:numberofvertices2]';
 
 %renumber the elements (some node won't exist anymore)
@@ -68,5 +68,5 @@
 elements_2(:,2)=Pnode(elements_2(:,2));
 elements_2(:,3)=Pnode(elements_2(:,3));
-if md1.dim==3,
+if md1.mesh.dimension==3,
 	elements_2(:,4)=Pnode(elements_2(:,4));
 	elements_2(:,5)=Pnode(elements_2(:,5));
@@ -94,7 +94,7 @@
 				fieldsize=size(field);
 				%size = number of nodes * n
-				if fieldsize(1)==numberofnodes1
+				if fieldsize(1)==numberofvertices1
 					md2.(model_fields{i}).(object_fields{j})=field(pos_node,:);
-				elseif (fieldsize(1)==numberofnodes1+1)
+				elseif (fieldsize(1)==numberofvertices1+1)
 					md2.(model_fields(i)).(object_fields{j})=[field(pos_node,:); field(end,:)];
 					%size = number of elements * n
@@ -105,7 +105,7 @@
 		else
 			%size = number of nodes * n
-			if fieldsize(1)==numberofnodes1
+			if fieldsize(1)==numberofvertices1
 				md2.(model_fields{i})=field(pos_node,:);
-			elseif (fieldsize(1)==numberofnodes1+1)
+			elseif (fieldsize(1)==numberofvertices1+1)
 				md2.(model_fields(i))=[field(pos_node,:); field(end,:)];
 				%size = number of elements * n
@@ -119,10 +119,10 @@
 
 	%Mesh
-	md2.numberofelements=numberofelements2;
-	md2.numberofnodes=numberofnodes2;
+	md2.mesh.numberofelements=numberofelements2;
+	md2.mesh.numberofvertices=numberofvertices2;
 	md2.mesh.elements=elements_2;
 
 	%mesh.uppervertex mesh.lowervertex
-	if md1.dim==3
+	if md1.mesh.dimension==3
 		md2.mesh.uppervertex=md1.mesh.uppervertex(pos_node);
 		pos=find(~isnan(md2.mesh.uppervertex));
@@ -143,12 +143,12 @@
 
 	%Initial 2d mesh 
-	if md1.dim==3
-		flag_elem_2d=flag_elem(1:md1.numberofelements2d);
+	if md1.mesh.dimension==3
+		flag_elem_2d=flag_elem(1:md1.mesh.numberofelements2d);
 		pos_elem_2d=find(flag_elem_2d);
-		flag_node_2d=flag_node(1:md1.numberofnodes2d);
+		flag_node_2d=flag_node(1:md1.mesh.numberofvertices2d);
 		pos_node_2d=find(flag_node_2d);
 
-		md2.numberofelements2d=length(pos_elem_2d);
-		md2.numberofnodes2d=length(pos_node_2d);
+		md2.mesh.numberofelements2d=length(pos_elem_2d);
+		md2.mesh.numberofvertices2d=length(pos_node_2d);
 		md2.mesh.elements2d=md1.mesh.elements2d(pos_elem_2d,:);
 		md2.mesh.elements2d(:,1)=Pnode(md2.mesh.elements2d(:,1));
@@ -156,6 +156,6 @@
 		md2.mesh.elements2d(:,3)=Pnode(md2.mesh.elements2d(:,3));
 
-		md2.x2d=md1.x(pos_node_2d);
-		md2.y2d=md1.y(pos_node_2d);
+		md2.mesh.x2d=md1.mesh.x(pos_node_2d);
+		md2.mesh.y2d=md1.mesh.y(pos_node_2d);
 	end
 
@@ -202,9 +202,9 @@
 
 	%recreate segments
-	if md1.dim==2
-		md2.mesh.vertexconnectivity=NodeConnectivity(md2.mesh.elements,md2.numberofnodes);
+	if md1.mesh.dimension==2
+		md2.mesh.vertexconnectivity=NodeConnectivity(md2.mesh.elements,md2.mesh.numberofvertices);
 		md2.mesh.elementconnectivity=ElementConnectivity(md2.mesh.elements,md2.mesh.vertexconnectivity);
-		md2.segments=contourenvelope(md2);
-		md2.mesh.vertexonboundary=zeros(numberofnodes2,1); md2.nodeonboundary(md2.segments(:,1:2))=1;
+		md2.mesh.segments=contourenvelope(md2);
+		md2.mesh.vertexonboundary=zeros(numberofvertices2,1); md2.mesh.vertexonboundary(md2.mesh.segments(:,1:2))=1;
 	end
 
@@ -239,5 +239,5 @@
 		md2.diagnostic.icefront(:,2)=Pnode(md1.diagnostic.icefront(:,2)); 
 		md2.diagnostic.icefront(:,end-1)=Pelem(md1.diagnostic.icefront(:,end-1));
-		if md1.dim==3
+		if md1.mesh.dimension==3
 			md2.diagnostic.icefront(:,3)=Pnode(md1.diagnostic.icefront(:,3)); 
 			md2.diagnostic.icefront(:,4)=Pnode(md1.diagnostic.icefront(:,4)); 
@@ -255,5 +255,5 @@
 			for j=1:length(solutionsubfields),
 				field=md1.results.(solutionfields(i)).(solutionsubfields(j));
-				if length(field)==numberofnodes1,
+				if length(field)==numberofvertices1,
 					md2.results.(solutionfields(i)).(solutionsubfields(j))=field(pos_node);
 				elseif length(field)==numberofelements1,
Index: /issm/trunk/test/NightlyRun/test527.m
===================================================================
--- /issm/trunk/test/NightlyRun/test527.m	(revision 9735)
+++ /issm/trunk/test/NightlyRun/test527.m	(revision 9736)
@@ -18,11 +18,11 @@
 md.miscellaneous.dummy=metric;
 md2=bamg(md,'metric',md.miscellaneous.dummy,'hmin',1000,'hmax',20000,'gradation',3,'geometricalmetric',1);
-x3=md2.x;
-y3=md2.y;
+x3=md2.mesh.x;
+y3=md2.mesh.y;
 
 %refine existing mesh 2
 md2=bamg(md,'metric',md.miscellaneous.dummy,'hmin',1000,'hmax',20000,'gradation',3,'geometricalmetric',1,'anisomax',1);
-x4=md2.x;
-y4=md2.y;
+x4=md2.mesh.x;
+y4=md2.mesh.y;
 
 %refine existing mesh 3
@@ -30,16 +30,16 @@
 hVertices(find(md.mesh.vertexonboundary))=500;
 md2=bamg(md,'metric',md.miscellaneous.dummy,'hmin',1000,'hmax',20000,'gradation',3,'geometricalmetric',1,'anisomax',1,'hVertices',hVertices);
-x5=md2.x;
-y5=md2.y;
+x5=md2.mesh.x;
+y5=md2.mesh.y;
 
 %refine existing mesh 4
 md2=bamg(md,'field',md.inversion.vy_obs,'hmin',1000,'hmax',20000,'gradation',3,'geometricalmetric',1,'Hessiantype',0,'err',1);
-x6=md2.x;
-y6=md2.y;
+x6=md2.mesh.x;
+y6=md2.mesh.y;
 
 %refine existing mesh 5
 md2=bamg(md,'field',[md.inversion.vy_obs md.geometry.thickness],'hmin',1000,'hmax',20000,'gradation',3,'geometricalmetric',1,'Hessiantype',1,'err',[10 100]); 
-x7=md2.x;
-y7=md2.y;
+x7=md2.mesh.x;
+y7=md2.mesh.y;
 
 %Fields and tolerances to track changes