From d8bee027de36d4342f9025c13c1b028d0fb6772d Mon Sep 17 00:00:00 2001
From: Antoine Merle <Antoine.Merle@epfl.ch>
Date: Thu, 5 Apr 2018 12:21:42 +0000
Subject: [PATCH] Small bug fixes for {ne,te,nete}_rho
git-svn-id: https://spcsvn.epfl.ch/repos/TCV/gdat/trunk@9688 d63d8f72-b253-0410-a779-e742ad2e26cf
---
crpptbx/TCV/gdat_tcv.m | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/crpptbx/TCV/gdat_tcv.m b/crpptbx/TCV/gdat_tcv.m
index 892b3479..c4e39ca0 100644
--- a/crpptbx/TCV/gdat_tcv.m
+++ b/crpptbx/TCV/gdat_tcv.m
@@ -1108,7 +1108,7 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
% psiscatvol obtained from linear interpolation in fact so not quite ok near axis where psi is quadratic
recompute_psiscatvol_always = 1;
if liuqe_version==-1; recompute_psiscatvol_always = 1; end
- if abs(zshift)<1e-5 && liuqe_matlab==0 && recompute_psiscatvol_always==0
+ if all(abs(zshift)<1e-5) && liuqe_matlab==0 && recompute_psiscatvol_always==0
psi_max=gdat_tcv([],['\results::thomson' edge_str_dot ':psi_max' substr_liuqe],'nverbose',gdat_params.nverbose);
psiscatvol=gdat_tcv([],['\results::thomson' edge_str_dot ':psiscatvol' substr_liuqe],'nverbose',gdat_params.nverbose);
else
@@ -1137,19 +1137,19 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
case length(psitdi.dim{3})
% ok
case length(gdat_data.t)
- zeffshift=interp1(psiscatvol.dim{1},zeffshift,psitdi.dim{3});
+ zeffshift=interp1(gdat_data.t,zeffshift,psitdi.dim{3});
otherwise
if (gdat_params.nverbose>=1);
disp(' bad time dimension for zshift')
- disp(['it should be 1 or ' num2str(length(psiscatvol.dim{1})) ' or ' num2str(length(psitdi.dim{3}))])
+ disp(['it should be 1 or ' num2str(length(gdat_data.t)) ' or ' num2str(length(psitdi.dim{3}))])
end
end
for it=1:length(gdat_data.t)
itpsitdi=iround_os(psitdi.dim{3},gdat_data.t(it));
psirz=psitdi.data(:,:,itpsitdi);
- %psiscatvol0=griddata(rmesh,zmesh,psirz',0.9*ones(size(zthom)),zthom-zeffshift(itpsitdi),'cubic'); % faster with interpos
+ %psiscatvol0=interp2(rmesh,zmesh,psirz',0.9*ones(size(zthom)),zthom-zeffshift(itpsitdi),'spline'); % faster with interpos
psiscatvol0=interpos2Dcartesian(rmesh,zmesh,psirz,0.9*ones(size(zthom)),zthom-zeffshift(itpsitdi),-0.1,-0.1);
- psiscatvol0=griddata(rmesh,zmesh,psirz',0.9*ones(size(zthom)),zthom-zeffshift(itpsitdi),'linear');
+ psiscatvol0=interp2(rmesh,zmesh,psirz',0.9*ones(size(zthom)),zthom-zeffshift(itpsitdi),'linear');
psiscatvol.data(it,:)=psiscatvol0;
% since take closest psi(R,Z) from psitdi, should also take closest for psi_max and not interpolating
itpsiaxis = iround_os(psiaxis.dim{1},gdat_data.t(it));
--
GitLab