Changeset 16470 for issm/trunk-jpl/src/m/plot/processdata.m

Timestamp:

10/20/13 20:31:07 (11 years ago)

Author:

Mathieu Morlighem

Message:

NEW: merging thermal_core with enthalpy_core (removing EnthalpySolution), and replacing InputToResult by OutputRequest

File:

• issm/trunk-jpl/src/m/plot/processdata.m (modified) (1 diff)

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

@@ -37 +37 @@
 end
 
-%Process Patch
-if isstruct(data) 
-        if (isprop(data,'index') & isprop(data,'value')),
-                if data.interpolation(1)==P1Enum(),
-                        data=data.value;
-                        data=data';
-                        data=data(:);
-                        datatype=4;
-                elseif data.interpolation(1)==P0Enum(),
-                        data=data.value;
-                        datatype=5;
-                else
-                        error(['interpolation ' data.interpolation(1) ' not supported yet']);
-                end
-        else
-                error('structure other than Patch not supported yet');
-        end
-else
-        %initialize datatype
-        datatype=0;
-end
+%initialize datatype
+datatype=0;
 
 %get datasize
 datasize=size(data);
 
-%non patch processing
-if datatype~=4 & datatype~=5,
+%transpose data if necessary
+if (size(data,2) > size(data,1)),
+        data=data';
+end
+datasize=size(data);
 
-        %transpose data if necessary
-        if (size(data,2) > size(data,1)),
-                data=data';
-        end
-        datasize=size(data);
+%convert to double if necessary
+if ~isnumeric(data);
+        disp('processdata info message: data is not numeric (logical?). Converted to double');
+        data=double(data);
+end
 
-        %convert to double if necessary
-        if ~isnumeric(data);
-                disp('processdata info message: data is not numeric (logical?). Converted to double');
-                data=double(data);
-        end
+%check length
+if datasize(1)~=md.mesh.numberofvertices & datasize(1)~=md.mesh.numberofelements & datasize(1)~=md.mesh.numberofvertices*6 & (md.mesh.dimension==3 & ~(datasize(1)==numberofelements2d | datasize(1)==numberofvertices2d))
+        error('plotmodel error message: data not supported yet');
+end
 
-        %check length
-        if datasize(1)~=md.mesh.numberofvertices & datasize(1)~=md.mesh.numberofelements & datasize(1)~=md.mesh.numberofvertices*6 & (md.mesh.dimension==3 & ~(datasize(1)==numberofelements2d | datasize(1)==numberofvertices2d))
-                error('plotmodel error message: data not supported yet');
-        end
+%quiver?
+if datasize(2)>1,
+        datatype=3;
 
-        %quiver?
-        if datasize(2)>1,
-                datatype=3;
-
-                %check number of columns, add zeros if necessary,
-                if (md.mesh.dimension==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
+        %check number of columns, add zeros if necessary,
+        if (md.mesh.dimension==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
                 %elseif ((md.mesh.dimension==2) & datasize(2)~=2),
                 %       error('plotmodel error message: data provided should have 2 columns for quiver plot, and 1 for regular plot');
-                end
         end
+end
 
-        %treat the case datasize(1)=6*nodes
-        if datasize(1)==6*md.mesh.numberofvertices
-                %keep the only norm of data
-                data1=data(1:6:md.mesh.numberofvertices*6,:);
-                data2=data(2:6:md.mesh.numberofvertices*6,:);
-                data=sqrt(data1.^2+data2.^2);
-                datasize(1)=md.mesh.numberofvertices;
-                %---> go to node data
-        end
+%treat the case datasize(1)=6*nodes
+if datasize(1)==6*md.mesh.numberofvertices
+        %keep the only norm of data
+        data1=data(1:6:md.mesh.numberofvertices*6,:);
+        data2=data(2:6:md.mesh.numberofvertices*6,:);
+        data=sqrt(data1.^2+data2.^2);
+        datasize(1)=md.mesh.numberofvertices;
+        %---> go to node data
+end
 
-        %treat the case datasize(1)=nodes2d
-        if (md.mesh.dimension==3 & datasize(1)==numberofvertices2d),
-                data=project3d(md,'vector',data,'type','node');
-                datasize(1)=md.mesh.numberofvertices;
-                %---> go to node data
-        end
+%treat the case datasize(1)=nodes2d
+if (md.mesh.dimension==3 & datasize(1)==numberofvertices2d),
+        data=project3d(md,'vector',data,'type','node');
+        datasize(1)=md.mesh.numberofvertices;
+        %---> go to node data
+end
 
-        %treat the case datasize(1)=nodes2d
-        if (md.mesh.dimension==3 & datasize(1)==numberofelements2d),
-                data=project3d(md,'vector',data,'type','element');
-                datasize(1)=md.mesh.numberofelements;
-                %---> go to node data
-        end
+%treat the case datasize(1)=nodes2d
+if (md.mesh.dimension==3 & datasize(1)==numberofelements2d),
+        data=project3d(md,'vector',data,'type','element');
+        datasize(1)=md.mesh.numberofelements;
+        %---> go to node data
+end
 
-        %smoothing?
-        if exist(options,'smooth')
-                data=averaging(md,data,getfieldvalue(options,'smooth'));
-                datasize(1)=md.mesh.numberofvertices;
-                %---> go to node data
-        end
+%smoothing?
+if exist(options,'smooth')
+        data=averaging(md,data,getfieldvalue(options,'smooth'));
+        datasize(1)=md.mesh.numberofvertices;
+        %---> go to node data
 end