Changeset 973 for trunk/src

Timestamp:

Nov 18, 2016, 2:27:40 PM (8 years ago)

Author:

g7moreau

Message:

• Force -singleCompThread on cluster
• Adjust automatically matlab version in module load

Location:

trunk/src

Files:

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

trunk/src/civ.m

@@ -1381 +1381 @@
             fprintf(fid,['#!/bin/bash \n' ...
                 '/etc/sysprofile \n'...
-                'matlab -nodisplay -nosplash -nojvm <<END_MATLAB \n'...
+                'matlab -nodisplay -nosplash -nojvm -singleCompThread <<END_MATLAB \n'...
                 'addpath(''' path_civ ''');\n']);
 %             for p=1:length(batch_file_list)

trunk/src/series.m

@@ -1894 +1894 @@
                         cmd=[...
                             '#!/bin/bash \n'...
-                            '. /etc/sysprofile \n'...
+                            'source /etc/profile \n'...
                             'matlab -nodisplay -nosplash -nojvm -logfile ''' filelog_global ''' <<END_MATLAB \n'...
                             'addpath(''' path_series '''); \n'...
@@ -1958 +1958 @@
                     ActionFullName ' ' RunTime ' ' filexml{iprocess}];%allow writting access to created files for user group
             else
+                matlab_ver = ver('MATLAB');
+                matlab_version = matlab_ver.Version;
                 cmd=[...
                     '#!/bin/bash \n'...
-                    '. /etc/sysprofile \n'...
-                    'module load matlab/8.6 \n'...% CHOICE OF MATLAB VERSION
-                    'matlab -nodisplay -nosplash -nojvm -logfile ''' filelog{iprocess} ''' <<END_MATLAB \n'...
+                    'source /etc/profile \n'...
+                    'module load matlab/''' matlab_version ''' \n'...% CHOICE OF MATLAB VERSION
+                    'matlab -nodisplay -nosplash -nojvm -singleCompThread -logfile ''' filelog{iprocess} ''' <<END_MATLAB \n'...
                     'addpath(''' path_series '''); \n'...
                     'addpath(''' Param.Action.ActionPath '''); \n'...