diff --git a/matlab/TCV/gdat_tcv.m b/matlab/TCV/gdat_tcv.m index ea3813172a2aaa9a9a5c43bcdadac7ba515319cf..4bff44ddc2a6daf5e4b44648bf84af4bacfa85a8 100644 --- a/matlab/TCV/gdat_tcv.m +++ b/matlab/TCV/gdat_tcv.m @@ -1188,7 +1188,7 @@ elseif strcmp(mapping_for_tcv.method,'switchcase') for itime=1:length(time) time_eff = time(itime); % use read_results updated to effectively obtain an eqdsk with sign correct with COCOS=2 - [fnames_readresults]=read_results_for_chease(shot,time_eff,liuqe_version_eff,3,[],[],[],zshift,0,1,nrz_out); + [fnames_readresults]=read_results_for_chease(shot,time_eff,liuqe_version,3,[],[],[],zshift,0,1,nrz_out); cocos_read_results_for_chease = 17; if isempty(fnames_readresults) if gdat_params.nverbose>=1; @@ -2083,7 +2083,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 % NOTE: Since 2019 psi_scatvol uses psitbx with cubic-spline interpolation, unsure what shots have new data or not ... recompute_psiscatvol_always = 1; - if liuqe_version==-1; recompute_psiscatvol_always = 1; end + if liuqe_version_eff==-1; recompute_psiscatvol_always = 1; end % NOTE: Since oct.2019 psi_scatvol stored in nodes now uses LIUQE.M (shot range to check if any ...) if all(abs(zshift)<1e-5) && liuqe_matlab==0 && recompute_psiscatvol_always==0 if strcmp(substr_liuqe,'_1'); substr_liuqe = ''; end