Skip to content
Snippets Groups Projects
Commit 28a3b38c authored by Marco Ratto's avatar Marco Ratto
Browse files

For compatibility with octave (and for better coding) use of ~ispc in place of isunix/ismac

parent a3e4a7ff
No related branches found
No related tags found
No related merge requests found
......@@ -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'
......
......@@ -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
......
......@@ -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}]);
......
......@@ -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]);
......
......@@ -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}])
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment