Changeset 419 for trunk


Ignore:
Timestamp:
May 9, 2012, 10:44:05 PM (13 years ago)
Author:
sommeria
Message:

bugs corrected in series and parameter walltime parameter in oar

Location:
trunk/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/civ.m

    r418 r419  
    16341634                        '-t idempotent --checkpoint ' num2str(walltime_onejob+60) ' '...
    16351635                        '-l /core=' num2str(ncores) ','...
    1636                             'walltime=' datestr(max(1.05*walltime_onejob/86400*max(length(batch_file_list),ncores)/ncores,max_walltime),13) ' '...
     1636                            'walltime=' datestr(min(1.05*walltime_onejob/86400*max(length(batch_file_list),ncores)/ncores,max_walltime/86400),13) ' '...
    16371637                        '-E ' regexprep(filename_joblist,'\.txt\>','.stderr') ' '...
    16381638                        '-O ' regexprep(filename_joblist,'\.txt\>','.stdout') ' '...
  • trunk/src/series.m

    r408 r419  
    673673    TimeTable{iview,3}=time(last_i);
    674674    TimeTable{iview,4}=time(MaxIndex_i);
    675 else
     675elseif ~isempty(time)
    676676    TimeTable{iview,1}=time(MinIndex_i,MinIndex_j);
    677677    TimeTable{iview,2}=time(first_i,first_j);
     
    10771077    end
    10781078else
    1079     nbfield=size(j2_series{View},1);
    1080     nbfield2=size(j2_series{View},2);
     1079    nbfield=size(j2_series,1);
     1080    nbfield2=size(j2_series,2);
    10811081    set(handles.mode,'String',{'bursts';'series(Dj)'})
    10821082    if nbfield2>10 || nbfield==1
     
    11901190if ~isempty(displ_pair_list)
    11911191Val=get(handles.ListPairs,'Value');
    1192 NewVal=find(strcmp(displ_pair_list{Val},displ_pair),1);% look at the previous display in the new menu displ_pâir
     1192NewVal=find(strcmp(displ_pair_list{Val},displ_pair),1);% look at the previous display in the new menu displ_pï¿œir
    11931193end
    11941194if ~isempty(NewVal)
Note: See TracChangeset for help on using the changeset viewer.