diff options
| -rw-r--r-- | CSXCAD/matlab/CSXGeomPlot.m | 16 | ||||
| -rw-r--r-- | openEMS/matlab/CalcNF2FF.m | 15 | ||||
| -rw-r--r-- | 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]; |