Changeset 1041 for trunk/src/read_field.m

Timestamp:

May 10, 2018, 8:30:27 AM (7 years ago)

Author:

sommeria

Message:

psmn parameters updated + miscenaleous

File:

• trunk/src/read_field.m (modified) (8 diffs)

trunk/src/read_field.m

@@ -101 +101 @@
         checkU=0;
         checkV=0;
+        % scan the list InputField
         for ilist=1:numel(InputField)
             % look for input variables to read
             r=regexp(InputField{ilist},'(?<Operator>(^vec|^norm))\((?<UName>.+),(?<VName>.+)\)$','names');
             if isempty(r)%  no operator used
-                if isempty(find(strcmp(InputField{ilist},ListVar)))
+                if isempty(find(strcmp(InputField{ilist},ListVar),1))
                     ListVar=[ListVar InputField(ilist)];%append the variable name if not already in the list
                     ListInputField=[ListInputField InputField(ilist)];
@@ -111 +112 @@
                 end
                 if check_colorvar(ilist)
-                    if isempty(find(strcmp(InputField{ilist},ListVar)))
+                    if isempty(find(strcmp(InputField{ilist},ListVar),1))
                     Role{numel(ListVar)}='ancillary';% not projected with interpolation
                     ProjModeRequest{numel(ListVar)}='';
@@ -118 +119 @@
                     Role{numel(ListVar)}='scalar';
                     ProjModeRequest{numel(ListVar)}='interp_lin';%scalar field (requires interpolation for plot)
+                end
+                if isfield(ParamIn,'Coord_y')
+                    if ~isempty(strcmp(InputField{ilist},ParamIn.Coord_y))
+                        Role{numel(ListVar)}='coord_y';
+                    end
                 end
             else  % an operator 'vec' or 'norm' is used
@@ -139 +145 @@
                     Role=[Role {'vector_y'}];
                     ProjModeRequest=[ProjModeRequest {ProjModeRequestVar}];
-                    ListInputField=[ListInputField InputField(ilist)];
-                    
+                    ListInputField=[ListInputField InputField(ilist)];                
                 else
                     checkV=1;
@@ -301 +306 @@
     Npz=1;%default
     npxy=size(A);
-    %     Rangx=[0.5 npxy(2)-0.5]; % coordinates of the first and last pixel centers
-    %     Rangy=[npxy(1)-0.5 0.5]; %
     Field.NbDim=2;%default
     Field.AName='image';
@@ -318 +321 @@
                 ParamOut.Npy=npxy(1);
             end
-%             Field.VarAttribute{3}.Mesh=1;
         else
             Field.NbDim=3;
@@ -330 +332 @@
                 ParamOut.Npy=npxy(2);
             end
-%             Field.VarAttribute{4}.Mesh=1;
         end
     else
@@ -336 +337 @@
         Field.Coord_y=[npxy(1)-0.5 0.5];
         Field.Coord_x=[0.5 npxy(2)-0.5]; % coordinates of the first and last pixel centers
-%        ParamOut.Npx=npxy(2);% display image size on the interface
- %       ParamOut.Npy=npxy(1);
-%         Field.VarAttribute{3}.Mesh=1;
     end
     Field.A=A;
     Field.CoordUnit='pixel'; %used for mouse_motion
-        
-end
-
-
-
+end
+
+
+