summaryrefslogtreecommitdiff
path: root/openEMS
diff options
context:
space:
mode:
authorRuben Undheim <ruben.undheim@gmail.com>2016-07-06 18:24:09 +0200
committerRuben Undheim <ruben.undheim@gmail.com>2019-10-19 19:20:44 +0200
commit584c8f23e595e0d2cbef826c1569f56361b83654 (patch)
tree344cc3ee0f911d908f623bcd33d23eb07b3736cd /openEMS
parentdf408cbf653fa7dd3f52081632d769814d73f5e1 (diff)
Fix path to binaries for Debian
Gbp-Pq: Name 0001-Fix-path-to-binaries-for-Debian.patch
Diffstat (limited to 'openEMS')
-rw-r--r--openEMS/matlab/CalcNF2FF.m15
-rw-r--r--openEMS/matlab/private/invoke_openEMS.m16
2 files changed, 17 insertions, 14 deletions
diff --git a/openEMS/matlab/CalcNF2FF.m b/openEMS/matlab/CalcNF2FF.m
index c80b52e..07cc849 100644
--- a/openEMS/matlab/CalcNF2FF.m
+++ b/openEMS/matlab/CalcNF2FF.m
@@ -98,13 +98,14 @@ struct_2_xml(nf2ff.xml,nf2ff_xml,'nf2ff');
m_filename = mfilename('fullpath');
dir_name = fileparts( m_filename );
-if isunix
- nf2ff_bin = searchBinary('nf2ff', ...
- {[dir_name filesep '..' filesep 'nf2ff' filesep], ...
- [dir_name filesep '..' filesep '..' filesep '..' filesep 'bin' filesep]}, 0);
-else
- nf2ff_bin = searchBinary('nf2ff.exe',[dir_name filesep '..' filesep], 0);
-end
+%if isunix
+% nf2ff_bin = searchBinary('nf2ff', ...
+% {[dir_name filesep '..' filesep 'nf2ff' filesep], ...
+% [dir_name filesep '..' filesep '..' filesep '..' filesep 'bin' filesep]}, 0);
+%else
+% nf2ff_bin = searchBinary('nf2ff.exe',[dir_name filesep '..' filesep], 0);
+%end
+nf2ff_bin = '/usr/bin/nf2ff';
if ((exist(nf2ff.hdf5,'file') && (mode==0)) || (mode==2))
disp('CalcNF2FF: Reading nf2ff data only...')
diff --git a/openEMS/matlab/private/invoke_openEMS.m b/openEMS/matlab/private/invoke_openEMS.m
index afb2b46..8c4d79b 100644
--- a/openEMS/matlab/private/invoke_openEMS.m
+++ b/openEMS/matlab/private/invoke_openEMS.m
@@ -26,13 +26,15 @@ end
filename = mfilename('fullpath');
dir = fileparts( filename );
-if isunix
- openEMS_bin = searchBinary('openEMS.sh', ...
- {[dir filesep '..' filesep '..' filesep], ... % try devel path
- [dir filesep '..' filesep '..' filesep '..' filesep '..' filesep 'bin' filesep]}); % try (default) install path
-else % assume windows
- openEMS_bin = searchBinary('openEMS.exe', [dir filesep '..' filesep '..' filesep]);
-end
+%if isunix
+% openEMS_bin = searchBinary('openEMS.sh', ...
+% {[dir filesep '..' filesep '..' filesep], ... % try devel path
+% [dir filesep '..' filesep '..' filesep '..' filesep '..' filesep 'bin' filesep]}); % try (default) install path
+%else % assume windows
+% openEMS_bin = searchBinary('openEMS.exe', [dir filesep '..' filesep '..' filesep]);
+%end
+
+openEMS_bin = '/usr/bin/openEMS';
command = [openEMS_bin ' ' opts];