Changeset 419 for trunk

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:

• civ.m (modified) (1 diff)
• series.m (modified) (3 diffs)

trunk/src/civ.m

@@ -1634 +1634 @@
                         '-t idempotent --checkpoint ' num2str(walltime_onejob+60) ' '...
                         '-l /core=' num2str(ncores) ','...
-                            'walltime=' datestr(max(1.05*walltime_onejob/86400*max(length(batch_file_list),ncores)/ncores,max_walltime),13) ' '...
+                            'walltime=' datestr(min(1.05*walltime_onejob/86400*max(length(batch_file_list),ncores)/ncores,max_walltime/86400),13) ' '...
                         '-E ' regexprep(filename_joblist,'\.txt\>','.stderr') ' '...
                         '-O ' regexprep(filename_joblist,'\.txt\>','.stdout') ' '...

trunk/src/series.m

@@ -673 +673 @@
     TimeTable{iview,3}=time(last_i);
     TimeTable{iview,4}=time(MaxIndex_i);
-else
+elseif ~isempty(time)
     TimeTable{iview,1}=time(MinIndex_i,MinIndex_j);
     TimeTable{iview,2}=time(first_i,first_j);
@@ -1077 +1077 @@
     end
 else
-    nbfield=size(j2_series{View},1);
-    nbfield2=size(j2_series{View},2);
+    nbfield=size(j2_series,1);
+    nbfield2=size(j2_series,2);
     set(handles.mode,'String',{'bursts';'series(Dj)'})
     if nbfield2>10 || nbfield==1
@@ -1190 +1190 @@
 if ~isempty(displ_pair_list)
 Val=get(handles.ListPairs,'Value');
-NewVal=find(strcmp(displ_pair_list{Val},displ_pair),1);% look at the previous display in the new menu displ_pâir
+NewVal=find(strcmp(displ_pair_list{Val},displ_pair),1);% look at the previous display in the new menu displ_pï¿œir
 end
 if ~isempty(NewVal)