OAR : fix bug for .log .err .out filenames (use same fileroot as for file .oar and .params

Signed-off-by: Laura Nervo <laura.nervo@esrf.fr>

git-svn-id: https://svn.code.sf.net/p/dct/code/trunk@635 4c865b51-4357-4376-afb4-474e03ccb993

zUtil_OAR/OAR_make.m

-function OAR_make(executable,first,last,njobs,otherparameters,submit,varargin)
+function OAR_make(executable,first,last,njobs,otherparameters,submitflag,varargin)
 % OAR_MAKE  Submit jobs to OAR. 
 %     OAR_MAKE(executable,first,last,njobs,otherparameters,submitflag,varargin)
 %     -------------------------------------------------------------------------
@@ -16,7 +16,7 @@ function OAR_make(executable,first,last,njobs,otherparameters,submit,varargin)
 %       otherparameters = all the other parameters to be passed to the
 %                         function as a string {''}
 %                         (ex. 'par1 par2 par3')
-%                submit = logical to sumbit or not the jobs {true}
+%            submitflag = logical to sumbit or not the jobs {true}
 %              varargin = the values of the OAR directives as pairs
 %                         i.e. 'walltime','3:00:00','mem',4000, ...
 %
@@ -57,7 +57,7 @@ function OAR_make(executable,first,last,njobs,otherparameters,submit,varargin)
 %         Change name of structure parameters into oarparameters
 %         Change argument oarparameters into oardirectives
 %         Add flag to submit or not the jobs
-%         Create a function submit to submit later the jobs
+%         Create a function submitOar to submit later the jobs
 %
 %
 
@@ -94,7 +94,7 @@ disp(' ****************************************')
 disp(' *******  Submitting jobs to OAR  *******')
 disp(' ****************************************')
 disp(' ')
-        
+
 hostname = getenv('HOSTNAME');
 user = getenv('USER');
 
@@ -117,8 +117,8 @@ end
 if (~exist('otherparameters','var') || (nargin < 5))
     otherparameters = '';
 end
-if (~exist('submit','var') || isempty(submit) || (nargin < 6))
-    submit = true;
+if (~exist('submitflag','var') || isempty(submitflag) || (nargin < 6))
+    submitflag = true;
 end
 
 % DEBUG: print arguments
@@ -161,7 +161,8 @@ out.odisp(['Log files now in ' logdir])
 % this file contains the parameters for oar
 tmpname  = [tempfilename '.oar'];
 tname    = fullfile(subdir,tmpname);
-fileroot = ['oar.' fname '.%jobid%'];
+
+fileroot = ['oar.' fname '-' getenv('USER') '_' num2str(oarpars.resubmit) '.%jobid%'];
 logerr   = fullfile(logdir,[fileroot '.err']);
 logout   = strrep(logerr,'.err','.out');
 logname  = strrep(logerr,'.err','.log');
@@ -308,7 +309,6 @@ disp(['OAR parameters: ' set.oarparameters])
 
 %% Save OAR directives in .log file
 out.fprintf('Saving parameters in the .log file...')
-
 fid = fopen(set.logname, 'w');
 fprintf(fid, '# General information\n');
 names = fieldnames(set);
@@ -346,17 +346,17 @@ out.fprintf('\n\nSaving the oarset.mat file...')
 cd(set.launchdir);
 save([set.launchdir filesep 'oarset.mat'], 'set');
 out.fprintf('done!\n')
-    
+
 %% Submit the job(s)
 
-if submit
+if submitflag
     submitOar(false);
 else
     disp([fname ' is ready for submission']);
     disp('Submit the jobs running the function, choosing true/false for debugging')
-    disp('    submit(debug)')
+    disp('    submitOar(debug)')
 end
 
-end %function OAR_make_v9
+end %function OAR_make_v10