From a443d3aaf53e6ff3c7c59da817ac56460fd58f7c Mon Sep 17 00:00:00 2001
From: Antonia Frank <antonia.frank@epfl.ch>
Date: Wed, 22 May 2024 13:57:29 +0200
Subject: [PATCH] Update comments and remove if else statement for
astra_tcv_EC_exp call
---
matlab/TCV/gdat_tcv.m | 18 +++++-------------
1 file changed, 5 insertions(+), 13 deletions(-)
diff --git a/matlab/TCV/gdat_tcv.m b/matlab/TCV/gdat_tcv.m
index fd423874..8db337c5 100644
--- a/matlab/TCV/gdat_tcv.m
+++ b/matlab/TCV/gdat_tcv.m
@@ -1600,23 +1600,15 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
gdat_data.ec.ec_inputs = ec_inputs;
- % introduce flag to check whether ec_data could be retrieved
- % successfully
+ % introduce flag to check whether ec_data could be retrieved successfully
filled_successfully = false;
if strcmp(lower(source_icd.ec),'toray')
try % fill ec_data from TORAY via astra_tcv_exp outputs
- if isempty(gdat_data.gdat_params.trialindx)
- % centralized function for toray nodes
- [pabs_gyro,icdtot,pow_dens,currentdrive_dens,rho_dep_pow,drho_pow,...
- pmax,icdmax,currentdrive_dens_w2,rho_dep_icd,drho_icd,~,power_integrated,currentdrive_integrated] = ...
- astra_tcv_EC_exp(shot,[],[],[],[],[],[],1);
- else
- % centralized function for toray nodes
- [pabs_gyro,icdtot,pow_dens,currentdrive_dens,rho_dep_pow,drho_pow,...
- pmax,icdmax,currentdrive_dens_w2,rho_dep_icd,drho_icd,~,power_integrated,currentdrive_integrated] = ...
- astra_tcv_EC_exp(shot,[],[],[],[],[],gdat_data.gdat_params.trialindx,1);
- end
+ % centralized function for toray nodes
+ [pabs_gyro,icdtot,pow_dens,currentdrive_dens,rho_dep_pow,drho_pow,...
+ pmax,icdmax,currentdrive_dens_w2,rho_dep_icd,drho_icd,~,power_integrated,currentdrive_integrated] = ...
+ astra_tcv_EC_exp(shot,[],[],[],[],[],gdat_data.gdat_params.trialindx,1);
if gdat_data.mapping_for.tcv.gdat_timedim ==2
tgrid_to_change = {'pabs_gyro','icdtot','pow_dens','currentdrive_dens','rho_dep_pow','drho_pow','pmax', ...
'icdmax','currentdrive_dens_w2','rho_dep_icd','drho_icd'};
--
GitLab