From 4dd0102cf41fbb1e8feb0b4f6df745b094afd504 Mon Sep 17 00:00:00 2001
From: Olivier Sauter <olivier.sauter@epfl.ch>
Date: Mon, 10 Jul 2017 12:00:07 +0000
Subject: [PATCH] fix some liuqe2 stuff
git-svn-id: https://spcsvn.epfl.ch/repos/TCV/gdat/trunk@7848 d63d8f72-b253-0410-a779-e742ad2e26cf
---
crpptbx/TCV/gdat_tcv.m | 4 ++--
crpptbx/TCV/tcv_requests_mapping.m | 10 +++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/crpptbx/TCV/gdat_tcv.m b/crpptbx/TCV/gdat_tcv.m
index 2d9cb68e..d872c08c 100644
--- a/crpptbx/TCV/gdat_tcv.m
+++ b/crpptbx/TCV/gdat_tcv.m
@@ -1483,7 +1483,7 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
% need to get q_rho but to avoid loop for rhotor in grids_1d, get q_rho explicitely here
params_eff = gdat_data.gdat_params;
if liuqe_matlab==1
- nodenameeff = 'tcv_eq(''tor_flux_tot'',''LIUQE.M'')';
+ nodenameeff = ['tcv_eq(''tor_flux_tot'',''' psitbx_str ''')'];
phi_tor = tdi(nodenameeff);
else
phi_tor.data = [];
@@ -1673,7 +1673,7 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
return
end
else
- nodenameeff=['tcv_eq(''vol'',''LIUQE.M' substr_liuqe_tcv_eq ''')'];
+ nodenameeff=['tcv_eq(''vol'',''' psitbx_str ''')'];
end
if liuqe_version_eff==-1
data_request_eff = 'volume'; % only LCFS
diff --git a/crpptbx/TCV/tcv_requests_mapping.m b/crpptbx/TCV/tcv_requests_mapping.m
index b66cef30..d3a51762 100644
--- a/crpptbx/TCV/tcv_requests_mapping.m
+++ b/crpptbx/TCV/tcv_requests_mapping.m
@@ -199,11 +199,11 @@ switch lower(data_request)
mapping.label = 'nG=Ip[MA]/(\pi a^2)*1e20 on nel times';
mapping.method = 'expression';
mapping.expression = ['params_eff = gdat_data.gdat_params;params_eff.data_request=''nel'';' ...
- 'gdat_tmp=gdat_aug(shot,params_eff);params_eff.data_request=''ip'';' ...
- 'gdat_tmp2=gdat_aug(shot,params_eff);ij=find(gdat_tmp2.data==0);gdat_tmp2.data(ij)=NaN;' ...
+ 'gdat_tmp=gdat_tcv(shot,params_eff);params_eff.data_request=''ip'';' ...
+ 'gdat_tmp2=gdat_tcv(shot,params_eff);ij=find(gdat_tmp2.data==0);gdat_tmp2.data(ij)=NaN;' ...
'tmp_data2=interp1(gdat_tmp2.t,gdat_tmp2.data,gdat_tmp.t,[],NaN);' ...
'params_eff.data_request=''a_minor'';' ...
- 'gdat_tmp3=gdat_aug(shot,params_eff);ij=find(gdat_tmp3.data==0);gdat_tmp3.data(ij)=NaN;' ...
+ 'gdat_tmp3=gdat_tcv(shot,params_eff);ij=find(gdat_tmp3.data==0);gdat_tmp3.data(ij)=NaN;' ...
'tmp_data3=interp1(gdat_tmp3.t,gdat_tmp3.data,gdat_tmp.t,[],NaN);' ...
'gdat_tmp.data = tmp_data2*1e-6./pi./(tmp_data3.^2+1e-5);' ...
'ij=find(gdat_tmp.data<0 | gdat_tmp.data>4);gdat_tmp.data(ij)=NaN;gdat_tmp.data = gdat_tmp.data * 1e20;'];
@@ -212,8 +212,8 @@ switch lower(data_request)
mapping.label = 'Greenwald\_fraction=n\_el/n\_G';
mapping.method = 'expression';
mapping.expression = ['params_eff = gdat_data.gdat_params;params_eff.data_request=''nel'';' ...
- 'gdat_tmp=gdat_aug(shot,params_eff);params_eff.data_request=''n_greenwald'';' ...
- 'gdat_tmp2=gdat_aug(shot,params_eff);ij=find(gdat_tmp2.data==0);gdat_tmp2.data(ij)=NaN;' ...
+ 'gdat_tmp=gdat_tcv(shot,params_eff);params_eff.data_request=''n_greenwald'';' ...
+ 'gdat_tmp2=gdat_tcv(shot,params_eff);ij=find(gdat_tmp2.data==0);gdat_tmp2.data(ij)=NaN;' ...
'tmp_data2=interp1(gdat_tmp2.t,gdat_tmp2.data,gdat_tmp.t,[],NaN);' ...
'gdat_tmp.data = gdat_tmp.data./(tmp_data2+1e-5);'];
case {'phi_tor', 'phitor', 'toroidal_flux'}
--
GitLab