Index: /issm/trunk/src/m/classes/public/ismodelselfconsistent.m
===================================================================
--- /issm/trunk/src/m/classes/public/ismodelselfconsistent.m	(revision 2356)
+++ /issm/trunk/src/m/classes/public/ismodelselfconsistent.m	(revision 2357)
@@ -213,4 +213,5 @@
 		end
 	end
+
 end
 
@@ -218,8 +219,9 @@
 if md.analysis_type==PrognosticAnalysisEnum,
 
-	%VELOCITIES
-	if (size(md.vx,1)~=md.numberofgrids | size(md.vy,1)~=md.numberofgrids),
-		error(['model not consistent: a 3d velocity is required. Run ''diagnostic'' solution first!'])
-	end
+	%INITIAL VELOCITIES
+	fields={'vx','vy'};
+	testsize(md,fields,[md.numberofgrids 1]);
+	testnan(md,fields);
+
 end
 
@@ -257,10 +259,8 @@
 
 	%VELOCITIES AND PRESSURE
-	if (length(md.vx)~=md.numberofgrids | length(md.vy)~=md.numberofgrids | length(md.vz)~=md.numberofgrids),
-		error(['model not consistent: a 3d velocity is required. Run ''diagnostic'' solution first!'])
-	end
-	if (length(md.pressure)~=md.numberofgrids),
-		error(['model not consistent: pressure is required. Run ''diagnostic'' solution first!'])
-	end
+	fields={'vx','vy','vz','pressure'};
+	testsize(md,fields,[md.numberofgrids 1]);
+	testnan(md,fields);
+
 end