Index: /issm/trunk/src/m/model/ismodelselfconsistent.m
===================================================================
--- /issm/trunk/src/m/model/ismodelselfconsistent.m	(revision 9000)
+++ /issm/trunk/src/m/model/ismodelselfconsistent.m	(revision 9001)
@@ -95,5 +95,5 @@
 %}}}
 %SIZE NUMBEROFNODES {{{1
-fields={'x','y','z','rheology_B','drag_coefficient','basal_melting_rate','surface_mass_balance','surface','thickness','bed','nodeonbed','nodeonsurface'};
+fields={'x','y','z','rheology_B','drag_coefficient','basal_melting_rate','surface','thickness','bed','nodeonbed','nodeonsurface'};
 checksize(md,fields,[md.numberofnodes 1]);
 %}}}
@@ -295,22 +295,4 @@
 	if ~ismember(md.isthermal,[0 1]),
 		message('model not consistent: isthermal should be a scalar (1 or 0)');
-	end
-
-	%Check that all forcings have length numberofnodes+1
-	forcingnames=fieldnames(md.forcings);
-	forcingfields={}; 
-	for i=1:length(forcingnames),
-		forcingfields{end+1}=['forcings.' forcingnames{i}];
-	end
-	checksize(md,forcingfields,[md.numberofnodes+1 NaN])
-
-	%Check that forcing columns are properly ordered
-	for i=1:length(forcingnames),
-		if any(md.forcings.(forcingnames{i})(end,:)~=sort(md.forcings.(forcingnames{i})(end,:))),
-			message(['model not consistent: model ' md.name ' forcings.' forcingnames{i} ' columns should be chronological']);
-		end
-		if any(md.forcings.(forcingnames{i})(end,1:end-1)==md.forcings.(forcingnames{i})(end,2:end)),
-			message(['model not consistent: model ' md.name ' forcings.' forcingnames{i} ' columns must not contain duplicate timesteps']);
-		end
 	end
 end
@@ -744,4 +726,18 @@
 end
 %}}}
+%checkforcing {{{1
+function checkforcing(md,fieldname)
+
+	eval(['field=md.' fieldname ';']);
+	checksize(md,{fieldname},[md.numberofnodes+1 NaN])
+
+	if any(field(end,:)~=sort(field(end,:))),
+		message(['model not consistent: model ' md.name ': ' fieldname ' columns should be chronological']);
+	end
+	if any(field(end,1:end-1)==field(end,2:end)),
+		message(['model not consistent: model ' md.name ': ' fieldname ' columns must not contain duplicate timesteps']);
+	end
+end
+%}}}
 
 %error messages