Changeset 322 for trunk/src

Timestamp:

Dec 6, 2011, 9:54:58 PM (13 years ago)

Author:

gostiaux

Message:

trying to add civ_matlab in batch...

File:

• trunk/src/civ.m (modified) (3 diffs)

trunk/src/civ.m

@@ -1105 +1105 @@
 %% MAIN LOOP
 time=get(handles.ImaDoc,'UserData'); %get the set of times
-batch_file_list=[];
+batch_file_list=[];%should be renamed file_list, can be used for xml or bash files
  
 for ifile=1:nbfield
@@ -1437 +1437 @@
                     save(t,filename_xml)
                     if batch   
-                        batch_file_list{length(batch_file_list)+1}=filename_xml;
+                        path_civ=fileparts(which('civ')); 
+                        batch_file_list{length(batch_file_list)+1}=['matlab -nodisplay -nosplash -r "cd ' path_civ ';civ_matlab(''' filename_xml ''');"'];
                     else
                         [Data,erromsg]=civ_matlab(Param,filecell.nc.civ1{ifile,j});
@@ -1480 +1481 @@
                 
                 case 'oar-dispatch' %oar-dispatch.pl
+                    walltime_onejob=600;%seconds
                     filename_joblist=fullfile(Rootbat,'job_list.txt');
                     fid=fopen(filename_joblist,'w');
-                    walltime_onejob=600;%seconds
                     for p=1:length(batch_file_list)
                         oar_command=['oarsub -n CIVX '...