Index: /issm/trunk/src/m/classes/public/extrude.m
===================================================================
--- /issm/trunk/src/m/classes/public/extrude.m	(revision 5125)
+++ /issm/trunk/src/m/classes/public/extrude.m	(revision 5126)
@@ -186,5 +186,5 @@
 	%dead grids
 	md.deadgrids=ones(md.numberofgrids,1);
-	md.deadgrids(md.elements(md.elements_type(:,1)~=MacAyealFormulationEnum,:))=0;%non macayeal grids are not dead
+	md.deadgrids(md.elements(md.elements_type(:,1)~=MacAyealApproximationEnum,:))=0;%non macayeal grids are not dead
 	md.deadgrids(find(md.gridonbed))=0;%grids from elements on bed are not dead
 end
Index: /issm/trunk/src/m/classes/public/ismodelselfconsistent.m
===================================================================
--- /issm/trunk/src/m/classes/public/ismodelselfconsistent.m	(revision 5125)
+++ /issm/trunk/src/m/classes/public/ismodelselfconsistent.m	(revision 5126)
@@ -58,9 +58,9 @@
 checksize(md,fields,[md.numberofelements 2]);
 %Check the values of elements_type(1)
-checkvalues(md,{'elements_type(:,1)'},[MacAyealFormulationEnum() HutterFormulationEnum() PattynFormulationEnum()]);
+checkvalues(md,{'elements_type(:,1)'},[MacAyealApproximationEnum() HutterApproximationEnum() PattynApproximationEnum()]);
 %Check the values of elements_type(2)
-checkvalues(md,{'elements_type(:,2)'},[StokesFormulationEnum() NoneFormulationEnum()]);
+checkvalues(md,{'elements_type(:,2)'},[StokesApproximationEnum() NoneApproximationEnum()]);
 if (md.dim==2),
-	checkvalues(md,{'elements_type(:,1)'},[MacAyealFormulationEnum() HutterFormulationEnum()]);
+	checkvalues(md,{'elements_type(:,1)'},[MacAyealApproximationEnum() HutterApproximationEnum()]);
 end
 if (md.ismacayealpattyn==0 && md.ishutter==0 && md.isstokes==0),
@@ -73,9 +73,9 @@
 checksize(md,fields,[md.numberofgrids 2]);
 %Check the values of elements_type(1)
-checkvalues(md,{'elements_type(:,1)'},[MacAyealFormulationEnum() HutterFormulationEnum() PattynFormulationEnum() MacAyealPattynFormulationEnum()]);
+checkvalues(md,{'elements_type(:,1)'},[MacAyealApproximationEnum() HutterApproximationEnum() PattynApproximationEnum() MacAyealPattynApproximationEnum()]);
 %Check the values of elements_type(2)
-checkvalues(md,{'elements_type(:,2)'},[StokesFormulationEnum() NoneFormulationEnum()]);
+checkvalues(md,{'elements_type(:,2)'},[StokesApproximationEnum() NoneApproximationEnum()]);
 if (md.dim==2),
-	checkvalues(md,{'elements_type(:,1)'},[MacAyealFormulationEnum() HutterFormulationEnum()]);
+	checkvalues(md,{'elements_type(:,1)'},[MacAyealApproximationEnum() HutterApproximationEnum()]);
 end
 if (md.ismacayealpattyn==0 && md.ishutter==0 && md.isstokes==0),
@@ -205,5 +205,5 @@
 
 	%HUTTER ON ICESHELF WARNING
-	if any(md.elements_type(:,1)==HutterFormulationEnum & md.elementoniceshelf),
+	if any(md.elements_type(:,1)==HutterApproximationEnum & md.elementoniceshelf),
 		disp(sprintf('\n !!! Warning: Hutter''s model is not consistent on ice shelves !!!\n'));
 	end
Index: /issm/trunk/src/m/classes/public/mechanicalproperties.m
===================================================================
--- /issm/trunk/src/m/classes/public/mechanicalproperties.m	(revision 5125)
+++ /issm/trunk/src/m/classes/public/mechanicalproperties.m	(revision 5126)
@@ -20,5 +20,5 @@
 	error('only 2d model supported yet');
 end
-if any(md.elements_type(:,1)~=MacAyealFormulationEnum),
+if any(md.elements_type(:,1)~=MacAyealApproximationEnum),
 	disp('Warning: the model has some non macayeal elements. These will be treated like MacAyeal''s elements');
 end
Index: /issm/trunk/src/m/classes/public/modelextract.m
===================================================================
--- /issm/trunk/src/m/classes/public/modelextract.m	(revision 5125)
+++ /issm/trunk/src/m/classes/public/modelextract.m	(revision 5126)
@@ -212,5 +212,5 @@
 		pos=find(sum(md2.spcvelocity(:,1:3),2));                 %find all the grids on the boundary of the domain without icefront
 		md2.gridonstokes(pos)=0;                               %we have to constrain all the boundary of the domain without icefront
-		stokes_elements=find(md2.elements_type(:,2)==StokesFormulationEnum()); %find the elements on the stokes domain
+		stokes_elements=find(md2.elements_type(:,2)==StokesApproximationEnum()); %find the elements on the stokes domain
 		borderflags=zeros(numberofgrids2,1); 
 		borderflags(md2.elements(stokes_elements,:))=1; %find all the grids of the elements on stokes domain, ie stokes grids and borderstokes
Index: /issm/trunk/src/m/classes/public/plot/plot_elementstype.m
===================================================================
--- /issm/trunk/src/m/classes/public/plot/plot_elementstype.m	(revision 5125)
+++ /issm/trunk/src/m/classes/public/plot/plot_elementstype.m	(revision 5126)
@@ -21,21 +21,21 @@
 if is2d
 	%Hutter elements
-	posH=find(data(:,1)==HutterFormulationEnum);
+	posH=find(data(:,1)==HutterApproximationEnum);
 	A=elements(posH,1); B=elements(posH,2); C=elements(posH,3); 
-	p1=patch( 'Faces', [A B C], 'Vertices', [x y z],'CData',HutterFormulationEnum,'FaceColor','flat','EdgeColor',edgecolor);
+	p1=patch( 'Faces', [A B C], 'Vertices', [x y z],'CData',HutterApproximationEnum,'FaceColor','flat','EdgeColor',edgecolor);
 	%MacAyeal element
-	posH=find(data(:,1)==MacAyealFormulationEnum);
+	posH=find(data(:,1)==MacAyealApproximationEnum);
 	A=elements(posH,1); B=elements(posH,2); C=elements(posH,3); 
-	p2=patch( 'Faces', [A B C], 'Vertices', [x y z],'CData',MacAyealFormulationEnum,'FaceColor','flat','EdgeColor',edgecolor);
+	p2=patch( 'Faces', [A B C], 'Vertices', [x y z],'CData',MacAyealApproximationEnum,'FaceColor','flat','EdgeColor',edgecolor);
 	%Pattyn element
-	posH=find(data(:,1)==PattynFormulationEnum);
+	posH=find(data(:,1)==PattynApproximationEnum);
 	A=elements(posH,1); B=elements(posH,2); C=elements(posH,3); 
-	p3=patch( 'Faces', [A B C], 'Vertices', [x y z],'CData',PattynFormulationEnum,'FaceColor','flat','EdgeColor',edgecolor);
+	p3=patch( 'Faces', [A B C], 'Vertices', [x y z],'CData',PattynApproximationEnum,'FaceColor','flat','EdgeColor',edgecolor);
 	%Stokes elements
 	alpha=0.35;
-	posS=find(data(:,2)==StokesFormulationEnum);
+	posS=find(data(:,2)==StokesApproximationEnum);
 	if ~isempty(posS)
 		A=elements(posS,1); B=elements(posS,2); C=elements(posS,3);
-	%	p4=patch( 'Faces', [A B C], 'Vertices', [x y z],'CData',StokesFormulationEnum,'FaceColor','flat','EdgeColor',edgecolor,'EdgeAlpha',alpha,'FaceAlpha',alpha);
+	%	p4=patch( 'Faces', [A B C], 'Vertices', [x y z],'CData',StokesApproximationEnum,'FaceColor','flat','EdgeColor',edgecolor,'EdgeAlpha',alpha,'FaceAlpha',alpha);
 	%	legend([p1 p2 p3 p4],'Hutter''s elements','MacAyeal''s elements','Pattyn''s elements','Stokes''s elements');
 	else
@@ -44,30 +44,30 @@
 else
 	%Hutter elements
-	posH=find(data(:,1)==HutterFormulationEnum);
+	posH=find(data(:,1)==HutterApproximationEnum);
 	A=elements(posH,1); B=elements(posH,2); C=elements(posH,3); D=elements(posH,4); E=elements(posH,5); F=elements(posH,6);
-	p1=patch( 'Faces', [A B C], 'Vertices', [x y z],'CData', HutterFormulationEnum,'FaceColor','flat','EdgeColor',edgecolor);
-	patch( 'Faces', [D E F], 'Vertices', [x y z],'CData', HutterFormulationEnum,'FaceColor','flat','EdgeColor',edgecolor);
-	patch( 'Faces', [A B E D], 'Vertices', [x y z],'CData', HutterFormulationEnum,'FaceColor','flat','EdgeColor',edgecolor);
-	patch( 'Faces', [B E F C ], 'Vertices', [x y z],'CData', HutterFormulationEnum,'FaceColor','flat','EdgeColor',edgecolor);
-	patch( 'Faces', [C A D F ], 'Vertices', [x y z],'CData', HutterFormulationEnum,'FaceColor','flat','EdgeColor',edgecolor);
+	p1=patch( 'Faces', [A B C], 'Vertices', [x y z],'CData', HutterApproximationEnum,'FaceColor','flat','EdgeColor',edgecolor);
+	patch( 'Faces', [D E F], 'Vertices', [x y z],'CData', HutterApproximationEnum,'FaceColor','flat','EdgeColor',edgecolor);
+	patch( 'Faces', [A B E D], 'Vertices', [x y z],'CData', HutterApproximationEnum,'FaceColor','flat','EdgeColor',edgecolor);
+	patch( 'Faces', [B E F C ], 'Vertices', [x y z],'CData', HutterApproximationEnum,'FaceColor','flat','EdgeColor',edgecolor);
+	patch( 'Faces', [C A D F ], 'Vertices', [x y z],'CData', HutterApproximationEnum,'FaceColor','flat','EdgeColor',edgecolor);
 	%MacAyeal elements
-	posM=find(data(:,1)==MacAyealFormulationEnum);
+	posM=find(data(:,1)==MacAyealApproximationEnum);
 	A=elements(posM,1); B=elements(posM,2); C=elements(posM,3); D=elements(posM,4); E=elements(posM,5); F=elements(posM,6);
-	p2=patch( 'Faces', [A B C], 'Vertices', [x y z],'CData', MacAyealFormulationEnum,'FaceColor','flat','EdgeColor',edgecolor);
-	patch( 'Faces', [D E F], 'Vertices', [x y z],'CData', MacAyealFormulationEnum,'FaceColor','flat','EdgeColor',edgecolor);
-	patch( 'Faces', [A B E D], 'Vertices', [x y z],'CData', MacAyealFormulationEnum,'FaceColor','flat','EdgeColor',edgecolor);
-	patch( 'Faces', [B E F C ], 'Vertices', [x y z],'CData', MacAyealFormulationEnum,'FaceColor','flat','EdgeColor',edgecolor);
-	patch( 'Faces', [C A D F ], 'Vertices', [x y z],'CData', MacAyealFormulationEnum,'FaceColor','flat','EdgeColor',edgecolor);
+	p2=patch( 'Faces', [A B C], 'Vertices', [x y z],'CData', MacAyealApproximationEnum,'FaceColor','flat','EdgeColor',edgecolor);
+	patch( 'Faces', [D E F], 'Vertices', [x y z],'CData', MacAyealApproximationEnum,'FaceColor','flat','EdgeColor',edgecolor);
+	patch( 'Faces', [A B E D], 'Vertices', [x y z],'CData', MacAyealApproximationEnum,'FaceColor','flat','EdgeColor',edgecolor);
+	patch( 'Faces', [B E F C ], 'Vertices', [x y z],'CData', MacAyealApproximationEnum,'FaceColor','flat','EdgeColor',edgecolor);
+	patch( 'Faces', [C A D F ], 'Vertices', [x y z],'CData', MacAyealApproximationEnum,'FaceColor','flat','EdgeColor',edgecolor);
 	%Pattyn elements
-	posP=find(data(:,1)==PattynFormulationEnum);
+	posP=find(data(:,1)==PattynApproximationEnum);
 	A=elements(posP,1); B=elements(posP,2); C=elements(posP,3); D=elements(posP,4); E=elements(posP,5); F=elements(posP,6);
-	p3=patch( 'Faces', [A B C], 'Vertices', [x y z],'CData', PattynFormulationEnum,'FaceColor','flat','EdgeColor',edgecolor);
-	patch( 'Faces', [D E F], 'Vertices', [x y z],'CData', PattynFormulationEnum,'FaceColor','flat','EdgeColor',edgecolor);
-	patch( 'Faces', [A B E D], 'Vertices', [x y z],'CData', PattynFormulationEnum,'FaceColor','flat','EdgeColor',edgecolor);
-	patch( 'Faces', [B E F C ], 'Vertices', [x y z],'CData', PattynFormulationEnum,'FaceColor','flat','EdgeColor',edgecolor);
-	patch( 'Faces', [C A D F ], 'Vertices', [x y z],'CData', PattynFormulationEnum,'FaceColor','flat','EdgeColor',edgecolor);
+	p3=patch( 'Faces', [A B C], 'Vertices', [x y z],'CData', PattynApproximationEnum,'FaceColor','flat','EdgeColor',edgecolor);
+	patch( 'Faces', [D E F], 'Vertices', [x y z],'CData', PattynApproximationEnum,'FaceColor','flat','EdgeColor',edgecolor);
+	patch( 'Faces', [A B E D], 'Vertices', [x y z],'CData', PattynApproximationEnum,'FaceColor','flat','EdgeColor',edgecolor);
+	patch( 'Faces', [B E F C ], 'Vertices', [x y z],'CData', PattynApproximationEnum,'FaceColor','flat','EdgeColor',edgecolor);
+	patch( 'Faces', [C A D F ], 'Vertices', [x y z],'CData', PattynApproximationEnum,'FaceColor','flat','EdgeColor',edgecolor);
 	%Stokes elements
 	alpha=0.35;
-	posS=find(data(:,2)==StokesFormulationEnum);
+	posS=find(data(:,2)==StokesApproximationEnum);
 	if ~isempty(posS)
 		A=elements(posS,1); B=elements(posS,2); C=elements(posS,3); D=elements(posS,4); E=elements(posS,5); F=elements(posS,6);
Index: /issm/trunk/src/m/classes/public/setelementstype.m
===================================================================
--- /issm/trunk/src/m/classes/public/setelementstype.m	(revision 5125)
+++ /issm/trunk/src/m/classes/public/setelementstype.m	(revision 5126)
@@ -77,5 +77,5 @@
 gridonhutter(md.elements(find(hutterflag),:))=1;
 md.gridonhutter=gridonhutter;
-md.elements_type(find(hutterflag),1)=HutterFormulationEnum();
+md.elements_type(find(hutterflag),1)=HutterApproximationEnum();
 
 %2: MacAyeal elements
@@ -83,5 +83,5 @@
 gridonmacayeal(md.elements(find(macayealflag),:))=1;
 md.gridonmacayeal=gridonmacayeal;
-md.elements_type(find(macayealflag),1)=MacAyealFormulationEnum();
+md.elements_type(find(macayealflag),1)=MacAyealApproximationEnum();
 
 %3: Pattyn elements
@@ -89,29 +89,29 @@
 gridonpattyn(md.elements(find(pattynflag),:))=1;
 md.gridonpattyn=gridonpattyn;
-md.elements_type(find(pattynflag),1)=PattynFormulationEnum();
+md.elements_type(find(pattynflag),1)=PattynApproximationEnum();
 
 %4: Stokes elements
 md.gridonstokes=gridonstokes;
-md.elements_type(find(stokesflag),2)=StokesFormulationEnum();
+md.elements_type(find(stokesflag),2)=StokesApproximationEnum();
 
 %5: None elements (non Stokes)
-md.elements_type(find(~stokesflag),2)=NoneFormulationEnum();
+md.elements_type(find(~stokesflag),2)=NoneApproximationEnum();
 
 %Create vertices_type
 md.vertices_type=zeros(md.numberofgrids,2);
 pos=find(gridonhutter);
-md.vertices_type(pos,1)=HutterFormulationEnum();
+md.vertices_type(pos,1)=HutterApproximationEnum();
 pos=find(gridonmacayeal);
-md.vertices_type(pos,1)=MacAyealFormulationEnum();
+md.vertices_type(pos,1)=MacAyealApproximationEnum();
 pos=find(gridonpattyn);
-md.vertices_type(pos,1)=PattynFormulationEnum();
+md.vertices_type(pos,1)=PattynApproximationEnum();
 pos=find(gridonhutter);
-md.vertices_type(pos,1)=HutterFormulationEnum();
+md.vertices_type(pos,1)=HutterApproximationEnum();
 pos=find(gridonpattyn & gridonmacayeal);
-md.vertices_type(pos,1)=MacAyealPattynFormulationEnum();
+md.vertices_type(pos,1)=MacAyealPattynApproximationEnum();
 pos=find(gridonstokes);
-md.vertices_type(pos,2)=StokesFormulationEnum();
+md.vertices_type(pos,2)=StokesApproximationEnum();
 pos=find(~gridonstokes);
-md.vertices_type(pos,2)=NoneFormulationEnum();
+md.vertices_type(pos,2)=NoneApproximationEnum();
 
 %Create the border grids between Pattyn and MacAyeal and extrude them
@@ -138,5 +138,5 @@
 
 %figure out the border stokes grids
-stokes_elements=find(md.elements_type(:,2)==StokesFormulationEnum()); %find the elements on the stokes domain
+stokes_elements=find(md.elements_type(:,2)==StokesApproximationEnum()); %find the elements on the stokes domain
 borderflags=zeros(md.numberofgrids,1); 
 borderflags(md.elements(stokes_elements,:))=1; %find all the grids of the elements on stokes domain, ie stokes grids and borderstokes
@@ -144,7 +144,7 @@
 
 %figure out solution types
-md.ishutter=double(any(md.elements_type(:,1)==HutterFormulationEnum));
-md.ismacayealpattyn=double(any(md.elements_type(:,1)==MacAyealFormulationEnum | md.elements_type(:,1)==PattynFormulationEnum));
-md.isstokes=double(any(md.elements_type(:,2)==StokesFormulationEnum));
+md.ishutter=double(any(md.elements_type(:,1)==HutterApproximationEnum));
+md.ismacayealpattyn=double(any(md.elements_type(:,1)==MacAyealApproximationEnum | md.elements_type(:,1)==PattynApproximationEnum));
+md.isstokes=double(any(md.elements_type(:,2)==StokesApproximationEnum));
 
 end