Changeset 973


Ignore:
Timestamp:
Nov 18, 2016, 2:27:40 PM (4 years ago)
Author:
g7moreau
Message:
  • Force -singleCompThread on cluster
  • Adjust automatically matlab version in module load
Location:
trunk/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/civ.m

    r924 r973  
    13811381            fprintf(fid,['#!/bin/bash \n' ...
    13821382                '/etc/sysprofile \n'...
    1383                 'matlab -nodisplay -nosplash -nojvm <<END_MATLAB \n'...
     1383                'matlab -nodisplay -nosplash -nojvm -singleCompThread <<END_MATLAB \n'...
    13841384                'addpath(''' path_civ ''');\n']);
    13851385%             for p=1:length(batch_file_list)
  • trunk/src/series.m

    r972 r973  
    18941894                        cmd=[...
    18951895                            '#!/bin/bash \n'...
    1896                             '. /etc/sysprofile \n'...
     1896                            'source /etc/profile \n'...
    18971897                            'matlab -nodisplay -nosplash -nojvm -logfile ''' filelog_global ''' <<END_MATLAB \n'...
    18981898                            'addpath(''' path_series '''); \n'...
     
    19581958                    ActionFullName ' ' RunTime ' ' filexml{iprocess}];%allow writting access to created files for user group
    19591959            else
     1960                matlab_ver = ver('MATLAB');
     1961                matlab_version = matlab_ver.Version;
    19601962                cmd=[...
    19611963                    '#!/bin/bash \n'...
    1962                     '. /etc/sysprofile \n'...
    1963                     'module load matlab/8.6 \n'...% CHOICE OF MATLAB VERSION
    1964                     'matlab -nodisplay -nosplash -nojvm -logfile ''' filelog{iprocess} ''' <<END_MATLAB \n'...
     1964                    'source /etc/profile \n'...
     1965                    'module load matlab/''' matlab_version ''' \n'...% CHOICE OF MATLAB VERSION
     1966                    'matlab -nodisplay -nosplash -nojvm -singleCompThread -logfile ''' filelog{iprocess} ''' <<END_MATLAB \n'...
    19651967                    'addpath(''' path_series '''); \n'...
    19661968                    'addpath(''' Param.Action.ActionPath '''); \n'...
Note: See TracChangeset for help on using the changeset viewer.