1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
|
From: Ruben Undheim <ruben.undheim@gmail.com>
Date: Wed, 6 Jul 2016 18:24:09 +0200
Subject: Fix path to binaries for Debian
---
CSXCAD/matlab/CSXGeomPlot.m | 16 +++++++++-------
openEMS/matlab/CalcNF2FF.m | 15 ++++++++-------
openEMS/matlab/private/invoke_openEMS.m | 16 +++++++++-------
3 files changed, 26 insertions(+), 21 deletions(-)
diff --git a/CSXCAD/matlab/CSXGeomPlot.m b/CSXCAD/matlab/CSXGeomPlot.m
index df33c94..034f1a1 100644
--- a/CSXCAD/matlab/CSXGeomPlot.m
+++ b/CSXCAD/matlab/CSXGeomPlot.m
@@ -27,13 +27,15 @@ end
filename = mfilename('fullpath');
dir = fileparts( filename );
-if isunix
- AppCSXCAD_bin = searchBinary('AppCSXCAD.sh', ...
- {[dir filesep '..' filesep '..' filesep 'AppCSXCAD' filesep], ...
- [dir filesep '..' filesep '..' filesep '..' filesep 'bin' filesep]});
-else % assume windows
- AppCSXCAD_bin = searchBinary('AppCSXCAD.exe',[dir filesep '..' filesep]);
-end
+%if isunix
+% AppCSXCAD_bin = searchBinary('AppCSXCAD.sh', ...
+% {[dir filesep '..' filesep '..' filesep 'AppCSXCAD' filesep], ...
+% [dir filesep '..' filesep '..' filesep '..' filesep 'bin' filesep]});
+%else % assume windows
+% AppCSXCAD_bin = searchBinary('AppCSXCAD.exe',[dir filesep '..' filesep]);
+%end
+
+AppCSXCAD_bin = '/usr/bin/AppCSXCAD';
command = [AppCSXCAD_bin ' --disableEdit ' args_string ' ' CSX_filename];
disp( ['invoking AppCSXCAD, exit to continue script...'] );
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];
|
