Index: /issm/trunk/src/m/classes/public/ismodelselfconsistent.m
===================================================================
--- /issm/trunk/src/m/classes/public/ismodelselfconsistent.m	(revision 1780)
+++ /issm/trunk/src/m/classes/public/ismodelselfconsistent.m	(revision 1781)
@@ -186,5 +186,5 @@
 
 %DIAGNOSTIC
-if strcmpi(md.analysis_type,'diagnostic')
+if md.analysis_type==DiagnosticAnalysisEnum,
 
 	%HUTTER ON ICESHELF WARNING
@@ -210,5 +210,5 @@
 
 %PROGNOSTIC
-if strcmp(md.analysis_type,'prognostic'),
+if md.analysis_type==PrognosticAnalysisEnum,
 
 	%VELOCITIES
@@ -220,5 +220,5 @@
 
 %THERMAL STEADY AND THERMAL TRANSIENT
-if strcmpi(md.analysis_type,'thermal'),
+if md.analysis_type==ThermalAnalysisEnum,
 
 	%EXTRUSION
@@ -240,5 +240,5 @@
 
 %THERMAL TRANSIENT
-if strcmpi(md.analysis_type,'thermal') & strcmp(md.sub_analysis_type,'transient'),
+if md.analysis_type==ThermalAnalysisEnum & md.sub_analysis_type==TransientAnalysisEnum,
 
 	%DT and NDT
@@ -263,5 +263,5 @@
 
 %PARAMETERS
-if strcmp(md.analysis_type,'parameters')
+if md.analysis_type==ParametersAnalysisEnum,
 
 	%PACKAGE
@@ -297,5 +297,5 @@
 
 %CONTROL
-if strcmpi(md.analysis_type,'control'),
+if md.analysis_type==ControlAnalysisEnum,
 
 	%CONTROL TYPE
@@ -352,14 +352,6 @@
 end
 
-%MESH
-if strcmpi(md.analysis_type,'mesh'),
-	%this solution is a little special. It should come right after the md=model;  operation. So a lot less checks!
-
-	bool=1;
-	return;
-end
-
 %MESH2GRID
-if strcmpi(md.analysis_type,'mesh2grid'),
+if md.analysis_type==Mesh2gridAnalysisEnum,
 	if ~strcmpi(md.cluster,'none'),
 		disp(['model is not correctly configured: mesh2grid not supported in parallel yet!']);