Changeset 1115 for trunk/src/series


Ignore:
Timestamp:
Apr 6, 2022, 8:36:16 PM (2 years ago)
Author:
sommeria
Message:

geometry calib generalised to order_4 and proj_field debugged

Location:
trunk/src/series
Files:
3 edited

Legend:

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

    r1107 r1115  
    628628            ind_good=1:numel(Data.Civ1_X);
    629629        end
    630        
     630        if isempty(ind_good)
     631                        disp_uvmat('ERROR','all vectors of civ1 are bad, check input parameters' ,checkrun)
     632                        return
     633        end
     634
    631635        % perform Patch calculation using the UVMAT fct 'filter_tps'
    632636        [Data.Civ1_SubRange,Data.Civ1_NbCentres,Data.Civ1_Coord_tps,Data.Civ1_U_tps,Data.Civ1_V_tps,tild,Ures, Vres,tild,FFres]=...
     
    919923        else
    920924            ind_good=1:numel(Data.Civ2_X);
     925        end
     926                if isempty(ind_good)
     927                        disp_uvmat('ERROR','all vectors of civ2 are bad, check input parameters' ,checkrun)
     928                        return
    921929        end
    922930        [Data.Civ2_SubRange,Data.Civ2_NbCentres,Data.Civ2_Coord_tps,Data.Civ2_U_tps,Data.Civ2_V_tps,tild,Ures,Vres,tild,FFres]=...
  • trunk/src/series/merge_proj.m

    r1114 r1115  
    8686    return
    8787end
    88 
     88if 0==1
     89    phys; % used to include phys when compiling is done
     90end
    8991%%%%%%%%%%%% STANDARD PART (DO NOT EDIT) %%%%%%%%%%%%
    9092ParamOut=[]; %default output
  • trunk/src/series/turb_stat.m

    r1107 r1115  
    204204% for i_slice=1:Param.IndexRange.NbSlice
    205205%     i_slice
    206     ind_first=Param.IndexRange.first_i
     206    ind_first=Param.IndexRange.first_i;
    207207    for index_i=ind_first:Param.IndexRange.NbSlice:Param.IndexRange.last_i
    208208        if ~isempty(RUNHandle)&& ~strcmp(get(RUNHandle,'BusyAction'),'queue')
     
    210210            break
    211211        end
    212         for index_j=Param.IndexRange.first_j:Param.IndexRange.last_j
     212        for index_j=first_j:last_j
    213213            InputFile=fullfile_uvmat(RootPath{1},SubDir{1},RootFile{1},FileExt{1},NomType{1},index_i,index_i,index_j,index_j);
    214214            [Field,tild,errormsg] = read_field(InputFile,FileType{iview},InputFields{iview});
     
    217217           
    218218            %%%%%%%%%%%% MAIN RUNNING OPERATIONS  %%%%%%%%%%%%
    219             if index_i==ind_first && index_j==Param.IndexRange.first_j %initiate the output data structure in the first field
     219            if index_i==ind_first && index_j==first_j %initiate the output data structure in the first field
    220220                [CellInfo,NbDim,errormsg]=find_field_cells(Field);
    221221                YName='coord_y';%default
Note: See TracChangeset for help on using the changeset viewer.