Index: /issm/trunk-jpl/src/m/classes/diagnostic.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/diagnostic.m	(revision 11923)
+++ /issm/trunk-jpl/src/m/classes/diagnostic.m	(revision 11924)
@@ -110,5 +110,5 @@
 				pos=find(md.mask.vertexongroundedice & md.mesh.vertexonbed);
 				if any(~isnan(md.diagnostic.referential(pos,:))),
-					checkmessage(['model ' md.miscellaneous.name ' not consistent. No referential should be specified for basal vertices of grounded ice']);
+					checkmessage(['no referential should be specified for basal vertices of grounded ice']);
 				end
 			end
Index: /issm/trunk-jpl/src/m/classes/initialization.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/initialization.m	(revision 11923)
+++ /issm/trunk-jpl/src/m/classes/initialization.m	(revision 11924)
@@ -46,5 +46,5 @@
 				%Triangle with zero velocity
 				if any(sum(abs(md.initialization.vx(md.mesh.elements)),2)==0 & sum(abs(md.initialization.vy(md.mesh.elements)),2)==0)
-					checkmessage('model not consistent: at least one triangle has all its vertices with a zero velocity');
+					checkmessage('at least one triangle has all its vertices with a zero velocity');
 				end
 			end
Index: /issm/trunk-jpl/src/m/classes/qmu.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/qmu.m	(revision 11923)
+++ /issm/trunk-jpl/src/m/classes/qmu.m	(revision 11924)
@@ -41,27 +41,27 @@
 
 			if md.qmu.params.evaluation_concurrency~=1,
-				checkmessage(['model not consistent: concurrency should be set to 1 when running dakota in library mode']);
+				checkmessage(['concurrency should be set to 1 when running dakota in library mode']);
 			end
 			if ~isempty(md.qmu.partition),
 				if numel(md.qmu.partition)~=md.mesh.numberofvertices,
-					checkmessage(['model not consistent: user supplied partition for qmu analysis should have size md.mesh.numberofvertices x 1 ']);
+					checkmessage(['user supplied partition for qmu analysis should have size md.mesh.numberofvertices x 1 ']);
 				end
 				if find(md.qmu.partition)>=md.mesh.numberofvertices,
-					checkmessage(['model not consistent: user supplied partition should be indexed from 0 (c-convention)']);
+					checkmessage(['user supplied partition should be indexed from 0 (c-convention)']);
 				end
 				if min(md.qmu.partition)~=0,
-					checkmessage(['model not consistent: partition vector not indexed from 0 on']);
+					checkmessage(['partition vector not indexed from 0 on']);
 				end
 				if max(md.qmu.partition)>=md.mesh.numberofvertices,
-					checkmessage(['model not consistent: partition vector cannot have maximum index larger than number of nodes']);
+					checkmessage(['partition vector cannot have maximum index larger than number of nodes']);
 				end
 				if ~isempty(find(md.qmu.partition<0)),
-					checkmessage(['model not consistent: partition vector cannot have values less than 0']);
+					checkmessage(['partition vector cannot have values less than 0']);
 				end
 				if ~isempty(find(md.qmu.partition>=md.qmu.numberofpartitions)),
-					checkmessage(['model not consistent: partition vector cannot have values more than md.qmu.numberofpartitions-1']);
+					checkmessage(['partition vector cannot have values more than md.qmu.numberofpartitions-1']);
 				end
 				if max(md.qmu.partition)>=md.qmu.numberofpartitions,
-					checkmessage(['model not consistent: for qmu analysis, partitioning vector cannot go over npart, number of partition areas']);
+					checkmessage(['for qmu analysis, partitioning vector cannot go over npart, number of partition areas']);
 				end
 			end
@@ -69,5 +69,5 @@
 			if ~strcmpi(md.cluster.name,'none'),
 				if md.settings.waitonlock==0,
-					checkmessage(['model is not correctly configured: waitonlock should be activated when running qmu in parallel mode!']);
+					checkmessage(['waitonlock should be activated when running qmu in parallel mode!']);
 				end
 			end
Index: /issm/trunk-jpl/src/m/classes/rifts.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/rifts.m	(revision 11923)
+++ /issm/trunk-jpl/src/m/classes/rifts.m	(revision 11924)
@@ -29,5 +29,5 @@
 			if numrifts,
 				if ~(md.mesh.dimension==2),
-					checkmessage(['model not consistent: models with rifts are only supported in 2d for now!']);
+					checkmessage(['models with rifts are only supported in 2d for now!']);
 				end
 				if ~isstruct(obj.riftstruct),
Index: /issm/trunk-jpl/src/m/classes/solver.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/solver.m	(revision 11923)
+++ /issm/trunk-jpl/src/m/classes/solver.m	(revision 11924)
@@ -52,5 +52,10 @@
 		 end % }}}
 		 function checkconsistency(obj,md,solution,analyses) % {{{
-			 %Nothing checked
+			 analyses=properties(obj);
+			 for i=1:numel(analyses),
+				 if isempty(fieldnames(obj.(analyses{i})))
+					 checkmessage(['md.solver.' analyses{i} ' is empty']);
+				 end
+			 end
 		 end % }}}
 		 function PetscFile(solver,filename) % {{{
Index: /issm/trunk-jpl/src/m/classes/steadystate.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/steadystate.m	(revision 11923)
+++ /issm/trunk-jpl/src/m/classes/steadystate.m	(revision 11924)
@@ -32,9 +32,9 @@
 
 			if md.timestepping.time_step~=0,
-				checkmessage(['model not consistent: for a steadystate computation, timestepping.time_step must be zero.']);
+				checkmessage(['for a steadystate computation, timestepping.time_step must be zero.']);
 			end
 
 			if isnan(md.diagnostic.reltol),
-				checkmessage(['model not consistent: for a steadystate computation, diagnostic.reltol (relative convergence criterion) must be defined!']);
+				checkmessage(['for a steadystate computation, diagnostic.reltol (relative convergence criterion) must be defined!']);
 			end
 		end % }}}
