Index: /issm/trunk/src/m/model/ismodelselfconsistent.m
===================================================================
--- /issm/trunk/src/m/model/ismodelselfconsistent.m	(revision 7690)
+++ /issm/trunk/src/m/model/ismodelselfconsistent.m	(revision 7691)
@@ -288,4 +288,51 @@
 %}}}
 
+%Solution specific check
+%TRANSIENT {{{1
+if (md.solution_type==Transient2DSolutionEnum | md.solution_type==Transient3DSolutionEnum),
+
+	if md.dt<=0,
+		error('model not consistent: field dt must be positive for a transient run')
+	end
+
+	if(md.cfl_coefficient>1 | md.cfl_coefficient<0),
+		error(['model not consistent: model ' md.name ' cfl_coefficient field should between  0 and 1']);
+	end
+end
+%}}}
+%STEADYSTATE{{{1
+if md.solution_type==SteadystateSolutionEnum,
+
+	%NDT
+	if md.dt~=0,
+		error(['model not consistent: for a steadystate computation, dt must be zero.']);
+	end
+
+	%eps: 
+	if isnan(md.eps_rel),
+		error(['model not consistent: for a steadystate computation, eps_rel (relative convergence criterion) must be defined!']);
+	end
+end
+%}}}
+%GROUNDINGLINEMIGRATION2D{{{1
+if md.solution_type==GroundingLineMigration2DSolutionEnum,
+	if strcmpi(md.cluster.name,'none'),
+		error(['model not consistent: ' md.solution_type ' is only implemented in parallel mode !'])
+	end
+
+	if md.dt<=0,
+		error('model not consistent: field dt must be positive for a transient run')
+	end
+
+	%recursive call to ismodelselfconsistent
+	if (md.dim~=2),
+		error(['model not consistent: for a ' md.solution_type ' computation, the grounding line module is only implemented in 2d !'])
+	end
+
+	if(md.cfl_coefficient>1 | md.cfl_coefficient<0),
+		error(['model not consistent: model ' md.name ' cfl_coefficient field should between  0 and 1']);
+	end
+end
+%}}}
 %FLAIM {{{1
 if (md.solution_type == FlaimSolutionEnum),
@@ -293,5 +340,5 @@
 		error(['model not consistent: fm_tracks file ''' md.fm_tracks ''' must exist.']);
 	end
-%   probably going to need some checks on fm_flightreqs here
+	%   probably going to need some checks on fm_flightreqs here
 	if (numel(md.fm_criterion) ~= md.numberofgrids) && (numel(md.fm_criterion) ~= md.numberofelements)
 		error(['model not consistent: fm_criterion vector must have number of nodes (' int2str(md.numberofgrids) ') or elements (' int2str(md.numberofelements) ') values, not ' int2str(numel(md.fm_criterion)) ' values.']);
@@ -300,51 +347,5 @@
 %}}}
 
-%Solution specific check
-%TRANSIENT {{{1
-if (md.solution_type==Transient2DSolutionEnum | md.solution_type==Transient3DSolutionEnum),
-
-	if md.dt<=0,
-		error('model not consistent: field dt must be positive for a transient run')
-	end
-
-	if(md.cfl_coefficient>1 | md.cfl_coefficient<0),
-		error(['model not consistent: model ' md.name ' cfl_coefficient field should between  0 and 1']);
-	end
-end
-%}}}
-%STEADYSTATE{{{1
-if md.solution_type==SteadystateSolutionEnum,
-
-	%NDT
-	if md.dt~=0,
-		error(['model not consistent: for a steadystate computation, dt must be zero.']);
-	end
-
-	%eps: 
-	if isnan(md.eps_rel),
-		error(['model not consistent: for a steadystate computation, eps_rel (relative convergence criterion) must be defined!']);
-	end
-end
-%}}}
-%GROUNDINGLINEMIGRATION2D{{{1
-if md.solution_type==GroundingLineMigration2DSolutionEnum,
-	if strcmpi(md.cluster.name,'none'),
-		error(['model not consistent: ' md.solution_type ' is only implemented in parallel mode !'])
-	end
-
-	if md.dt<=0,
-		error('model not consistent: field dt must be positive for a transient run')
-	end
-
-	%recursive call to ismodelselfconsistent
-	if (md.dim~=2),
-		error(['model not consistent: for a ' md.solution_type ' computation, the grounding line module is only implemented in 2d !'])
-	end
-
-	if(md.cfl_coefficient>1 | md.cfl_coefficient<0),
-		error(['model not consistent: model ' md.name ' cfl_coefficient field should between  0 and 1']);
-	end
-end
-%}}}
+%Now check all analyses called for a given solution
 %ANALYSESCHECKS {{{1
 [analyses,numanalyses,solutioncore]=SolutionConfiguration(md.solution_type);