Changeset 1091


Ignore:
Timestamp:
Feb 9, 2021, 12:52:17 PM (18 months ago)
Author:
sommeria
Message:

Param.incr_slice introduced

Location:
trunk/src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/get_field.m

    r1084 r1091  
    631631var_component=find(test_component);% list of variable indices elligible as unstructured coordinates
    632632var_coord=find(test_coord);% % list of variable indices elligible as gridded coordinates
    633 var_coord(var_coord==scalar_index)=[];
    634 var_component(var_component==scalar_index)=[];
     633index_coord=[];
     634index_component=[];
     635for iscalar=1:numel(scalar_index)
     636    index_component=[index_component find(var_component==scalar_index(iscalar),1)];
     637    index_coord=[index_coord find(var_coord==scalar_index(iscalar),1)];
     638end
     639var_component(index_component)=[];
     640var_coord(index_coord)=[];
    635641ListCoord=Field.Display.ListVarName([var_coord var_component]);
    636642coord_val=zeros(size(ListCoord));
  • trunk/src/get_file_series.m

    r1071 r1091  
    3636InputTable=Param.InputTable;
    3737first_i=Param.IndexRange.first_i;
    38 incr_i=Param.IndexRange.incr_i;
     38incr_i=Param.IndexRange.incr_slice;
    3939last_i=Param.IndexRange.last_i;
    4040first_j=[];last_j=[];incr_j=1;%default
  • trunk/src/series.m

    r1090 r1091  
    19031903            return
    19041904        end
     1905        Param.IndexRange.incr_slice=incr_i;
    19051906        if isempty(Param.IndexRange.NbSlice)
    19061907            Param.IndexRange.first_i=first_i+(iprocess-1)*BlockLength*incr_i;
     
    19121913        else %multislices (then incr_i is not empty)
    19131914            Param.IndexRange.first_i= first_i+iprocess-1;
    1914             Param.IndexRange.incr_i=incr_i*Param.IndexRange.NbSlice;
     1915            Param.IndexRange.incr_slice=incr_i*Param.IndexRange.NbSlice;
    19151916        end
    19161917        for ilist=1:size(Param.InputTable,1)
  • trunk/src/series/time_series.m

    r1085 r1091  
    248248    last_j=j1_series{1}(end);
    249249end
     250OutputPath=fullfile(Param.OutputPath,Param.Experiment,Param.Device)
    250251
    251252%% Set field names and velocity types
     
    305306    if isfield(Param,'ActionInput') && isfield(Param.ActionInput,'VarMesh')%case of histograms
    306307        VarMesh=Param.ActionInput.VarMesh;
    307     else
     308    elseif isequal(Param.IndexRange.NbSlice,1)
    308309        VarMesh=[];
    309310        disp_uvmat('WARNING','automatic bin size for histograms, select time_series again to set the value',checkrun)
     
    572573
    573574%% name of result file
    574 OutputFile=fullfile_uvmat(RootPath{1},OutputDir,RootFile{1},FileExtOut,NomTypeOut,first_i,last_i,first_j,last_j);
     575OutputFile=fullfile_uvmat(OutputPath,OutputDir,RootFile{1},FileExtOut,NomTypeOut,first_i,last_i,first_j,last_j);
    575576errormsg=struct2nc(OutputFile,DataOut); %save result file
    576577if isempty(errormsg)
     
    581582
    582583%% plot the time series for  (the last one in case of multislices)
    583 if checkrun %&& isfield(Param,'ProjObject') && strcmp(Param.ProjObject.Type,'points')
     584if checkrun && isequal(Param.IndexRange.NbSlice,1)%&& isfield(Param,'ProjObject') && strcmp(Param.ProjObject.Type,'points')
    584585    %% open the result file with uvmat (in RUN mode)
    585586    uvmat(OutputFile)% open the last result file with uvmat
    586587end
    587 %     figure
    588 %     haxes=axes;
    589 %     plot_field(DataOut,haxes)
    590 %     
    591 %     %% display the result file using the GUI get_field
    592 %     hget_field=findobj(allchild(0),'name','get_field');
    593 %     if ~isempty(hget_field)
    594 %         delete(hget_field)
    595 %     end
    596 %     get_field(OutputFile,DataOut)
    597 % end
    598 
    599 
     588
     589
     590
Note: See TracChangeset for help on using the changeset viewer.