Skip to content
Snippets Groups Projects

add psi_axis psi_bnd in core_profiles, correct psi and ec_launchers launching_positions

Merged add psi_axis psi_bnd in core_profiles, correct psi and ec_launchers launching_positions
fix_ec_launcher_core_profiles_psiaxis into master
Merged Olivier Sauter requested to merge fix_ec_launcher_core_profiles_psiaxis into master
Compare
and
3 files
+ 23
− 7
Compare changes
  • Side-by-side
  • Inline
Files
3
matlab/TCV_IMAS/tcv_get_ids_core_profiles.m
+ 10
− 0
@@ -47,6 +47,13 @@ temp_1d.fit.te_rho.gdat_params = temp_1d.te_rho.gdat_params;
temp_1d.fit.te_rho.shot = temp_1d.te_rho.shot;
temp_1d.fit.te_rho = get_grids_1d(temp_1d.fit.te_rho,1,1);
params_eff.data_request = 'psi_axis';
temp_1d.psi_axis = gdat(params_cores_profiles.shot,params_eff);
temp_1d_desc.psi_axis = params_eff.data_request;
params_eff.data_request = 'psi_edge';
temp_1d.psi_edge = gdat(params_cores_profiles.shot,params_eff);
temp_1d_desc.psi_edge = params_eff.data_request;
temp_1d.fit.ne_rho = temp_1d.ne_rho.fit;
if isempty(temp_1d.te_rho.fit.t)
disp('te_rho.fit')
@@ -156,7 +163,10 @@ for it=1:length(ids_core_profiles.time)
ids_core_profiles.profiles_1d{it}.grid.rho_tor_norm = temp_1d.fit.te_rho.grids_1d.rhotornorm(:,it);
ids_core_profiles.profiles_1d{it}.grid.rho_tor = temp_1d.fit.te_rho.grids_1d.rhotornorm(:,it) ...
.* temp_1d.fit.te_rho.grids_1d.rhotor_edge(it);
ids_core_profiles.profiles_1d{it}.grid.rho_pol_norm = temp_1d.fit.te_rho.grids_1d.rhopolnorm;
ids_core_profiles.profiles_1d{it}.grid.psi = temp_1d.fit.te_rho.grids_1d.psi(:,it);
ids_core_profiles.profiles_1d{it}.grid.psi_magnetic_axis = 0. * temp_1d.fit.te_rho.grids_1d.psi(1,it);
ids_core_profiles.profiles_1d{it}.grid.psi_boundary = temp_1d.fit.te_rho.grids_1d.psi(end,it);
ids_core_profiles.profiles_1d{it}.grid.volume = temp_1d.fit.te_rho.grids_1d.rhovolnorm(:,it).^2 ...
.* temp_1d.fit.te_rho.grids_1d.volume_edge(it);
ids_core_profiles.profiles_1d{it}.grid.area = interpos(temp_1d.area.x,area_cpt(:,it),temp_1d.fit.te_rho.grids_1d.rhopolnorm, ...