Changeset 516 for trunk

Timestamp:

Aug 16, 2012, 8:47:11 AM (13 years ago)

Author:

sommeria

Message:

various bug corrections

Location:

trunk/src

Files:

• calc_field_interp.m (modified) (1 diff)
• calc_tps.m (modified) (2 diffs)
• find_field_cells.m (modified) (1 diff)
• get_field.fig (modified) (previous)
• proj_field.m (modified) (3 diffs)
• read_GUI.m (modified) (1 diff)
• read_civdata.m (modified) (3 diffs)
• read_field.m (modified) (2 diffs)
• uvmat.m (modified) (1 diff)

trunk/src/calc_field_interp.m

@@ -17 +17 @@
 function [VarVal,ListVarName,VarAttribute,errormsg]=calc_field_interp(Coord,FieldVar,Operation,XI,YI)
 
-%% nbre of subdomains
-% if ndims(Coord_interp)==3
-%     nb_coord=size(Coord_interp,3);
-%     npx=size(Coord_interp,2);
-%     npy=size(Coord_interp,1);
-%     nb_sites=npx*npy;
-%     Coord_interp=reshape(Coord_interp,nb_sites,nb_coord);
-% else
-%     nb_coord=size(Coord_interp,2);
-%     nb_sites=size(Coord_interp,1);
-% end
 VarVal=[];
 ListVarName={};

trunk/src/calc_tps.m

@@ -15 +15 @@
         if ~isempty(VarType.vector_x)&&~isempty(VarType.vector_y)
             Attr=DataIn.VarAttribute{VarType.vector_x};
-            if ~isfield(Attr,'VarIndex_tps')&& (checkall || (isfield(Attr,'FieldRequest')&&strcmp(Attr.FieldRequest,'derivatives')))               
+            if ~isfield(Attr,'VarIndex_tps')&& (checkall || (isfield(Attr,'FieldRequest')&&strcmp(Attr.FieldRequest,'interp_tps')))               
                 U=DataIn.(DataIn.ListVarName{VarType.vector_x});
                 V=DataIn.(DataIn.ListVarName{VarType.vector_y});
@@ -52 +52 @@
         DataOut.VarAttribute{nbvar+5}=DataIn.VarAttribute{VarType.vector_y};%reproduce attributes of velocity 
          DataOut.VarAttribute{nbvar+5}.Role='vector_y_tps';
-%          if isfield(DataOut.VarAttribute{VarType.vector_x},'FieldRequest')
-%              DataOut.VarAttribute{VarType.vector_x}=rmfield(DataOut.VarAttribute{VarType.vector_x},'FieldRequest');
-%          end
-%          if isfield(DataOut.VarAttribute{VarType.vector_x},'Operation')
-%              DataOut.VarAttribute{VarType.vector_x}=rmfield(DataOut.VarAttribute{VarType.vector_x},'Operation');
-%          end
-        if isfield(DataOut,'ListDimName')%cleaning'FieldRequest'
+        if isfield(DataOut,'ListDimName')%cleaning'
             DataOut=rmfield(DataOut,'ListDimName');
         end

trunk/src/find_field_cells.m

@@ -20 +20 @@
 %      .coord: vector of indices of coordinate variables corresponding to matrix dimensions
 %
-%      .FieldRequest= 'interp', 'derivatives' indicate whether interpolation  or derivatives (tps) is needed to calculate the requested field
+%      .FieldRequest= 'interp_lin', 'interp_tps' indicate whether lin interpolation  or derivatives (tps) is needed to calculate the requested field
 %      .FieldNames = cell of fields to calculate from the fied cell
 %

trunk/src/proj_field.m

@@ -980 +980 @@
     if isfield(VarTypeCell{icell},'FieldRequest')
         switch VarTypeCell{icell}.FieldRequest
-            case 'interp'
+            case 'interp_lin'
                 ProjMode{icell}='interp';
-            case 'derivatives'
+            case 'interp_tps'
                 ProjMode{icell}='filter';
         end
@@ -1225 +1225 @@
                     VarDimName{ilist}={'coord_y','coord_x'};
                 end
-%                 if ~isfield(ProjData,'coord_x')
-%                 ProjData.coord_x=[XMin XMax];
-%                 ProjData.coord_y=[YMin YMax];
-%                 ListFieldProj=[{'coord_x','coord_y'} ListFieldProj'];
-%                 VarDimName=[{'coord_x','coord_y'} VarDimName];
-%                 VarAttribute=[{[],[]} VarAttribute];
-%                 end
                 ProjData.ListVarName=[ProjData.ListVarName ListFieldProj];
                 ProjData.VarDimName=[ProjData.VarDimName VarDimName];
@@ -1276 +1269 @@
             ProjData.ListVarName=[ProjData.ListVarName {AYProjName} {AXProjName}]; %TODO: check if it already exists in Projdata (several cells)
             ProjData.VarDimName=[ProjData.VarDimName {AYProjName} {AXProjName}];
+            ProjData.VarAttribute=[ProjData.VarAttribute {[]} {[]}];
             Coord_z=[];
             Coord_y=[];

trunk/src/read_GUI.m

@@ -57 +57 @@
                         if ~isempty(listinput)
                             if numel(value)==1% single selection
+                                if ischar(listinput)
+                                    input=listinput;
+                                else
                             input=listinput{value};
+                                end
                             else % multiple selection
                               input=listinput(value);  

trunk/src/read_civdata.m

@@ -64 +64 @@
 errormsg='';
 if ischar(FieldNames), FieldNames={FieldNames}; end;
-FieldRequest='vec';
+FieldRequest='';
 for ilist=1:length(FieldNames)
     if ~isempty(FieldNames{ilist})
         switch FieldNames{ilist}
             case{'U','V','norm(U,V)'}
-                FieldRequest='interp';
+                FieldRequest='interp_lin';
             case {'curl(U,V)','div(U,V)','strain(U,V)'}
-                FieldRequest='derivatives';
+                FieldRequest='interp_tps';
         end
     end
@@ -128 +128 @@
     Field.VarAttribute{ivar_U}.VarIndex_tps=ivar_U_tps;
 end
-% if strcmp(FieldRequest,'derivatives')% fields will be calculated from the tps
-%     Field.VarAttribute{ivar_U_tps}.FieldRequest=FieldRequest;
-%     Field.VarAttribute{ivar_U_tps}.Operation=FieldNames;
-% else% fields will be calculated from the initial fields
-%     Field.VarAttribute{ivar_U}.FieldRequest=FieldRequest;%
-%     Field.VarAttribute{ivar_U}.Operation=FieldNames;
-% end
 
 Field.ListGlobalAttribute=[Field.ListGlobalAttribute {'NbCoord','NbDim','TimeUnit','CoordUnit'}];
@@ -211 +204 @@
        % units={'pixel','pixel','pixel','pixel','pixel','pixel','','','','pixel','pixel','pixel','pixel','pixel',''};
 end
-if ~strcmp(FieldRequest,'derivatives')
+if ~strcmp(FieldRequest,'interp_tps')
     var=var(:,1:9);%suppress tps if not needed
 end

trunk/src/read_field.m

@@ -43 +43 @@
     switch FileType
         case {'civx','civdata','netcdf'}  %read the first nc field
-            %         ParamOut.FieldName=ParamIn.FieldName;
             GUIName='get_field'; %default name of the GUI get_field
             if isfield(ParamIn,'GUIName')
@@ -115 +114 @@
                     set(hhget_field.TimeIndexValue,'String',num2str(num))
                 end
-                funct_list=get(hhget_field.ACTION,'UserData');
-                funct_index=get(hhget_field.ACTION,'Value');
-                funct=funct_list{funct_index};%select  the current action in get_field, e;g. PLOT
-                Field=funct(hget_field); %%activate the current action selected in get_field, e;g.read the names of the variables to plot
+%                 funct_list=get(hhget_field.ACTION,'UserData');
+%                 funct_index=get(hhget_field.ACTION,'Value');
+%                 funct=funct_list{funct_index};%select  the current action in get_field, e;g. PLOT
+%                 Field=funct(hget_field); %%activate the current action selected in get_field, e;g.read the names of the variables to plot
+                [Field,errormsg]=read_get_field(hget_field);
                 Tabchar={''};%default
                 Tabcell=[];

trunk/src/uvmat.m

@@ -2216 +2216 @@
 % display the Fields menu from the input file and pick the selected one: 
 if isstruct(ParamOut)
-field_index=strcmp(ParamOut.FieldName,ParamOut.FieldList);
-set(handles.Fields,'String',ParamOut.FieldList); %update the field menu
-set(handles.Fields,'Value',find(field_index,1))
+    field_index=strcmp(ParamOut.FieldName,ParamOut.FieldList);
+    set(handles.Fields,'String',ParamOut.FieldList); %update the field menu
+    set(handles.Fields,'Value',find(field_index,1))
 end