- warning of for octave;
- fixed bug with batch file for octave; - fixed screen output for octave; - cosmethicstime-shift
parent
bed32115d2
commit
0a93e9f28e
|
@ -102,6 +102,16 @@ end
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
% Deactivate some 'Parallel/Warning' message in Octave!
|
||||||
|
% Comment the line 'warning('off');' in order to view the warning message
|
||||||
|
% in Octave!
|
||||||
|
|
||||||
|
if exist('OCTAVE_VERSION'),
|
||||||
|
warning('off');
|
||||||
|
end
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
% Only for testing!
|
% Only for testing!
|
||||||
|
|
||||||
% if Strategy==0
|
% if Strategy==0
|
||||||
|
@ -110,6 +120,7 @@ end
|
||||||
% disp('User Strategy Now Is Always Open (1)');
|
% disp('User Strategy Now Is Always Open (1)');
|
||||||
% end
|
% end
|
||||||
|
|
||||||
|
|
||||||
if Strategy==1
|
if Strategy==1
|
||||||
totCPU=0;
|
totCPU=0;
|
||||||
end
|
end
|
||||||
|
@ -211,7 +222,7 @@ for j=1:totCPU,
|
||||||
fblck = offset+1;
|
fblck = offset+1;
|
||||||
nblck = sum(nBlockPerCPU(1:j));
|
nblck = sum(nBlockPerCPU(1:j));
|
||||||
save temp_input.mat fblck nblck fname -append;
|
save temp_input.mat fblck nblck fname -append;
|
||||||
copyfile('temp_input.mat',['slaveJob',int2str(j),'.mat'])
|
copyfile('temp_input.mat',['slaveJob',int2str(j),'.mat']);
|
||||||
if Parallel(indPC).Local ==0,
|
if Parallel(indPC).Local ==0,
|
||||||
fid1=fopen(['stayalive',int2str(j),'.txt'],'w+');
|
fid1=fopen(['stayalive',int2str(j),'.txt'],'w+');
|
||||||
fclose(fid1);
|
fclose(fid1);
|
||||||
|
@ -383,7 +394,14 @@ if ~ispc, %isunix || (~matlab_ver_less_than('7.4') && ismac),
|
||||||
system('sh ConcurrentCommand1.bat &');
|
system('sh ConcurrentCommand1.bat &');
|
||||||
pause(1)
|
pause(1)
|
||||||
else
|
else
|
||||||
|
|
||||||
|
if exist('OCTAVE_VERSION')
|
||||||
|
% Redirect the standard output to the file 'OctaveStandardOutputMessage.txt'!
|
||||||
|
% This file is saved in the Model directory.
|
||||||
|
system('ConcurrentCommand1.bat > OctaveStandardOutputMessage.txt');
|
||||||
|
else
|
||||||
system('ConcurrentCommand1.bat');
|
system('ConcurrentCommand1.bat');
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
@ -449,7 +467,7 @@ delete(['comp_status_',fname,'*.mat']);
|
||||||
|
|
||||||
% Caption for console mode computing ...
|
% Caption for console mode computing ...
|
||||||
|
|
||||||
if (options_.console_mode == 1)
|
if (options_.console_mode == 1) || exist('OCTAVE_VERSION')
|
||||||
fnameTemp=fname;
|
fnameTemp=fname;
|
||||||
|
|
||||||
L=length(fnameTemp);
|
L=length(fnameTemp);
|
||||||
|
@ -473,11 +491,22 @@ if (options_.console_mode == 1)
|
||||||
fnameTemp(L)='';
|
fnameTemp(L)='';
|
||||||
|
|
||||||
Information=['Parallel ' fnameTemp ' Computing ...'];
|
Information=['Parallel ' fnameTemp ' Computing ...'];
|
||||||
|
if exist('OCTAVE_VERSION')
|
||||||
|
if (~ispc) && (Strategy==0)
|
||||||
|
printf('\n');
|
||||||
|
pause(2);
|
||||||
|
end
|
||||||
|
|
||||||
|
printf([Information,'\n\n']);
|
||||||
|
else
|
||||||
fprintf([Information,'\n\n']);
|
fprintf([Information,'\n\n']);
|
||||||
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
ForEver=1;
|
ForEver=1;
|
||||||
statusString = '';
|
statusString = '';
|
||||||
|
|
||||||
|
@ -505,7 +534,7 @@ while (ForEver)
|
||||||
idCPU(j) = njob;
|
idCPU(j) = njob;
|
||||||
if exist('OCTAVE_VERSION') || (options_.console_mode == 1),
|
if exist('OCTAVE_VERSION') || (options_.console_mode == 1),
|
||||||
if (~ispc)
|
if (~ispc)
|
||||||
statusString = ['\n',statusString, int2str(j), ' %3.f%% done! '];
|
statusString = [statusString, int2str(j), ' %3.f%% done! '];
|
||||||
else
|
else
|
||||||
statusString = [statusString, int2str(j), ' %3.f%% done! '];
|
statusString = [statusString, int2str(j), ' %3.f%% done! '];
|
||||||
end
|
end
|
||||||
|
@ -517,7 +546,7 @@ while (ForEver)
|
||||||
% To define!
|
% To define!
|
||||||
if exist('OCTAVE_VERSION') || (options_.console_mode == 1),
|
if exist('OCTAVE_VERSION') || (options_.console_mode == 1),
|
||||||
if (~ispc)
|
if (~ispc)
|
||||||
statusString = ['\n',statusString, int2str(j), ' %3.f%% done! '];
|
statusString = [statusString, int2str(j), ' %3.f%% done! '];
|
||||||
else
|
else
|
||||||
statusString = [statusString, int2str(j), ' %3.f%% done! '];
|
statusString = [statusString, int2str(j), ' %3.f%% done! '];
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue