diff --git a/matlab/JET/gdat_jet.m b/matlab/JET/gdat_jet.m index 4bb12dda1018fae0b23b373b4fcb90e621522d45..3566bf44ac21206aaf31723b87a1b7bbe1b72db3 100644 --- a/matlab/JET/gdat_jet.m +++ b/matlab/JET/gdat_jet.m @@ -636,7 +636,13 @@ elseif strcmp(mapping_for_jet.method,'switchcase') else zshift_eff = zshift; end - [efitdata,eqd]=geteqdskJET(shot,time,[],[],[],zshift_eff); + if ~isfield(gdat_data.gdat_params,'nr') || isempty(gdat_data.gdat_params.nr) + gdat_data.gdat_params.nr = 129; + end + if ~isfield(gdat_data.gdat_params,'nz') || isempty(gdat_data.gdat_params.nz) + gdat_data.gdat_params.nz = 129; + end + [efitdata,eqd]=geteqdskJET(shot,time,gdat_data.gdat_params.nr,gdat_data.gdat_params.nz,[],zshift_eff,[],[],[],100,[],gdat_data.gdat_params.jet_user); if length(time) > 1 gdat_data.eqdsk = eqd; for itime=1:length(time) diff --git a/matlab/JET/psinrzjet.m b/matlab/JET/psinrzjet.m index 84d105ed286e962af36523ee55803296badadb09..b495f9bbe74863b55abc4d1430729417fa6e0fdd 100644 --- a/matlab/JET/psinrzjet.m +++ b/matlab/JET/psinrzjet.m @@ -3,18 +3,18 @@ function [r,z,psinrz,sspr,sspi,tefit_eff]=psinrzjet(shot,time,nrg_rg,nzg_zg,efit % function [r,z,psinrz,sspr,sspi,tefit_eff]=psinrzjet(shot,time,nrg_rg,nzg_zg,efitlab,uid,seq,varargin); % % psirz : reconstruction des surfaces de flux -% +% % ce programme utilise les donnees de efit ou eftm -% +% % examples: % [r,z,psinrz,sspr,sspi]=psinrzjet(shot,time,nrg_rg,nzg_zg,[efitlab,uid,seq,ncont]); % [r,z,psinrz,sspr,sspi]=psinrzjet(50814,60,65,65,[],[],[],60,sspr,sspi); % to get plot and give sspr,sspi -% [r,z,psinrz]=psinrzjet(50814,60.4,[3 3.2],[0 0.1],[],[],[],0,sspr,sspi,[],1); % +% [r,z,psinrz]=psinrzjet(50814,60.4,[3 3.2],[0 0.1],[],[],[],0,sspr,sspi,[],1); % % % entrees : % shot : numero du choc jet % time : time de l'analyse -% nrg_rg, nzg_zg: nb de points de la grille en r (resp. en z) sur laquelle on fait la +% nrg_rg, nzg_zg: nb de points de la grille en r (resp. en z) sur laquelle on fait la % reconstruction des surfaces de flux. % if nzg_zg is negative, make symmetric box around zero % if array, assumes rout and zout given firectly @@ -61,6 +61,7 @@ end if nargin>=9 & ~isempty(varargin{2}) sspr=varargin{2}; else + error('should provide jet_user'); sspr=gdat(shot,'ppf',[efitlab '/sspr?uid=' uid '+seq=' seqd]); end ssprs=sspr.data; @@ -68,6 +69,7 @@ tpefit=sspr.t; if nargin>=10 & ~isempty(varargin{3}) sspi=varargin{3}; else + error('should provide jet_user'); sspi=gdat(shot,'ppf',[efitlab '/sspi?uid=' uid '+seq=' seqd]); end sspis=sspi.data; @@ -82,7 +84,7 @@ if nargin>=12 & ~isempty(varargin{5}) else idiag=0; end - + [x,ind]=min(abs(time-tpefit)); tefit_eff=tpefit(ind); @@ -101,10 +103,10 @@ rmax=0.01*sspr_t(nr); zmin=0.01*sspr_t(nr+1); zmax=0.01*sspr_t(nr+nz); -rmin=rmin+1e-4; -rmax=rmax-1e-4; -zmin=zmin+1e-4; -zmax=zmax-1e-4; +rmin=rmin;%+1e-4; +rmax=rmax;%-1e-4; +zmin=zmin;%+1e-4; +zmax=zmax;%-1e-4; if length(nrg_rg)==1 & length(nzg_zg)==1 r=linspace(rmin,rmax,nrg_rg); @@ -120,7 +122,7 @@ end % mapflux contruit la carte de flux psin sur (r,z) psinrz=mapflux_fast(cij,0.01*ri,0.01*zi,r,z,idiag); - +keyboard if ncont>0 figure contour(r,z,psinrz',ncont);