Merge branch 'parallel' into 'master'

AnalyseComputationalEnvironment.m: define missing command string used in error message

See merge request Dynare/dynare!1758
time-shift
Sébastien Villemot 2020-09-03 14:41:18 +00:00
commit 2840526034
1 changed files with 6 additions and 3 deletions

View File

@ -522,13 +522,16 @@ for Node=1:length(DataInput) % To obtain a recoursive function remove the 'for'
if (DataInput(Node).Local == 1) if (DataInput(Node).Local == 1)
if Environment if Environment
if ~ismac if ~ismac
[si0, de0] = system('nproc'); command_string = 'nproc';
[si0, de0] = system(command_string);
else else
[si0, de0] = system('sysctl -n hw.ncpu'); command_string = 'sysctl -n hw.ncpu';
[si0, de0] = system(command_string);
Environment1 = 2; Environment1 = 2;
end end
else else
[si0, de0] = system(['psinfo \\']); command_string = ['psinfo \\'];
[si0, de0] = system(command_string);
end end
else else
if Environment if Environment