diff --git a/matlab/TCV_IMAS/tcv_get_ids_core_profiles.m b/matlab/TCV_IMAS/tcv_get_ids_core_profiles.m index 64ec89f0032e07752823a1de2171e5997d560a4f..b0f5f54ca8966b116ec1f01683618b5d92f1cc74 100644 --- a/matlab/TCV_IMAS/tcv_get_ids_core_profiles.m +++ b/matlab/TCV_IMAS/tcv_get_ids_core_profiles.m @@ -264,12 +264,10 @@ Zp = 6.; for it=1:length(ids_core_profiles.time) % Duplicate ion substructure ids_core_profiles.profiles_1d{it}.ion(1:2) = ids_core_profiles.profiles_1d{it}.ion(1); - + ids_core_profiles.profiles_1d{it}.ion{1}.element{1}.a = 2.; ids_core_profiles.profiles_1d{it}.ion{1}.element{1}.z_n = 1; ids_core_profiles.profiles_1d{it}.ion{1}.element{1}.atoms_n = 1; - ids_core_profiles.profiles_1d{it}.ion{1}.element{1}.z_ion = 1; - ids_core_profiles.profiles_1d{it}.ion{1}.element{1}.label = 'D+'; ids_core_profiles.profiles_1d{it}.ion{1}.multiple_states_flag = 0; ids_core_profiles.profiles_1d{it}.ion{1}.temperature = temp_1d.ti.fit.data(:,it_ti(it)); ids_core_profiles.profiles_1d{it}.ion{1}.density = (temp_1d.ni.fit.data(:,it_ti(it)).*Zp-ids_core_profiles.profiles_1d{it}.electrons.density)./(Zp-1.); @@ -277,6 +275,7 @@ for it=1:length(ids_core_profiles.time) ids_core_profiles.profiles_1d{it}.ion{1}.pressure_thermal = 1.6022e-19.*ids_core_profiles.profiles_1d{it}.ion{1}.density_thermal ... .* ids_core_profiles.profiles_1d{it}.ion{1}.temperature; ids_core_profiles.profiles_1d{it}.ion{1}.z_ion = 1; + ids_core_profiles.profiles_1d{it}.ion{1}.label = 'D+'; % ids_core_profiles.profiles_1d{it}.t_i_average = ids_core_profiles.profiles_1d{it}.ion{1}.temperature; ids_core_profiles.profiles_1d{it}.n_i_thermal_total = ids_core_profiles.profiles_1d{it}.ion{1}.density_thermal; @@ -290,8 +289,6 @@ for it=1:length(ids_core_profiles.time) ids_core_profiles.profiles_1d{it}.ion{2}.element{1}.a = 12.; ids_core_profiles.profiles_1d{it}.ion{2}.element{1}.z_n = 6.; ids_core_profiles.profiles_1d{it}.ion{2}.element{1}.atoms_n = 1.; - ids_core_profiles.profiles_1d{it}.ion{2}.element{1}.z_ion = 6.; - ids_core_profiles.profiles_1d{it}.ion{2}.element{1}.label = 'C6+'; ids_core_profiles.profiles_1d{it}.ion{2}.multiple_states_flag = 0; ids_core_profiles.profiles_1d{it}.ion{2}.temperature = ids_core_profiles.profiles_1d{it}.ion{1}.temperature; ids_core_profiles.profiles_1d{it}.ion{2}.density = (ids_core_profiles.profiles_1d{it}.electrons.density - ids_core_profiles.profiles_1d{it}.ion{1}.density) ./ ids_core_profiles.profiles_1d{it}.ion{2}.element{1}.z_ion; @@ -299,6 +296,7 @@ for it=1:length(ids_core_profiles.time) ids_core_profiles.profiles_1d{it}.ion{2}.pressure_thermal = 1.6022e-19.*ids_core_profiles.profiles_1d{it}.ion{2}.density_thermal ... .* ids_core_profiles.profiles_1d{it}.ion{2}.temperature; ids_core_profiles.profiles_1d{it}.ion{2}.z_ion = 6.; + ids_core_profiles.profiles_1d{it}.ion{2}.label = 'C6+'; % average/sums ids_core_profiles.profiles_1d{it}.t_i_average = ids_core_profiles.profiles_1d{it}.ion{1}.temperature; ids_core_profiles.profiles_1d{it}.n_i_thermal_total = ids_core_profiles.profiles_1d{it}.ion{1}.density_thermal + ... diff --git a/matlab/TCV_IMAS/tcv_get_ids_summary.m b/matlab/TCV_IMAS/tcv_get_ids_summary.m index 15a496073d5e4627c0e51b44ee35e65e15522185..53d58888abb425e9709781b130f204997c3cf7f7 100644 --- a/matlab/TCV_IMAS/tcv_get_ids_summary.m +++ b/matlab/TCV_IMAS/tcv_get_ids_summary.m @@ -43,7 +43,7 @@ params_eff.data_request='ip_trapeze'; ip_trapeze = gdat(params_summary.shot,params_eff); ipsign = mdsvalue('\pcs::data:iohfb'); i_t_end = find(ipsign.*ip_trapeze.data(end:-1:1) > 5e3); % an offset might cause a problem... -i_t_end = length(ip_trapeze.t)-i_t_end(1)+2; +i_t_end = length(ip_trapeze.t)-i_t_end(1)+1; t_end = ip_trapeze.t(i_t_end); b0sign = mdsvalue('\pcs::data:if36fb'); params_eff = params_eff_ref;