Skip to content
Snippets Groups Projects
Commit 4e5ec4f6 authored by Olivier Sauter's avatar Olivier Sauter
Browse files

rm ld_library_path since rpath added to torbeam library, changing IPPLinux.mk

git-svn-id: https://spcsvn.epfl.ch/repos/TCV/gdat/trunk@12019 d63d8f72-b253-0410-a779-e742ad2e26cf
parent a4e6dbed
No related branches found
No related tags found
No related merge requests found
...@@ -232,7 +232,7 @@ ld_library_path=getenv('LD_LIBRARY_PATH'); % need /afs/@cell/common/soft/intel/i ...@@ -232,7 +232,7 @@ ld_library_path=getenv('LD_LIBRARY_PATH'); % need /afs/@cell/common/soft/intel/i
ij_intel = findstr(ld_library_path,'intel'); ij_intel = findstr(ld_library_path,'intel');
if isempty(ij_intel) if isempty(ij_intel)
warning('no intel in LD_LIBRARY_PATH, torbeam may not run properly, add manually /afs/@cell/common/soft/intel/ics2013/14.0/compiler/lib/intel64'); warning('no intel in LD_LIBRARY_PATH, torbeam may not run properly, add manually /afs/@cell/common/soft/intel/ics2013/14.0/compiler/lib/intel64');
ld_library_path = [ld_library_path ':/afs/@cell/common/soft/intel/ics2013/14.0/compiler/lib/intel64']; ld_library_path = [ld_library_path ':/afs/@cell/common/soft/intel/ics2013/14.0/compiler/lib/intel64']; % $INTEL_HOME/compiler/lib/intel64
end end
for it_eff=1:length(times_for_torbeam_eff) for it_eff=1:length(times_for_torbeam_eff)
it = it_inb_beam_on(it_eff); it = it_inb_beam_on(it_eff);
...@@ -242,7 +242,8 @@ for it_eff=1:length(times_for_torbeam_eff) ...@@ -242,7 +242,8 @@ for it_eff=1:length(times_for_torbeam_eff)
disp([' t=' num2str(torbeam_in.inbeam.t(it_inb(it_eff))) ' beam=' num2str(find(torbeam_in.inbeam.beam_on(:,it_inb(it_eff)))','%d')]); disp([' t=' num2str(torbeam_in.inbeam.t(it_inb(it_eff))) ' beam=' num2str(find(torbeam_in.inbeam.beam_on(:,it_inb(it_eff)))','%d')]);
for ibeam=find(torbeam_in.inbeam.beam_on(:,it_inb(it_eff)))', for ibeam=find(torbeam_in.inbeam.beam_on(:,it_inb(it_eff)))',
unix(['cp ' torbeam_in.fname{it}.inbeam{ibeam} ' inbeam.dat']); unix(['cp ' torbeam_in.fname{it}.inbeam{ibeam} ' inbeam.dat']);
[a,b]=unix(['setenv LD_LIBRARY_PATH ' ld_library_path '; /afs/ipp-garching.mpg.de/home/o/osauter/TORBEAM/lib-OUT/a.out']); % [a,b]=unix(['setenv LD_LIBRARY_PATH ' ld_library_path '; /afs/ipp-garching.mpg.de/home/o/osauter/TORBEAM/lib-OUT/a.out']);
[a,b]=unix('/afs/ipp-garching.mpg.de/home/o/osauter/TORBEAM/lib-OUT/a.out');
icount = icount + 1; icount = icount + 1;
imw = findstr('(MW)',b); imw = findstr('(MW)',b);
if ~isempty(imw) if ~isempty(imw)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment