caiyu/openEMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

harminv: fix to work on Windows and with Octave (all OS)

Browse Source 
Signed-off-by: Thorsten Liebig <Thorsten.Liebig@gmx.de>
This commit is contained in:
Thorsten Liebig 2012-11-28 11:29:57 +01:00
parent 2bc39894aa
commit d63988ab7b
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
matlab/harminv.m
View File

@ -13,9 +13,16 @@ function [f,decay,Q,amp,phase,err]=harminv( timeseries, timestep, start_freq, st
% ----------------------- % -----------------------
% Sebastian Held <sebastian.held@gmx.de> % Sebastian Held <sebastian.held@gmx.de>
if isunix
harminv_exe = 'export LD_LIBRARY_PATH=; harminv';
elseif ispc
m_filename = mfilename('fullpath');
dir = fileparts( m_filename );
harminv_exe = [ '"' dir '\..\harminv.exe"'];
else
error('openEMS:harminv','unknown/unsupported operating system...');
end
%harminv_exe = '../../../harminv/harminv';
harminv_exe = 'harminv';
options = ['-t ' num2str(timestep)]; options = ['-t ' num2str(timestep)];
tmpfile = tempname; tmpfile = tempname;
@ -34,7 +41,7 @@ end
dlmwrite( tmpfile, timeseries ); dlmwrite( tmpfile, timeseries );
command = [harminv_exe ' ' options ' '... command = [harminv_exe ' ' options ' '...
num2str(start_freq) '-' num2str(stop_freq) ' < ' tmpfile]; num2str(start_freq) '-' num2str(stop_freq) ' < "' tmpfile '"'];
[status,result] = system( command ); [status,result] = system( command );
if status ~= 0 if status ~= 0
disp( 'error executing harminv:' ); disp( 'error executing harminv:' );
@ -54,10 +61,10 @@ amp = [];
phase = []; phase = [];
err = []; err = [];
pos = 1; lines = textscan( result, '%s', 'Delimiter', '\n');
while pos < length(result)
result = result(pos:end); for n=2:numel(lines{1})
[C,pos] = textscan( result, '%f', 6, 'Delimiter', ',', 'HeaderLines', 1 ); [C] = textscan( lines{1}{n}, '%f', 6, 'Delimiter', ',');
if isempty(C{1}), break; end if isempty(C{1}), break; end
if C{1}(1) >= 0 if C{1}(1) >= 0
f = [f C{1}(1)]; f = [f C{1}(1)];