Changeset 632


Ignore:
Timestamp:
May 6, 2013, 6:51:00 PM (8 years ago)
Author:
sommeria
Message:

small bugs corrected

File:
1 edited

Legend:

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

    r626 r632  
    4444if isstruct(Param) && isequal(Param.Action.RUN,0)
    4545    ParamOut.AllowInputSort='off';% allow alphabetic sorting of the list of input file SubDir (options 'off'/'on', 'off' by default)
    46     ParamOut.WholeIndexRange='on';% prescribes the file index ranges from min to max (options 'off'/'on', 'off' by default)
     46    ParamOut.WholeIndexRange='off';% prescribes the file index ranges from min to max (options 'off'/'on', 'off' by default)
    4747    ParamOut.NbSlice='off'; %nbre of slices ('off' by default)
    4848    ParamOut.VelType='one';% menu for selecting the velocity type (options 'off'/'one'/'two',  'off' by default)
     
    6464
    6565%%%%%%%%%%%% STANDARD PART (DO NOT EDIT) %%%%%%%%%%%%
    66 ParamOut=[] %default output
     66ParamOut=[]; %default output
    6767%% read input parameters from an xml file if input is a file name (batch mode)
    6868checkrun=1;
     
    134134
    135135%% coordinate transform or other user defined transform
    136 % transform_fct='';%default fct handle
    137 % if isfield(Param,'FieldTransform')&&~isempty(Param.FieldTransform.TransformName)
    138 %     if isdeployed
    139 %         transform_fct=Param.FieldTransform.TransformName;
    140 %         dd=phys([]);%activate phys for compilation
    141 %     else
    142 %         currentdir=pwd;
    143 %         cd(Param.FieldTransform.TransformPath)
    144 %         transform_fct=str2func(Param.FieldTransform.TransformName);
    145 %         cd (currentdir)
    146 %     end
    147 % end
    148136transform_fct='';%default fct handle
    149137if isfield(Param,'FieldTransform')&&~isempty(Param.FieldTransform.TransformName)
     
    166154end
    167155for iview=1:NbView
    168         if ~isequal(CheckImage{iview},CheckImage{1})||~isequal(CheckNc{iview},CheckNc{1})
     156    if ~isequal(CheckImage{iview},CheckImage{1})||~isequal(CheckNc{iview},CheckNc{1})
    169157        displ_uvmat('ERROR','input set of input series: need  either netcdf either image series',checkrun)
    170     return
     158        return
    171159    end
    172160end
    173161NomTypeOut=NomType;% output file index will indicate the first and last ref index in the series
    174 % if checkrun==1
    175 %     ParamOut.Specific=[];%no specific parameter
    176 %     return %stop here for interactive input (option Param.Specific='?')
    177 % end
    178162
    179163%% Set field names and velocity types
     
    213197        end
    214198
    215         %% transform the input field (e.g; phys) if requested
     199        %% transform the input field (e.g; phys) if requested (no transform involving two input fields)
    216200        if ~isempty(transform_fct)
    217201            if nargin(transform_fct)>=2
     
    221205            end
    222206        end
    223 %          Data{iview}=phys(Data{iview},XmlData{iview});
     207
    224208        %% check whether tps is needed, then calculate tps coefficients if needed
    225         check_tps=0;
    226         if isfield(Param.InputFields,'FieldName')
    227             if ischar(Param.InputFields.FieldName)
    228                 Param.InputFields.FieldName={Param.InputFields.FieldName};
    229             end
    230         else
    231             Param.InputFields.FieldName={};
    232         end
    233         for ilist=1:numel(Param.InputFields.FieldName)
    234             switch Param.InputFields.FieldName{ilist}
    235                 case {'vort','div','strain'}
    236                     check_tps=1;
    237             end
    238         end
    239 
    240         %% calculate tps coeff if needed
     209%         check_tps=0;
     210%         if isfield(Param.InputFields,'FieldName')
     211%             if ischar(Param.InputFields.FieldName)
     212%                 Param.InputFields.FieldName={Param.InputFields.FieldName};
     213%             end
     214%         else
     215%             Param.InputFields.FieldName={};
     216%         end
     217%         for ilist=1:numel(Param.InputFields.FieldName)
     218%             switch Param.InputFields.FieldName{ilist}
     219%                 case {'vort','div','strain'}
     220%                     check_tps=1;
     221%             end
     222%         end
     223
     224       
     225         %% calculate tps coefficients if needed
    241226        check_proj_tps= isfield(Param,'ProjObject')&&~isempty(Param.ProjObject)&& strcmp(Param.ProjObject.ProjMode,'interp_tps')&&~isfield(Data{iview},'Coord_tps');
    242227        Data{iview}=tps_coeff_field(Data{iview},check_proj_tps);
Note: See TracChangeset for help on using the changeset viewer.