From eb5547ed2bdc6daf9af0382dd40056d04d25a7c1 Mon Sep 17 00:00:00 2001 From: Antonia Frank <antonia.frank@epfl.ch> Date: Thu, 19 Oct 2023 17:52:46 +0200 Subject: [PATCH] Add parallel conductivity --- matlab/TCV_IMAS/tcv_get_ids_core_profiles.m | 6 ++++++ matlab/TCV_IMAS/tcv_get_ids_equilibrium.m | 15 ++++++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/matlab/TCV_IMAS/tcv_get_ids_core_profiles.m b/matlab/TCV_IMAS/tcv_get_ids_core_profiles.m index d618d754..02a1043c 100644 --- a/matlab/TCV_IMAS/tcv_get_ids_core_profiles.m +++ b/matlab/TCV_IMAS/tcv_get_ids_core_profiles.m @@ -359,6 +359,12 @@ for it=1:length(ids_core_profiles.time) temp_1d_desc.j_ohmic = current_non_inductive.ohm.ohm_data.cd_dens.label; end +%% parallel conductivity (neoclassical) +signeo = gdat(params_cores_profiles.shot,'\results::ibs:signeo'); +for it=1:length(ids_core_profiles.time) + ids_core_profiles.profiles_1d{it}.conductivity_parallel = signeo.data(:,it); + temp_1d_desc.j_bootstrap = signeo.label; +end %% add descriptions for profiles_1d ids_core_profiles_description.profiles_1d = temp_1d_desc; diff --git a/matlab/TCV_IMAS/tcv_get_ids_equilibrium.m b/matlab/TCV_IMAS/tcv_get_ids_equilibrium.m index 26387602..b0b22e2d 100644 --- a/matlab/TCV_IMAS/tcv_get_ids_equilibrium.m +++ b/matlab/TCV_IMAS/tcv_get_ids_equilibrium.m @@ -1,15 +1,20 @@ -function [ids_equilibrium,ids_equilibrium_description,varargout] = tcv_get_ids_equilibrium(shot,ids_equil_empty, gdat_params,varargin) +function [ids_equilibrium,ids_equilibrium_description,varargout] = ... + tcv_get_ids_equilibrium(shot,ids_equil_empty,gdat_params,varargin) % -% [ids_equilibrium,ids_equilibrium_description,varargout] = tcv_get_ids_equilibrium(shot,ids_equil_empty,varargin); +% [ids_equilibrium,ids_equilibrium_description,varargout] = ... +% tcv_get_ids_equilibrium(shot,ids_equil_empty,gdat_params,varargin); % % -% gdat_params: gdat_data.gdat_params to get all params passed from original call, in particular error_bar and cocos_out options +% gdat_params: gdat_data.gdat_params to get all params passed from original call, +% in particular error_bar and cocos_out options % if exist('gdat_params','var') - [ids_equilibrium, params_equilibrium] = tcv_ids_headpart(shot,ids_equil_empty,'equilibrium','gdat_params',gdat_params,varargin{:}); + [ids_equilibrium, params_equilibrium] = ... + tcv_ids_headpart(shot,ids_equil_empty,'equilibrium','gdat_params',gdat_params,varargin{:}); else - [ids_equilibrium, params_equilibrium] = tcv_ids_headpart(shot,ids_equil_empty,'equilibrium',varargin{:}); + [ids_equilibrium, params_equilibrium] = ... + tcv_ids_headpart(shot,ids_equil_empty,'equilibrium',varargin{:}); aa=gdat_tcv; gdat_params = aa.gdat_params; % to get default params end -- GitLab