From 28a3b38cf43c7b053ae971045f35bf4776bb93b2 Mon Sep 17 00:00:00 2001
From: Marco Ratto <marco.ratto@jrc.ec.europa.eu>
Date: Fri, 21 Jan 2011 11:18:29 +0100
Subject: [PATCH] For compatibility with octave (and for better coding) use of
~ispc in place of isunix/ismac
---
matlab/parallel/AnalyseComputationalEnvironment.m | 2 +-
matlab/parallel/GiveCPUnumber.m | 2 +-
matlab/parallel/dynareParallelGetFiles.m | 2 +-
matlab/parallel/dynareParallelMkDir.m | 2 +-
matlab/parallel/dynareParallelSendFiles.m | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/matlab/parallel/AnalyseComputationalEnvironment.m b/matlab/parallel/AnalyseComputationalEnvironment.m
index ae92413c3b..e3e33f0050 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 43518e4798..f60b214d0f 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 8ca34df5cc..2b7bef9e04 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 763d372f42..5dc6ab2426 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 232db2507f..0e42583cfc 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}])
--
GitLab