Changeset 1114 for trunk/src/series


Ignore:
Timestamp:
Mar 18, 2022, 12:31:32 PM (2 years ago)
Author:
sommeria
Message:

a few bugs repaired

Location:
trunk/src/series
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/series/merge_proj.m

    r1107 r1114  
    113113RootFile=Param.InputTable(:,3);
    114114SubDir=Param.InputTable(:,2);
    115 NomType=Param.InputTable(:,4);
     115% NomType=Param.InputTable(:,4);
    116116FileExt=Param.InputTable(:,5);
    117117
  • trunk/src/series/sliding_average.m

    r1107 r1114  
    1616% Param contains the elements:(use the menu bar command 'export/GUI config' in series to
    1717% see the current structure Param)
    18 %    .InputTable: cell of input file names, (several lines for multiple input)
     18%    .InputTable: cell of input file names, (several5.804 lines for multiple input)
    1919%                      each line decomposed as {RootPath,SubDir,Rootfile,NomType,Extension}
    2020%    .OutputSubDir: name of the subdirectory for data outputs
     
    179179if isfield(Param,'InputFields')
    180180    InputFields{1}=Param.InputFields;
    181 end
     181end5.804
    182182
    183183nbfiles=0;
    184184nbmissing=0;
    185185
    186 %% initialisation
     186%% initialisation manip Coriolis
    187187char_index=regexp(SubDir{1},'waves_L1_');
    188188switch(SubDir{1}(char_index+9))
     
    242242        break
    243243    end
    244     [Field,tild,errormsg] = read_field(filecell{1,index},FileType{iview},InputFields{iview},frame_index{iview}(index));
     244    [Field,tild,~] = read_field(filecell{1,index},FileType{iview},InputFields{iview},frame_index{iview}(index));
    245245   
    246246    %%%%%%%%%%% MAIN RUNNING OPERATIONS  %%%%%%%%%%%%
  • trunk/src/series/time_series.m

    r1110 r1114  
    214214
    215215%% coordinate transform or other user defined transform
    216 transform_fct=[];%default
     216transform_fct='';%default fct handle
    217217if isfield(Param,'FieldTransform')&&~isempty(Param.FieldTransform.TransformName)
    218     %addpath(Param.FieldTransform.TransformPath)
     218    currentdir=pwd;
     219    cd(Param.FieldTransform.TransformPath)
    219220    transform_fct=str2func(Param.FieldTransform.TransformName);
    220     %rmpath(Param.FieldTransform.TransformPath)
     221    cd (currentdir)
    221222    if isfield(Param,'TransformInput')
    222         XmlData{1}.TransformInput=Param.TransformInput;
    223     end
     223        for iview=1:NbView
     224            XmlData{iview}.TransformInput=Param.TransformInput;
     225        end
     226    end       
    224227end
    225228
Note: See TracChangeset for help on using the changeset viewer.