Changeset 756 for trunk


Ignore:
Timestamp:
Apr 28, 2014, 8:05:56 AM (7 years ago)
Author:
sommeria
Message:
 
Location:
trunk/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/get_field.m

    r754 r756  
    587587test_coord=zeros(size(Field.Display.VarDimName)); %=1 when variable #ilist is eligible as structured coordiante
    588588dim_var=Field.Display.VarDimName{scalar_index};%list of dimensions of the selected variable
    589 if ~get(handles.CheckDimensionX,'Value')  || ~get(handles.CheckDimensionY,'Value')
     589if ~get(handles.CheckDimensionX,'Value') 
    590590    %look for coordinate variables among the other variables
    591591    for ilist=1:numel(Field.Display.VarDimName)
     
    990990MenuIndex=get(handles.TimeName,'Value');
    991991string=get(handles.TimeName,'String');
     992TimeName='';%default
     993if ~isempty(string)&&iscell(string)
    992994TimeName=string{MenuIndex};
     995end
    993996switch index
    994997    case 1
     
    10011004            AttrName=Field.ListGlobalAttribute{attr_index};
    10021005            set(handles.TimeUnit,'String',Field.(AttrName))
     1006        else
     1007            set(handles.TimeUnit,'String','')
    10031008        end
    10041009    case {3 ,4}
  • trunk/src/nc2struct.m

    r755 r756  
    261261            if input_index==4% if a dimension is selected as time
    262262                ind_vec=zeros(1,numel(var_dim{ivar}));% vector with zeros corresponding to al the dimensions of the variable VarName
    263                 ind_size=dim_value(var_dim{ivar});% vector giving the size of the variable VarName
     263                ind_size=dim_value(var_dim{ivar});% vector giving the size (for each dimension) of the variable VarName
    264264                index_time=find(var_dim{ivar}==TimeDimIndex);
    265265                if ~isempty(index_time)
     266                    if ind_size(index_time)<max(TimeIndex)
     267                        errormsg=['requested index ' num2str(TimeIndex) ' exceeds matrix dimension'];
     268                        return
     269                    end
    266270                    ind_vec(index_time)=TimeIndex-1;% selected index(or indices) to read
    267271                    ind_size(index_time)=numel(TimeIndex);%length of the selected set of time indices
Note: See TracChangeset for help on using the changeset viewer.