Index: /issm/trunk-jpl/src/m/consistency/checkfield.m
===================================================================
--- /issm/trunk-jpl/src/m/consistency/checkfield.m	(revision 28228)
+++ /issm/trunk-jpl/src/m/consistency/checkfield.m	(revision 28229)
@@ -29,5 +29,5 @@
 
 %get field: 
-if exist(options,'field'), 
+if exist(options,'field')
 	field=getfieldvalue(options,'field'); 
 	fieldname=getfieldvalue(options,'fieldname','no fieldname'); 
@@ -39,5 +39,5 @@
 %check empty
 if exist(options,'empty')
-	if isempty(field),
+	if isempty(field)
 		md = checkmessage(md,getfieldvalue(options,'message',...
 			['field ''' fieldname ''' is empty']));
@@ -48,41 +48,41 @@
 if exist(options,'size')
 	fieldsize=getfieldvalue(options,'size');
-	if ischar(fieldsize),
-		if strcmp(fieldsize,'universal'),
+	if ischar(fieldsize)
+		if strcmp(fieldsize,'universal')
 
 			%Check that vector size will not be confusing for ModelProcessorx
-			if (md.mesh.numberofvertices==md.mesh.numberofelements),
+			if (md.mesh.numberofvertices==md.mesh.numberofelements)
 				error('number of vertices is the same as number of elements');
-			elseif (md.mesh.numberofvertices+1==md.mesh.numberofelements),
+			elseif (md.mesh.numberofvertices+1==md.mesh.numberofelements)
 				error('number of vertices +1 is the same as number of elements');
-			elseif (md.mesh.numberofvertices==md.mesh.numberofelements+1),
+			elseif (md.mesh.numberofvertices==md.mesh.numberofelements+1)
 				error('number of vertices is the same as number of elements +1');
 			end
 
 			%Uniform field
-			if (size(field,1)==1),
-				if (size(field,2)~=1),
+			if (size(field,1)==1)
+				if (size(field,2)~=1)
 					md = checkmessage(md,getfieldvalue(options,'message',['field ''' fieldname ''' is not supported']));
 				end
 
 			%vertex oriented input, only one column allowed
-			elseif (size(field,1)==md.mesh.numberofvertices),
-				if (size(field,2)~=1),
+			elseif (size(field,1)==md.mesh.numberofvertices)
+				if (size(field,2)~=1)
 					md = checkmessage(md,getfieldvalue(options,'message',['field ''' fieldname ''' is not supported']));
 				end
 
 			%element oriented input, one or more column (patch) is ok 
-			elseif (size(field,1)==md.mesh.numberofelements),
+			elseif (size(field,1)==md.mesh.numberofelements)
 				%nothing to do here (either constant per element, or defined on nodes)
 
 			%vertex time series
-			elseif (size(field,1)==md.mesh.numberofvertices+1),
-				if (size(field,2)<=1),
+			elseif (size(field,1)==md.mesh.numberofvertices+1)
+				if (size(field,2)<=1)
 					md = checkmessage(md,getfieldvalue(options,'message',['field ''' fieldname ''' is not supported']));
 				end
 
 			%element time series
-			elseif (size(field,1)==md.mesh.numberofelements+1),
-				if (size(field,2)<=1),
+			elseif (size(field,1)==md.mesh.numberofelements+1)
+				if (size(field,2)<=1)
 					md = checkmessage(md,getfieldvalue(options,'message',['field ''' fieldname ''' is not supported']));
 				end
@@ -122,7 +122,6 @@
 
 %check NaN
-if getfieldvalue(options,'NaN',0);
-	field2=reshape(field,prod(size(field)),1);
-	if any(isnan(field2)),
+if getfieldvalue(options,'NaN',0)
+	if any(isnan(field(:)))
 		md = checkmessage(md,getfieldvalue(options,'message',...
 			['NaN values found in field ''' fieldname '''']));
@@ -131,7 +130,6 @@
 
 %check Inf
-if getfieldvalue(options,'Inf',0);
-	field2=reshape(field,prod(size(field)),1);
-	if any(isinf(field2)),
+if getfieldvalue(options,'Inf',0)
+	if any(isinf(field(:)))
 		md = checkmessage(md,getfieldvalue(options,'message',...
 			['Inf values found in field ''' fieldname '''']));
@@ -140,6 +138,6 @@
 
 %check cell
-if getfieldvalue(options,'cell',0);
-	if ~iscell(field),
+if getfieldvalue(options,'cell',0)
+	if ~iscell(field)
 		md = checkmessage(md,getfieldvalue(options,'message',...
 			['field ''' fieldname ''' should be a cell']));
@@ -150,5 +148,5 @@
 if exist(options,'values')
 	fieldvalues=getfieldvalue(options,'values');
-	if iscell(fieldvalues), %strings
+	if iscell(fieldvalues) %strings
 		if ischar(field) | iscell(fieldvalues),
 			if any(~ismember(field,fieldvalues)),
@@ -169,6 +167,6 @@
 		end
 	else
-		field2=reshape(field,prod(size(field)),1);
-		if isnumeric(field),
+		field2=field(:);
+		if isnumeric(field)
 			if any(~ismember(field2,fieldvalues)),
 				md = checkmessage(md,getfieldvalue(options,'message',...
@@ -185,5 +183,5 @@
 if exist(options,'>=')
 	lowerbound=getfieldvalue(options,'>=');
-	field2=reshape(field,prod(size(field)),1);
+	field2=field(:);
 	if getfieldvalue(options,'timeseries',0),       field2=reshape(field(1:end-1,:),prod(size(field(1:end-1,:))),1); end
 	if getfieldvalue(options,'singletimeseries',0), field2=reshape(field(1,:),prod(size(field(1,:))),1); end
@@ -227,5 +225,5 @@
 
 %Check row of stringrow
-if getfieldvalue(options,'stringrow',0),
+if getfieldvalue(options,'stringrow',0)
 	if(size(field,1)~=1 & size(field,1)~=0),
 		md = checkmessage(md,getfieldvalue(options,'message',...
@@ -253,16 +251,16 @@
 
 %Check forcings (size and times)
-if getfieldvalue(options,'timeseries',0),
+if getfieldvalue(options,'timeseries',0)
 	if (size(field,1)==md.mesh.numberofvertices | size(field,1)==md.mesh.numberofelements),
-		if size(field,2)~=1,
+		if size(field,2)~=1
 			md = checkmessage(md,getfieldvalue(options,'message',...
 				['field ''' fieldname ''' should have only one column as there are md.mesh.numberofvertices lines']));
 		end
-	elseif (size(field,1)==md.mesh.numberofvertices+1 | size(field,1)==md.mesh.numberofelements+1),
+	elseif (size(field,1)==md.mesh.numberofvertices+1 | size(field,1)==md.mesh.numberofelements+1)
 		if any(field(end,:)~=sort(field(end,:))),
 			md = checkmessage(md,getfieldvalue(options,'message',...
 				['field ''' fieldname ''' columns should be sorted chronologically']));
 		end
-		if any(field(end,1:end-1)==field(end,2:end)),
+		if any(field(end,1:end-1)==field(end,2:end))
 			md = checkmessage(md,getfieldvalue(options,'message',...
 				['field ''' fieldname ''' columns must not contain duplicate timesteps']));
@@ -275,16 +273,16 @@
 
 %Check single value forcings (size and times)
-if getfieldvalue(options,'singletimeseries',0),
+if getfieldvalue(options,'singletimeseries',0)
 	if size(field,1)==2
-		if any(field(end,:)~=sort(field(end,:))),
+		if any(field(end,:)~=sort(field(end,:)))
 			md = checkmessage(md,getfieldvalue(options,'message',...
 				['field ''' fieldname ''' columns should be sorted chronologically']));
 		end
-		if any(field(end,1:end-1)==field(end,2:end)),
+		if any(field(end,1:end-1)==field(end,2:end))
 			md = checkmessage(md,getfieldvalue(options,'message',...
 				['field ''' fieldname ''' columns must not contain duplicate timesteps']));
 		end
-	elseif size(field,1)==1,
-		if size(field,2)~=1, 
+	elseif size(field,1)==1
+		if size(field,2)~=1 
 			md = checkmessage(md,getfieldvalue(options,'message',...
 				['field ''' fieldname ''' should be either a scalar or have 2 lines']));