diff --git a/matlab/AUG/aug_requests_mapping.m b/matlab/AUG/aug_requests_mapping.m index 26360b67e970152a80d3efa24d2488ab970a661b..4ec989ebce289664a0df30a814a73b94cee0e5fb 100644 --- a/matlab/AUG/aug_requests_mapping.m +++ b/matlab/AUG/aug_requests_mapping.m @@ -186,14 +186,27 @@ switch lower(data_request) mapping.timedim = 1; mapping.label = 'li3'; mapping.method = 'expression'; + % li and betapol should have similar "normalization", using Bpa=int(Bp dlp)/int(dlp) and V=2pi R0 pi a^2 kappa and int(dlp)=2pi a sqrt(kappa) we get 2/R0 = int(dlp)^2/V so li3 is defined as [ + % li3 = 2 int(Bp^2 dV) / (mu0^2 Ip^2 R0) + % while li ala EFIT [https://iopscience.iop.org/article/10.1088/0029-5515/25/10/004 Eq.(5)] or CLISTE/IDE/GPEC [https://doi.org/10.13182/FST15-154 p.5] by + % li1 = int(Bp^2 dV) / (V Bpa^2) = int(Bp^2 dV) / (mu0^2 Ip^2) * int(dlp)^2 / V = CONVF * li3 + % CONVF = conversion_factor_liefit_li3 = int(dlp)^2/V * R0/2 + help_text = ['sprintf(''%s\n%s\n%s%s\n%s\n%s'',''li3 = 2 int(Bp^2 dV) / (mu0^2 Ip^2 R0), see Freidberg or '',', ... + '''CHEASE https://doi.org/10.1016/0010-4655(96)00046-X p. 5'',', ... + '''li ala EFIT [https://iopscience.iop.org/article/10.1088/0029-5515/25/10/004 Eq.(5)], CLISTE, IDE, '',', ... + '''GPEC [https://doi.org/10.13182/FST15-154 p.5]'',', ... + '''li = int(Bp^2 dV) / (V Bpa^2) = int(Bp^2 dV) / (mu0^2 Ip^2) * int(dlp)^2 / V = CONVF * li3'',', ... + '''CONVF = conversion_factor_liefit_li3 = int(dlp)^2/V * R0/2'')']; mapping.expression = ['params_eff = gdat_data.gdat_params;params_eff.data_request=''li'';' ... - 'gdat_tmp=gdat_aug(shot,params_eff);r0exp=1.65;gdat_tmp.r0=r0exp;' ... + 'gdat_tmp=gdat_aug(shot,params_eff);ij=find(gdat_tmp.data<=0);gdat_tmp.data(ij)=NaN;' ... + 'r0exp=1.65;gdat_tmp.r0=r0exp;' ... 'params_eff.data_request=''volume'';' ... - 'gdat_vol=gdat_aug(shot,params_eff);ij=find(gdat_vol.data==0);gdat_vol.data(ij)=NaN;' ... + 'gdat_vol=gdat_aug(shot,params_eff);ij=find(gdat_vol.data<0.5);gdat_vol.data(ij)=NaN;' ... 'params_eff.data_request=[{''FPG''},{''Circumf''}];' ... - 'gdat_pol_length=gdat_aug(shot,params_eff);ij=find(gdat_pol_length.data==0);gdat_pol_length.data(ij)=NaN;' ... - 'gdat_tmp.conversion_factor_liefit_li3=gdat_tmp.r0./2.*gdat_pol_length.data.^2./gdat_vol.data;' ... - 'gdat_tmp.data = gdat_tmp.data./gdat_tmp.conversion_factor_liefit_li3;']; + 'gdat_pol_length=gdat_aug(shot,params_eff);ij=find(gdat_pol_length.data<=0);gdat_pol_length.data(ij)=NaN;' ... + 'gdat_tmp.conversion_factor_liefit_li3=gdat_tmp.r0./2.*gdat_pol_length.data.^2./max(abs(gdat_vol.data),1e-1);' ... + 'gdat_tmp.data = gdat_tmp.data./gdat_tmp.conversion_factor_liefit_li3;' ... + 'gdat_tmp.help = ' help_text ';']; case 'mhd' mapping.timedim = 1; mapping.label = {'n\_odd','n\_even'};% this superseeds the expression