Changeset 857


Ignore:
Timestamp:
Jan 26, 2015, 3:23:10 PM (6 years ago)
Author:
sommeria
Message:

bug_corrections

Location:
trunk/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/series.m

    r856 r857  
    22622262        if numel(SubDir)>1
    22632263            for ilist=2:numel(SubDir)
    2264                 SubDirOut=[SubDirOut '-' SubDir{ilist}];
     2264                SubDirOut=[SubDirOut '-' regexprep(SubDir{ilist},'^/','')];
    22652265            end
    22662266        end
  • trunk/src/series/merge_proj.m

    r829 r857  
    248248            disp_uvmat('ERROR',['ERROR in merge_proj/read_field/' errormsg],checkrun)
    249249            return
     250        end
     251        ListVar=Data{iview}.ListVarName;
     252        for ilist=1:numel(ListVar)
     253            Data{iview}.(ListVar{ilist})=double(Data{iview}.(ListVar{ilist}));% transform all fields in double before all operations
    250254        end
    251255        % get the time defined in the current file if not already defined from the xml file
     
    444448                            errormsg='sizes of the input matrices do not agree, need to interpolate on a common grid using a projection object';
    445449                            return
    446                         else                     
     450                        else     
     451                         
    447452                            MergeData.(VarName)=MergeData.(VarName) + Data{iview}.(VarName);%add data
    448453                            NbAver=NbAver + ~check_bad;% add 1 for good data, 0 else
Note: See TracChangeset for help on using the changeset viewer.