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

Fixed bug when only name of file without dir info is fed to the routine.

parent 816773fc
Branches
No related tags found
No related merge requests found
......@@ -31,19 +31,18 @@ function dynareParallelGetFiles(NamFileInput,PRCDir,Parallel)
% You should have received a copy of the GNU General Public License
% along with Dynare. If not, see <http://www.gnu.org/licenses/>.
if ischar(NamFileInput),
for j=1:size(NamFileInput,1),
NamFile(j,:)={'',deblank(NamFileInput(j,:))};
end
NamFileInput = NamFile;
end
NamFileInput0=NamFileInput;
for indPC=1:length(Parallel),
if Parallel(indPC).Local==0,
if ~ispc || strcmpi('unix',Parallel(indPC).OperatingSystem), %isunix || (~matlab_ver_less_than('7.4') && ismac),
if ischar(NamFileInput0),
for j=1:size(NamFileInput0,1),
NamFile(j,:)={['./'],deblank(NamFileInput0(j,:))};
end
NamFileInput = NamFile;
end
for jfil=1:size(NamFileInput,1),
% if ~isempty(dynareParallelDir(NamFileInput{jfil,2},[PRCDir,filesep,NamFileInput{jfil,1}],Parallel(indPC))),
if exist('OCTAVE_VERSION') % Patch for peculiar behaviour of ls under Linux.
% It is necessary to manage the jolly char '*'!
......@@ -81,10 +80,14 @@ for indPC=1:length(Parallel),
[NonServeL NonServeR]= system(['scp ',Parallel(indPC).UserName,'@',Parallel(indPC).ComputerName,':',Parallel(indPC).RemoteDirectory,'/',PRCDir,'/',NamFileInput{jfil,1},NamFileInput{jfil,2},' ',NamFileInput{jfil,1}]);
end
% end
end
else
if ischar(NamFileInput0),
for j=1:size(NamFileInput0,1),
NamFile(j,:)={['.\'],deblank(NamFileInput0(j,:))};
end
NamFileInput = NamFile;
end
for jfil=1:size(NamFileInput,1),
if ~isempty(dynareParallelDir(NamFileInput{jfil,2},[PRCDir,filesep,NamFileInput{jfil,1}],Parallel(indPC))),
copyfile(['\\',Parallel(indPC).ComputerName,'\',Parallel(indPC).RemoteDrive,'$\',Parallel(indPC).RemoteDirectory,'\',PRCDir,'\',NamFileInput{jfil,1},NamFileInput{jfil,2}],NamFileInput{jfil,1});
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment