Changeset 24313 for issm/trunk/src/m/consistency/checkfield.m

Timestamp:

11/01/19 12:01:57 (5 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 24310

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/m/consistency/checkfield.m (modified) (2 diffs)

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

@@ -9 +9 @@
 %      - NaN: 1 if check that there is no NaN
 %      - Inf: 1 if check that there is no Inf
-%      - size: [lines cols], NaN for non checked dimensions
+%      - size: [lines cols], NaN for non checked dimensions, or 'universal' for any input type (nodal, element, time series, etc)
 %      - >:  greater than provided value
 %      - >=: greater or equal to provided value
@@ -48 +48 @@
 if exist(options,'size')
         fieldsize=getfieldvalue(options,'size');
-        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))]));
+        if ischar(fieldsize),
+                if strcmp(fieldsize,'universal'),
+
+                        %Check that vector size will not be confusing for ModelProcessorx
+                        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),
+                                error('number of vertices +1 is the same as number of elements');
+                        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),
+                                        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),
+                                        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),
+                                %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),
+                                        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),
+                                        md = checkmessage(md,getfieldvalue(options,'message',['field ''' fieldname ''' is not supported']));
+                                end
+
+                        %else not supported
+                        else
+                                md = checkmessage(md,getfieldvalue(options,'message',['field ''' fieldname ''' is not supported']));
+                        end
+                else
+                        error(['fieldsize ''' fieldsize ''' not supported yet']);
+                end
+        else
+                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(i))]));
+                        end
                 end
         end