Index: /issm/trunk/src/m/model/ismodelselfconsistent.m
===================================================================
--- /issm/trunk/src/m/model/ismodelselfconsistent.m	(revision 8120)
+++ /issm/trunk/src/m/model/ismodelselfconsistent.m	(revision 8121)
@@ -46,30 +46,5 @@
 end
 %}}}
-%ELEMENTSTYPE{{{1
-%Check the size of elements_type
-fields={'elements_type'};
-checksize(md,fields,[md.numberofelements 1]);
-%Check the values of elements_type
-checkvalues(md,{'elements_type'},[MacAyealApproximationEnum() HutterApproximationEnum() PattynApproximationEnum() MacAyealPattynApproximationEnum() MacAyealStokesApproximationEnum() PattynStokesApproximationEnum() StokesApproximationEnum() NoneApproximationEnum()]);
-if (md.dim==2),
-	checkvalues(md,{'elements_type'},[MacAyealApproximationEnum() HutterApproximationEnum()]);
-end
-if (md.ismacayealpattyn==0 && md.ishutter==0 && md.isstokes==0),
-	error(['model not consistent: no elements type set for this model. at least one of ismacayealpattyn, ishutter and isstokes need to be =1']);
-end
-%}}}
-%VERTICESTYPE{{{1
-%Check the size of verticess_type
-fields={'vertices_type'};
-checksize(md,fields,[md.numberofgrids 1]);
-%Check the values of vertices_type
-checkvalues(md,{'vertices_type'},[MacAyealApproximationEnum() HutterApproximationEnum() PattynApproximationEnum() MacAyealPattynApproximationEnum() StokesApproximationEnum() MacAyealStokesApproximationEnum() PattynStokesApproximationEnum() NoneApproximationEnum()]);
-if (md.dim==2),
-	checkvalues(md,{'vertices_type'},[MacAyealApproximationEnum() HutterApproximationEnum()]);
-end
-if (md.ismacayealpattyn==0 && md.ishutter==0 && md.isstokes==0),
-	error(['model not consistent: no elements type set for this model. at least one of ismacayealpattyn, ishutter and isstokes need to be =1']);
-end
-%}}}
+
 %DG {{{1
 if md.prognostic_DG==1;
@@ -385,4 +360,32 @@
 				checksize(md,fields,[md.numberofgrids 1]);
 			end
+
+			%ELEMENTSTYPE
+			%Check the size of elements_type
+			fields={'elements_type'};
+			checksize(md,fields,[md.numberofelements 1]);
+			%Check the values of elements_type
+			checkvalues(md,{'elements_type'},[MacAyealApproximationEnum() HutterApproximationEnum() PattynApproximationEnum()...
+				MacAyealPattynApproximationEnum() MacAyealStokesApproximationEnum() PattynStokesApproximationEnum() StokesApproximationEnum() NoneApproximationEnum()]);
+			if (md.dim==2),
+				checkvalues(md,{'elements_type'},[MacAyealApproximationEnum() HutterApproximationEnum()]);
+			end
+			if (md.ismacayealpattyn==0 && md.ishutter==0 && md.isstokes==0),
+				error(['model not consistent: no elements type set for this model. at least one of ismacayealpattyn, ishutter and isstokes need to be =1']);
+			end
+			
+			%VERTICESTYPE
+			%Check the size of verticess_type
+			fields={'vertices_type'};
+			checksize(md,fields,[md.numberofgrids 1]);
+			%Check the values of vertices_type
+			checkvalues(md,{'vertices_type'},[MacAyealApproximationEnum() HutterApproximationEnum() PattynApproximationEnum()...
+				MacAyealPattynApproximationEnum() StokesApproximationEnum() MacAyealStokesApproximationEnum() PattynStokesApproximationEnum() NoneApproximationEnum()]);
+			if (md.dim==2),
+				checkvalues(md,{'vertices_type'},[MacAyealApproximationEnum() HutterApproximationEnum()]);
+			end
+			if (md.ismacayealpattyn==0 && md.ishutter==0 && md.isstokes==0),
+				error(['model not consistent: no elements type set for this model. at least one of ismacayealpattyn, ishutter and isstokes need to be =1']);
+			end
 			%}}}
 		case DiagnosticVertAnalysisEnum,