Changeset 23773

Timestamp:

03/08/19 09:10:40 (6 years ago)

Author:

Mathieu Morlighem

Message:

CHG: more flexible size check for multidimensional arrays

File:

• issm/trunk-jpl/src/m/consistency/checkfield.m (modified) (1 diff)

issm/trunk-jpl/src/m/consistency/checkfield.m

@@ -96 +96 @@
                 end
         else
-                if isnan(fieldsize(1)),
-                        if (size(field,2)~=fieldsize(2)),
-                                md = checkmessage(md,getfieldvalue(options,'message',...
-                                        ['field ''' fieldname ''' should have ' num2str(fieldsize(2)) ' columns']));
-                        end
-                elseif isnan(fieldsize(2)),
-                        if (size(field,1)~=fieldsize(1)),
-                                md = checkmessage(md,getfieldvalue(options,'message',...
-                                        ['field ''' fieldname ''' should have ' num2str(fieldsize(1)) ' lines']));
-                        end
-                else
-                        if ((size(field,1)~=fieldsize(1)) |  (size(field,2)~=fieldsize(2)))
-                                md = checkmessage(md,getfieldvalue(options,'message',...
-                                        ['field ''' fieldname ''' size should be ' num2str(fieldsize(1)) ' x ' num2str(fieldsize(2))]));
+                for i=1:numel(fieldsize)
+                        if ~isnan(fieldsize(i)) & (size(field,i)~=fieldsize(i))
+                                md = checkmessage(md,getfieldvalue(options,'message',['field ''' fieldname ''' dimension # ' num2str(i) ' should be of size ' num2str(fieldsize(2))]));
                         end
                 end