From 4c44e892ad4bd501ad453d31c005e5ad09f9062a Mon Sep 17 00:00:00 2001 From: Olivier Sauter <olivier.sauter@epfl.ch> Date: Tue, 20 Feb 2018 16:50:05 +0000 Subject: [PATCH] add rbphi_rho, at this stage for liuqe matlab since node exists git-svn-id: https://spcsvn.epfl.ch/repos/TCV/gdat/trunk@9385 d63d8f72-b253-0410-a779-e742ad2e26cf --- crpptbx/TCV/gdat_tcv.m | 36 ++++++++++++++++++++++++++++++ crpptbx/TCV/tcv_requests_mapping.m | 4 ++++ 2 files changed, 40 insertions(+) diff --git a/crpptbx/TCV/gdat_tcv.m b/crpptbx/TCV/gdat_tcv.m index cba8b5ff..63fb9ad6 100644 --- a/crpptbx/TCV/gdat_tcv.m +++ b/crpptbx/TCV/gdat_tcv.m @@ -1560,6 +1560,42 @@ elseif strcmp(mapping_for_tcv.method,'switchcase') % add grids_1d to have rhotor, etc gdat_data = get_grids_1d(gdat_data,1,1,gdat_params.nverbose); + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + case {'rbphi_rho', 'rbtor_rho'} + % R*Bphi(rho,t) from F from FFprime + if liuqe_matlab==0 + disp('not yet implemented for liuqe fortran') + return + else + nodenameeff=['tcv_eq(''rbtor_rho'',''LIUQE.M' substr_liuqe_tcv_eq ''')']; + end + if liuqe_version_eff==-1 + disp('not yet implemented for fbte') + return + end + tracetdi=tdi(nodenameeff); + if isempty(tracetdi.data) || isempty(tracetdi.dim) % || ischar(tracetdi.data) (to add?) + if (gdat_params.nverbose>=1); warning(['problems loading data for ' nodenameeff ' for data_request= ' data_request_eff]); end + if (gdat_params.nverbose>=3); disp(['rerun LIUQE?']); end + return + end + gdat_data.data = tracetdi.data; + gdat_data.dim = tracetdi.dim; + gdat_data.t = gdat_data.dim{2}; + gdat_data.data_fullpath=[nodenameeff ' on rhopol']; + if liuqe_matlab==0 + rhopol_eff = ones(size(tracetdi.dim{1})); + rhopol_eff(:) = sqrt(linspace(0,1,length(tracetdi.dim{1}))); + gdat_data.dim{1} = rhopol_eff; + end + gdat_data.x = gdat_data.dim{1}; + gdat_data.dimunits{1} = 'rho_pol~sqrt(\psi_norm)'; + gdat_data.dimunits{2} = 's'; + gdat_data.units = ''; + gdat_data.request_description = nodenameeff; + % add grids_1d to have rhotor, etc + gdat_data = get_grids_1d(gdat_data,1,1,gdat_params.nverbose); + case {'phi_tor', 'phitor', 'toroidal_flux'} % Phi(LCFS) = int(Bphi dSphi), can use Eq.(11) of "Tokamak coordinate conventions: COCOS" paper: % O. Sauter, S.Yu. Medvedev, Comput. Phys. Commun. 184 (2013) 293–302 diff --git a/crpptbx/TCV/tcv_requests_mapping.m b/crpptbx/TCV/tcv_requests_mapping.m index ecc6774e..51505bb2 100644 --- a/crpptbx/TCV/tcv_requests_mapping.m +++ b/crpptbx/TCV/tcv_requests_mapping.m @@ -269,6 +269,10 @@ switch lower(data_request) mapping.timedim = 2; mapping.label = 'q'; mapping.method = 'switchcase'; + case {'rbphi_rho', 'rbtor_rho'} + mapping.timedim = 2; + mapping.label = 'R B_\phi'; + mapping.method = 'switchcase'; case 'r_contour' mapping.timedim = 2; mapping.method = 'tdiliuqe'; -- GitLab