Bugfix for OAR job submissions (should fix oar6 problems)

Signed-off-by: Yoann Guilhem <yoann.guilhem@esrf.fr>

zUtil_Help/infopc.m

-function infopc
-% display info of the ssh connection
-disp('******************************************************')
-fprintf(' %s = %s\n','  matlab',version)
-fprintf(' %s = %s\n','hostname',getenv('HOSTNAME'))
-fprintf(' %s = %s\n','username',getenv('USER'))
-fprintf(' %s = %s\n','     pwd',strtrim(pwd))
-disp('******************************************************')
+function infopc()
+% INFOPC display info of the ssh connection
+
+    [~, hostname] = system('hostname');
+    hostname = strtrim(hostname);
+
+    disp('******************************************************');
+    fprintf(' %s = %s\n', '  matlab', version);
+    fprintf(' %s = %s\n', 'hostname', hostname);
+    fprintf(' %s = %s\n', 'username', getenv('USER'));
+    fprintf(' %s = %s\n', '     pwd', strtrim(pwd));
+    disp('******************************************************');
+end % end of function
+

zUtil_OAR/OAR_make.m

@@ -78,7 +78,7 @@ app.gpu        = 'NO';
 app.node       = 1;
 app.cpu        = 1;
 app.core       = 1;
-app.host       = 'htc';
+app.host       = '%';
 app.checkpoint = 600;
 app.signal     = 2;
 app.type       = 'idempotent';
@@ -95,7 +95,8 @@ disp(' *******  Submitting jobs to OAR  *******')
 disp(' ****************************************')
 disp(' ')
 
-hostname = getenv('HOSTNAME');
+[~, hostname] = system('hostname');
+hostname = strtrim(hostname);
 user = getenv('USER');
 
 out.fprintf(' ***       version  :  %s\n', version);

zUtil_OAR/make_oar_matlab.m

@@ -34,7 +34,7 @@ function script_location = make_oar_matlab(pathdir, tmpdir, tmpname, oarpars)
     header =  {'#!/bin/bash', ...
         ['#OAR -l {type = ''default''}/core='  num2str(oarpars.core) '/nodes=' num2str(oarpars.node) ...
             '/cpu=' num2str(oarpars.cpu) ',walltime=' oarpars.walltime], ...
-        ['#OAR -p (host like ''' oarpars.host '%'') AND (desktop_computing = ''NO'')'] ...
+        ['#OAR -p (host like ''' oarpars.host ''') AND (desktop_computing = ''NO'')'] ...
         ['#OAR -p (gpu = ''' oarpars.gpu ''') AND (mem>' num2str(oarpars.mem) ')'], ...
         ['#OAR -O ' oarpars.stdout], ...
         ['#OAR -E ' oarpars.stderr], ...