Changeset 903

Timestamp:

May 29, 2015, 5:17:05 PM (9 years ago)

Author:

g7moreau

Message:

• Change 0_OAR folder to 0_LOG
• Put -s to oar-parexec to switch log of subjob
• Name job with UVmat prefix

File:

• trunk/src/series.m (modified) (4 diffs)

trunk/src/series.m

@@ -1908 +1908 @@
     case 'cluster_oar' % option 'oar-parexec' used
         %create subdirectory for oar command and log files
-        DirOAR=fullfile(OutputDir,'0_OAR');
-        if exist(DirOAR,'dir')% delete the content of the dir 0_OAR to allow new input
+        DirOAR=fullfile(OutputDir,'0_LOG');
+        if exist(DirOAR,'dir')% delete the content of the dir 0_LOG to allow new input
             curdir=pwd;
             cd(DirOAR)
@@ -1930 +1930 @@
         fclose(fid);
         system(['chmod +x ' filename_joblist]);% set the file to executable
-        oar_command=['oarsub -n CIVX '...
+        oar_command=['oarsub -n UVmat_' ActionName ' '...
             '-t idempotent --checkpoint ' num2str(walltime_onejob+60) ' '...
             '-l /core=' num2str(NbCore) ','...
@@ -1937 +1937 @@
             '-O ' regexprep(filename_joblist,'\.txt\>','.stdout') ' '...
             extra_oar ' '...
-            '"oar-parexec -f ' filename_joblist ' '...
+            '"oar-parexec -s -f ' filename_joblist ' '...
             '-l ' filename_joblist '.log"\n'];
         filename_oarcommand=fullfile(DirOAR,'oar_command');
@@ -1949 +1949 @@
         %create subdirectory for pbs command and log files
         DirPBS=fullfile(OutputDir,'0_PBS'); %todo : common name OAR/PBS
-        if exist(DirPBS,'dir')% delete the content of the dir 0_OAR to allow new input
+        if exist(DirPBS,'dir')% delete the content of the dir 0_LOG to allow new input
             curdir=pwd;
             cd(DirPBS)