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

multiple uid for efit, chain2, etc

git-svn-id: https://spcsvn.epfl.ch/repos/TCV/gdat/trunk@1858 d63d8f72-b253-0410-a779-e742ad2e26cf
parent c284e802
No related branches found
No related tags found
No related merge requests found
...@@ -60,8 +60,8 @@ else ...@@ -60,8 +60,8 @@ else
uid=uid0; uid=uid0;
end end
if nargin>=9 & ~isempty(seqd) if nargin>=9 & ~isempty(seqd)
for i=length(uid)+1:length(uid0) for i=length(seqd)+1:length(seqd0)
seqd(i)=seqd(i); seqd(i)=seqd0(i);
end end
else else
seqd=seqd0; seqd=seqd0;
...@@ -168,7 +168,7 @@ if index_efit<=length(efitdata.bttm.data); bttm=efitdata.bttm.data(index_efit); ...@@ -168,7 +168,7 @@ if index_efit<=length(efitdata.bttm.data); bttm=efitdata.bttm.data(index_efit);
if index_efit<=length(efitdata.btnm.data); btnm=efitdata.btnm.data(index_efit); else; btnm=0; end if index_efit<=length(efitdata.btnm.data); btnm=efitdata.btnm.data(index_efit); else; btnm=0; end
xli=efitdata.xli.data(index_efit); xli=efitdata.xli.data(index_efit);
[R,Z,psinrz]=psirz(shot,time,nrg,nzg,efitlab,uid,seqd,ncont,efitdata.sspr,efitdata.sspi,deltaz); [R,Z,psinrz]=psirz(shot,time,nrg,nzg,efitlab,uid{iexefit},seqd(iexefit),ncont,efitdata.sspr,efitdata.sspi,deltaz);
nzg=abs(nzg); nzg=abs(nzg);
% define file name % define file name
...@@ -178,7 +178,7 @@ fid=fopen(fname,'w'); ...@@ -178,7 +178,7 @@ fid=fopen(fname,'w');
% 1st eqdsk line: 48 characters for file description and then, 3, nr, nz % 1st eqdsk line: 48 characters for file description and then, 3, nr, nz
tdate=date; tdate=date;
ss=['JET #' num2str(shot) ' t= ' num2str(time_efit) ' ' efitlab '?uid=' uid '+seq=' num2str(seqd) ', ' tdate]; ss=['JET #' num2str(shot) ' t= ' num2str(time_efit) ' ' efitlab '?uid=' uid{iexefit} '+seq=' num2str(seqd(iexefit)) ', ' tdate];
if length(ss)<48 if length(ss)<48
ss(end:48)=' '; ss(end:48)=' ';
else else
...@@ -276,8 +276,8 @@ fprintf(fid,'%18.8e li\n',xli); ...@@ -276,8 +276,8 @@ fprintf(fid,'%18.8e li\n',xli);
fprintf(fid,'\n%18.8e time\n',time); fprintf(fid,'\n%18.8e time\n',time);
fprintf(fid,' %d shot number\n',shot); fprintf(fid,' %d shot number\n',shot);
fprintf(fid,' efit version : %s\n',efitlab); fprintf(fid,' efit version : %s\n',efitlab);
fprintf(fid,' uid : %s\n',uid); fprintf(fid,' uid : %s, %s, %s\n',uid{1},uid{2},uid{3});
fprintf(fid,' seq : %d\n',seqd); fprintf(fid,' seq : %d, %d, %d\n',seqd(1:3));
fclose(fid); fclose(fid);
disp(['wrote ',fname]); disp(['wrote ',fname]);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment