Changeset 601 for trunk/src/series.m


Ignore:
Timestamp:
Apr 3, 2013, 1:39:53 PM (8 years ago)
Author:
sommeria
Message:

a few bugs corrected

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/series.m

    r600 r601  
    13421342
    13431343%% select the Action modes
    1344 RunModeList=get(handles.RunMode,'String');
    1345 RunMode=RunModeList{get(handles.RunMode,'Value')};
     1344RunMode='local';%default
     1345if isfield(Series.Action,'RunMode')
     1346RunMode=Series.Action.RunMode;
     1347end
    13461348ActionExt='.m';%default
    13471349if isfield(Series.Action,'ActionExt')
     
    14561458    for iprocess=1:NbProcess
    14571459        if isempty(Series.IndexRange.NbSlice)
    1458             Series.IndexRange.first_i=first_i+(iprocess-1)*BlockLength;
     1460            Series.IndexRange.first_i=first_i+(iprocess-1)*BlockLength*incr_i;
    14591461            if Series.IndexRange.first_i>last_i
    14601462                break
    14611463            end
    1462             Series.IndexRange.last_i=min(first_i+(iprocess)*BlockLength-1,last_i);
     1464            Series.IndexRange.last_i=min(first_i+(iprocess)*BlockLength*incr_i-1,last_i);
    14631465        else
    14641466            Series.IndexRange.first_i= first_i+iprocess-1;
     
    15091511    for iprocess=1:NbProcess
    15101512        if isempty(Series.IndexRange.NbSlice)% process by blocks of i index
    1511             Series.IndexRange.first_i=first_i+(iprocess-1)*BlockLength;
     1513            Series.IndexRange.first_i=first_i+(iprocess-1)*BlockLength*incr_i;
    15121514            if Series.IndexRange.first_i>last_i
    15131515                NbProcess=iprocess-1;
    15141516                break% leave the loop, we are at the end of the calculation
    15151517            end
    1516             Series.IndexRange.last_i=min(last_i,first_i+(iprocess)*BlockLength-1);
     1518            Series.IndexRange.last_i=min(last_i,first_i+(iprocess)*BlockLength*incr_i-1);
    15171519        else% process by slices of i index if NbSlice is defined, computation in a single process if NbSlice =1
    15181520            Series.IndexRange.first_i= first_i+iprocess-1;
Note: See TracChangeset for help on using the changeset viewer.