From 4e5ec4f6083819e8c7709fc0e068d86648f80c0a Mon Sep 17 00:00:00 2001
From: Olivier Sauter <olivier.sauter@epfl.ch>
Date: Fri, 7 Jun 2019 20:21:59 +0000
Subject: [PATCH] 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
---
crpptbx/AUG/torbeam_prepare_inputs_and_run.m | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/crpptbx/AUG/torbeam_prepare_inputs_and_run.m b/crpptbx/AUG/torbeam_prepare_inputs_and_run.m
index 02f01554..18285cdc 100644
--- a/crpptbx/AUG/torbeam_prepare_inputs_and_run.m
+++ b/crpptbx/AUG/torbeam_prepare_inputs_and_run.m
@@ -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');
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');
- 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
for it_eff=1:length(times_for_torbeam_eff)
it = it_inb_beam_on(it_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')]);
for ibeam=find(torbeam_in.inbeam.beam_on(:,it_inb(it_eff)))',
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;
imw = findstr('(MW)',b);
if ~isempty(imw)
--
GitLab