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

remove get_grids_1d from within gdat_tcv.m since now uses generic function,...

remove get_grids_1d from within gdat_tcv.m since now uses generic function, should add this to AUG, D3D as well...

git-svn-id: https://spcsvn.epfl.ch/repos/TCV/gdat/trunk@8151 d63d8f72-b253-0410-a779-e742ad2e26cf
parent 0ff81020
No related branches found
No related tags found
No related merge requests found
...@@ -2298,75 +2298,3 @@ gdat_data.t=time; ...@@ -2298,75 +2298,3 @@ gdat_data.t=time;
if any(strcmp(fieldnames(tracetdi),'units')) if any(strcmp(fieldnames(tracetdi),'units'))
gdat_data.units=tracetdi.units; gdat_data.units=tracetdi.units;
end end
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
function [gdat_data] = get_grids_1d(gdat_data,nbdim_x,nopt,nverbose);
%
% add various rhos in grids_1d
%
% nbdim_x = 1: same x (rhopol) for all times
% = 2: rhopol depends on time like Thomson projection
%
% nopt = 0: do not fill in, just make the empty structure
% = 1: do compute various fields
%
gdat_data.grids_1d.rhopolnorm = gdat_data.x;
if (nopt == 0) || isempty(gdat_data.x) || isempty(gdat_data.t) || isempty(gdat_data.data) || ischar(gdat_data.data)
gdat_data.grids_1d.rhotornorm = [];
gdat_data.grids_1d.rhovolnorm = [];
gdat_data.grids_1d.psi = [];
gdat_data.grids_1d.rhotor_edge = [];
gdat_data.grids_1d.volume_edge = [];
return
end
params_eff = gdat_data.gdat_params;params_eff.doplot=0;
params_eff.data_request='rhotor';
rhotor = gdat(gdat_data.shot,params_eff);
params_eff.data_request='rhovol';
rhovol = gdat(gdat_data.shot,params_eff);
params_eff.data_request='psi_axis';
psi_axis = gdat(gdat_data.shot,params_eff);
psi0 = interpos(psi_axis.t,psi_axis.data,gdat_data.t,-0.01);
if (nbdim_x == 1)
gdat_data.grids_1d.psi = gdat_data.grids_1d.rhopolnorm.^2*reshape(psi0,1,length(psi0));
elseif (nbdim_x == 2)
gdat_data.grids_1d.psi = gdat_data.grids_1d.rhopolnorm.^2.*repmat(reshape(psi0,1,length(psi0)),size(gdat_data.grids_1d.rhopolnorm,1),1);
else
if nverbose>=0; disp(['option: nbdim_x = ' numstr(nbdim_x) ' not implemented, check with O. Sauter']); end
return
end
gdat_data.grids_1d.rhotornorm = NaN*ones(size(gdat_data.data));
gdat_data.grids_1d.rhovolnorm = NaN*ones(size(gdat_data.data));
it_rt = iround_os(rhotor.t,gdat_data.t);
it_vol = iround_os(rhovol.t,gdat_data.t);
for it=1:length(gdat_data.t)
% do an interpolation on closest point to avoid 2D interp
it_rt_eff = it_rt(it);
it_vol_eff = it_vol(it);
if (nbdim_x == 1)
ii=find(isfinite(gdat_data.grids_1d.rhopolnorm));
else
ii=find(isfinite(gdat_data.grids_1d.rhopolnorm(:,it)));
end
if (nbdim_x == 1)
if length(ii)==length(gdat_data.grids_1d.rhopolnorm)
gdat_data.grids_1d.rhotornorm(:,it)=interpos(rhotor.x,rhotor.data(:,it_rt_eff),gdat_data.grids_1d.rhopolnorm);
if ~isempty(rhovol.x)
gdat_data.grids_1d.rhovolnorm(:,it)=interpos(rhovol.x,rhovol.data(:,it_vol_eff),gdat_data.grids_1d.rhopolnorm);
end
end
else
if length(ii)==size(gdat_data.grids_1d.rhopolnorm,1)
gdat_data.grids_1d.rhotornorm(:,it)=interpos(rhotor.x,rhotor.data(:,it_rt_eff),gdat_data.grids_1d.rhopolnorm(:,it));
if ~isempty(rhovol.x)
gdat_data.grids_1d.rhovolnorm(:,it)=interpos(rhovol.x,rhovol.data(:,it_vol_eff),gdat_data.grids_1d.rhopolnorm(:,it));
end
end
end
end
gdat_data.grids_1d.rhotor_edge=interpos(rhotor.t',rhotor.rhotor_edge,gdat_data.t',-0.01);
gdat_data.grids_1d.volume_edge=interpos(rhovol.t',rhovol.volume_edge,gdat_data.t',-0.01);
return
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment