Index: /issm/trunk/src/m/classes/public/ismodelselfconsistent.m
===================================================================
--- /issm/trunk/src/m/classes/public/ismodelselfconsistent.m	(revision 4302)
+++ /issm/trunk/src/m/classes/public/ismodelselfconsistent.m	(revision 4303)
@@ -17,5 +17,5 @@
 
 %check analysis
-if (md.analysis_type==Transient2DAnalysisEnum | md.analysis_type==Transient3DAnalysisEnum),
+if (md.analysis_type==Transient2DSolutionEnum | md.analysis_type==Transient3DSolutionEnum),
 	if md.dt<=0,
 		error('model not consistent: field dt must be positive for a transient run')
@@ -24,7 +24,7 @@
 	%recursive call to ismodelselfconsistent
 	if (md.dim==2),
-		analysis=[DiagnosticAnalysisEnum PrognosticAnalysisEnum];
+		analysis=[DiagnosticSolutionEnum PrognosticSolutionEnum];
 	else
-		analysis=[DiagnosticAnalysisEnum PrognosticAnalysisEnum ThermalAnalysisEnum];
+		analysis=[DiagnosticSolutionEnum PrognosticSolutionEnum ThermalSolutionEnum];
 	end
 
@@ -66,8 +66,8 @@
 	error(['model not consistent: no elements type set for this model. at least one of ismacayealpattyn, ishutter and isstokes need to be =1']);
 end
-if (md.analysis_type==DiagnosticAnalysisEnum & any(ismember(MacAyealFormulationEnum,md.elements_type(:,1)) & ismember(PattynFormulationEnum,md.elements_type(:,1))))
+if (md.analysis_type==DiagnosticSolutionEnum & any(ismember(MacAyealFormulationEnum,md.elements_type(:,1)) & ismember(PattynFormulationEnum,md.elements_type(:,1))))
 	error(['model not consistent: coupling MacAyeal/Pattyn not implemented yet']);
 end
-if (md.isstokes & md.analysis_type==Transient3DAnalysisEnum());
+if (md.isstokes & md.analysis_type==Transient3DSolutionEnum());
 	error(['model not consistent: Stokes transient not implemented yet']);
 end
@@ -221,5 +221,5 @@
 
 %DIAGNOSTIC
-if md.analysis_type==DiagnosticAnalysisEnum,
+if md.analysis_type==DiagnosticSolutionEnum,
 
 	%CHECK THAT WE ARE NOT FULLY CONSTRAINED
@@ -256,5 +256,5 @@
 
 %PROGNOSTIC
-if md.analysis_type==PrognosticAnalysisEnum,
+if md.analysis_type==PrognosticSolutionEnum,
 
 	%INITIAL VELOCITIES
@@ -273,5 +273,5 @@
 
 %STEADYSTATE
-if md.analysis_type==SteadystateAnalysisEnum,
+if md.analysis_type==SteadystateSolutionEnum,
 
 	%NDT
@@ -297,5 +297,5 @@
 
 %THERMAL STEADY AND THERMAL TRANSIENT
-if md.analysis_type==ThermalAnalysisEnum,
+if md.analysis_type==ThermalSolutionEnum,
 
 	%EXTRUSION
@@ -317,5 +317,5 @@
 
 %THERMAL TRANSIENT
-if md.analysis_type==ThermalAnalysisEnum & md.dt~=0,
+if md.analysis_type==ThermalSolutionEnum & md.dt~=0,
 
 	%DT and NDT
@@ -335,5 +335,5 @@
 
 %BALANCEDTHICKNESS
-if md.analysis_type==BalancedthicknessAnalysisEnum
+if md.analysis_type==BalancedthicknessSolutionEnum
 
 	%VELOCITIES MELTING AND ACCUMULATION
@@ -349,5 +349,5 @@
 
 %BALANCEDTHICKNESS2
-if md.analysis_type==Balancedthickness2AnalysisEnum
+if md.analysis_type==Balancedthickness2SolutionEnum
 
 	%VELOCITIES MELTING AND ACCUMULATION
@@ -363,5 +363,5 @@
 
 %BALANCEDVELOCITIES
-if md.analysis_type==BalancedvelocitiesAnalysisEnum
+if md.analysis_type==BalancedvelocitiesSolutionEnum
 
 	%VELOCITIES MELTING AND ACCUMULATION