diff --git a/matlab/parallel/AnalyseComputationalEnvironment.m b/matlab/parallel/AnalyseComputationalEnvironment.m index ae92413c3b83c6417a6a035a237fc488585274d0..e3e33f00505355a66cd2f729a26cc9d1268d2512 100644 --- a/matlab/parallel/AnalyseComputationalEnvironment.m +++ b/matlab/parallel/AnalyseComputationalEnvironment.m @@ -100,7 +100,7 @@ ErrorCode=0; % Determine the operating system or software version when necessary % for different command types -Environment=isunix || (~matlab_ver_less_than('7.4') && ismac); +Environment=~ispc; %isunix || (~matlab_ver_less_than('7.4') && ismac); for Node=1:length(DataInput) % To obtain a recoursive function remove the 'for' diff --git a/matlab/parallel/GiveCPUnumber.m b/matlab/parallel/GiveCPUnumber.m index 43518e4798e6afef70d9a1f17f78f655dceb91a6..f60b214d0f3cfca70e0019fbc8beac3ca4502eaa 100644 --- a/matlab/parallel/GiveCPUnumber.m +++ b/matlab/parallel/GiveCPUnumber.m @@ -37,7 +37,7 @@ Enviroment=-1; % Determine a specific operating system or software version when necessary % for different command (sintax, name, ...). - Enviroment=isunix || (~matlab_ver_less_than('7.4') && ismac); + Enviroment=~ispc; %isunix || (~matlab_ver_less_than('7.4') && ismac); switch Enviroment case 0 %WINDOWS OPERATING SYSTEM diff --git a/matlab/parallel/dynareParallelGetFiles.m b/matlab/parallel/dynareParallelGetFiles.m index 8ca34df5cca6a60578d6e164ffd801dc05f53373..2b7bef9e04b020589aba2cce71fa2357614b0a22 100644 --- a/matlab/parallel/dynareParallelGetFiles.m +++ b/matlab/parallel/dynareParallelGetFiles.m @@ -41,7 +41,7 @@ end for indPC=1:length(Parallel), if Parallel(indPC).Local==0, - if isunix || (~matlab_ver_less_than('7.4') && ismac), + if ~ispc, %isunix || (~matlab_ver_less_than('7.4') && ismac), for jfil=1:size(NamFileInput,1), % if ~isempty(dynareParallelDir(NamFileInput{jfil,2},[PRCDir,filesep,NamFileInput{jfil,1}],Parallel(indPC))), [NonServeL NonServeR]= system(['scp ',Parallel(indPC).UserName,'@',Parallel(indPC).ComputerName,':',Parallel(indPC).RemoteDirectory,'/',PRCDir,'/',NamFileInput{jfil,1},NamFileInput{jfil,2},' ',NamFileInput{jfil,1}]); diff --git a/matlab/parallel/dynareParallelMkDir.m b/matlab/parallel/dynareParallelMkDir.m index 763d372f42610affa34646190a8d663f71c08c76..5dc6ab2426770552886c2874070d9747b352a794 100644 --- a/matlab/parallel/dynareParallelMkDir.m +++ b/matlab/parallel/dynareParallelMkDir.m @@ -36,7 +36,7 @@ end for indPC=1:length(Parallel) if Parallel(indPC).Local==0, - if isunix || (~matlab_ver_less_than('7.4') && ismac), + if ~ispc, %isunix || (~matlab_ver_less_than('7.4') && ismac), system(['ssh ',Parallel(indPC).UserName,'@',Parallel(indPC).ComputerName,' mkdir -p ',Parallel(indPC).RemoteDirectory,'/',PRCDir]); else [NonServeS NonServeD]=mkdir(['\\',Parallel(indPC).ComputerName,'\',Parallel(indPC).RemoteDrive,'$\',Parallel(indPC).RemoteDirectory,'\',PRCDir]); diff --git a/matlab/parallel/dynareParallelSendFiles.m b/matlab/parallel/dynareParallelSendFiles.m index 232db2507f2202a8b08a924ed105988f6fea70d6..0e42583cfc6c9b6154610d6db8ea7a70b11a7553 100644 --- a/matlab/parallel/dynareParallelSendFiles.m +++ b/matlab/parallel/dynareParallelSendFiles.m @@ -41,7 +41,7 @@ end for indPC=1:length(Parallel), if Parallel(indPC).Local==0, - if isunix || (~matlab_ver_less_than('7.4') && ismac), + if ~ispc, %isunix || (~matlab_ver_less_than('7.4') && ismac), for jfil=1:size(NamFileInput,1), if ~isempty(NamFileInput{jfil,1}) system(['ssh ',Parallel(indPC).UserName,'@',Parallel(indPC).ComputerName,' mkdir -p ',Parallel(indPC).RemoteDirectory,'/',PRCDir,'/',NamFileInput{jfil,1}])