From 1953158a7043c733dedbc72f09b1d4d057c92eac Mon Sep 17 00:00:00 2001
From: Olivier Sauter <olivier.sauter@epfl.ch>
Date: Mon, 24 Jun 2019 07:18:17 +0000
Subject: [PATCH] add H98y2
git-svn-id: https://spcsvn.epfl.ch/repos/TCV/gdat/trunk@12184 d63d8f72-b253-0410-a779-e742ad2e26cf
---
crpptbx/TCV/tcv_requests_mapping.m | 38 +++++++++++++++++++-----------
1 file changed, 24 insertions(+), 14 deletions(-)
diff --git a/crpptbx/TCV/tcv_requests_mapping.m b/crpptbx/TCV/tcv_requests_mapping.m
index 124ffeef..5195dd47 100644
--- a/crpptbx/TCV/tcv_requests_mapping.m
+++ b/crpptbx/TCV/tcv_requests_mapping.m
@@ -136,6 +136,16 @@ switch lower(data_request)
mapping.label = 'Halpha';
mapping.method = 'switchcase';
mapping.expression = '';
+ case 'h98y2'
+ mapping.timedim = 1;
+ mapping.label = 'H98y2';
+ mapping.method = 'expression';
+ mapping.expression = ['params_eff = gdat_data.gdat_params;params_eff.data_request=''\tcv_shot::top.results.conf:tau'';' ...
+ 'gdat_tmp=gdat_tcv(shot,params_eff);params_eff.data_request=''\tcv_shot::top.results.conf:taue'';' ...
+ 'gdat_tmp2=gdat_tcv(shot,params_eff);'...
+ 'params_eff.data_request=''\tcv_shot::top.results.conf:h_scal'';' ...
+ 'gdat_tmp3=gdat_tcv(shot,params_eff);ih98y2=5;' ...
+ 'gdat_tmp.data = gdat_tmp.data./gdat_tmp2.data .* gdat_tmp3.data(ih98y2,:)'';'];
% $$$ case 'icds'
% $$$ mapping.timedim = 1;
% $$$ mapping.label = 'various driven current';
@@ -218,22 +228,22 @@ switch lower(data_request)
mapping.method = 'expression';
mapping.expression = ['params_eff = gdat_data.gdat_params;params_eff.data_request=''nel'';' ...
'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);' ...
+ '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_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 = abs(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;'];
+ '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 = abs(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;'];
case {'ngf','greenwald_fraction','f_greenwald','ng_fraction'}
mapping.timedim = 1;
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_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);'];
+ '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 {'ec_data', 'aux', 'h_cd', 'nbi_data', 'ic_data', 'lh_data', 'ohm_data', 'bs_data'}
mapping.timedim = 1;
mapping.label = 'various Pdens, Icd, jcd';
@@ -413,12 +423,12 @@ switch lower(data_request)
% $$$ 'gdat_tmp=gdat_tcv(shot,params_eff);ij=find(gdat_tmp.t>0.5&gdat_tmp.t<1.03);' ...
% $$$ 'aa=interp1([' num2str(time_for_corr(1)) ' ' num2str(time_for_corr(2)) ...
% $$$ '],[' num2str(corr(1)) ' ' num2str(corr(2)) '],gdat_tmp.t(ij));' ...
-% $$$ 'gdat_tmp.data(ij)=max(gdat_tmp.data(ij),aa);'];
+% $$$ 'gdat_tmp.data(ij)=max(gdat_tmp.data(ij),aa);'];
% $$$ else
- mapping.method = 'tdiliuqe';
- mapping.expression = '\results::total_energy';
- mapping.expression = '\tcv_shot::top.results.equil_1.results:w_mhd';
- mapping.expression = 'tcv_eq(''''w_mhd'''',''''LIUQE.M'''')';
+ mapping.method = 'tdiliuqe';
+ mapping.expression = '\results::total_energy';
+ mapping.expression = '\tcv_shot::top.results.equil_1.results:w_mhd';
+ mapping.expression = 'tcv_eq(''''w_mhd'''',''''LIUQE.M'''')';
% $$$ end
case 'z_contour'
mapping.timedim = 2;
--
GitLab