Changeset 25836 for issm/trunk/src/m/plot/processdata.m

Timestamp:

12/08/20 08:45:53 (4 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 25834

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/m/plot/processdata.m (modified) (4 diffs)

issm/trunk/src/m/plot/processdata.m

@@ -20 +20 @@
 if isstruct(data),
         disp('data provided is a struct with the following fields:');
-        F=fields(data);
+        F=fieldnames(data);
         for i=1:numel(F),
                 disp(['   ' num2str(i) ': ' F{i} ]);
@@ -39 +39 @@
 if strcmp(domaintype(md.mesh),'2Dvertical'),
         [data datatype] = processdata(md.mesh,md,data,options);
+        return;
+end
+
+%special case for coord latlong: 
+if strcmpi(getfieldvalue(options,'coord','xy'),'latlon') | strcmpi(getfieldvalue(options,'coord','xy'),'latlong'),
+        [data datatype] = processdatalatlong(md,data,options);
         return;
 end
@@ -81 +87 @@
 end
 
-%quiver?
-if datasize(2)>1,
-        datatype=3;
-
-        %check number of columns, add zeros if necessary,
-        if (dimension(md.mesh)==3)
-                if datasize(2)==2,
-                        data=[data, zeros(datasize(1),1)];
-                elseif datasize(2)~=3,
-                        error('plotmodel error message: data provided should have 2 or 3 columns for quiver plot, and 1 for regular plot');
-                end
+%quiver or patch?
+if datasize(2)>1
+        if datasize(2)==2 | datasize(2)==3
+                datatype=3;
+                %check number of columns, add zeros if necessary,
+                if (dimension(md.mesh)==3)
+                        if datasize(2)==2,
+                                data=[data, zeros(datasize(1),1)];
+                        elseif datasize(2)~=3,
+                                error('plotmodel error message: data provided should have 2 or 3 columns for quiver plot, and 1 for regular plot');
+                        end
+                end
+        else
+                %must be a patch
+                disp('Assuming that data provided is a patch');
+                index = md.mesh.elements;
+                if size(data,2)<size(index,2)
+                        error('Data size not supported yet');
+                end
+                datanew = zeros(numberofvertices,1);
+                datanew(md.mesh.elements) = data(:,1:size(index,2));
+                data = datanew;
+                datasize = [numberofvertices 1];
+                %---> go to node data
         end
 end
@@ -192 +211 @@
 
 %layer projection? 
-if getfieldvalue(options,'layer',0)>=1,
+if getfieldvalue(options,'layer',0)>=1
         data=project2d(md,data,getfieldvalue(options,'layer')); %project onto 2d mesh
+end
+if getfieldvalue(options,'depthaverage',0)
+        data=DepthAverage(md,data); %project onto 2d mesh
 end