Changeset 1001 for trunk/src/plot_field.m

Timestamp:

Feb 27, 2017, 9:28:27 AM (7 years ago)

Author:

sommeria

Message:

tubcorrelation added, compilation improved to accept tranform fct

File:

• trunk/src/plot_field.m (modified) (4 diffs)

trunk/src/plot_field.m

@@ -696 +696 @@
             vec_U=Data.(Data.ListVarName{CellInfo{icell}.VarIndex_vector_x});
             vec_V=Data.(Data.ListVarName{CellInfo{icell}.VarIndex_vector_y});
+            XName=Data.ListVarName{CellInfo{icell}.CoordIndex(end)};
+            YName=Data.ListVarName{CellInfo{icell}.CoordIndex(end-1)};
             if strcmp(CellInfo{icell}.CoordType,'scattered')%2D field with unstructured coordinates
-                XName=Data.ListVarName{CellInfo{icell}.CoordIndex(end)};
-                YName=Data.ListVarName{CellInfo{icell}.CoordIndex(end-1)};
                 vec_X=reshape(Data.(XName),[],1); %transform vectors in column matlab vectors
                 vec_Y=reshape(Data.(YName),[],1);
             elseif strcmp(CellInfo{icell}.CoordType,'grid')%2D field with structured coordinates
-                y=Data.(Data.ListVarName{CellInfo{icell}.CoordIndex(end-1)});
-                x=Data.(Data.ListVarName{CellInfo{icell}.CoordIndex(end)});
+                y=Data.(YName);
+                x=Data.(XName);
                 if numel(y)==2 % y defined by first and last values on aregular mesh
                     y=linspace(y(1),y(2),size(vec_U,1));
@@ -744 +744 @@
             XName=Data.ListVarName{ivar_X};
             YName=Data.ListVarName{ivar_Y};
-            eval(['Coord_x=reshape(Data.' XName ',1,[]);'])
-            eval(['Coord_y=reshape(Data.' YName ',1,[]);'])
+            Coord_x=reshape(Data.(XName),1,[]);
+            Coord_y=reshape(Data.(YName),1,[]);
             [A,Coord_x,Coord_y]=proj_grid(Coord_x',Coord_y',A',[],[],'np>256');  % interpolate on a grid
             if isfield(Data,'VarAttribute')
@@ -757 +757 @@
         elseif strcmp(CellInfo{icell}.CoordType,'grid')%2D field with structured coordinates
             YName=Data.ListVarName{CellInfo{icell}.CoordIndex(end-1)};
+            XName=Data.ListVarName{CellInfo{icell}.CoordIndex(end)};
             Coord_y=Data.(YName);
-            Coord_x=Data.(Data.ListVarName{CellInfo{icell}.CoordIndex(end)});
+            Coord_x=Data.(XName);
             test_interp_X=0; %default, regularly meshed X coordinate
             test_interp_Y=0; %default, regularly meshed Y coordinate
@@ -774 +775 @@
                 DCoord_y_max=max(DCoord_y);
                 if sign(DCoord_y_min)~=sign(DCoord_y_max);% =1 for increasing values, 0 otherwise
-                    errormsg=['errror in plot_field.m: non monotonic dimension variable ' Data.ListVarName{VarRole.coord(1)} ];
+                    errormsg=['errror in plot_field.m: non monotonic dimension variable ' YName ];
                     return
                 end