diff --git a/crpptbx/AUG/aug_requests_mapping.m b/crpptbx/AUG/aug_requests_mapping.m index 5e935b79fe90d59f9bafb334064ed774007d2e25..c01315957e192407d8cd6e04afa04bc868a4abeb 100644 --- a/crpptbx/AUG/aug_requests_mapping.m +++ b/crpptbx/AUG/aug_requests_mapping.m @@ -214,6 +214,28 @@ switch lower(data_request) mapping.timedim = 2; mapping.label = 'ne and Te'; mapping.method = 'switchcase'; + case {'ng','ngreenwald','n_greenwald'} + mapping.timedim = 1; + mapping.label = 'nG=Ip[MA]/(\pi a^2)*1e20 on nel times'; + mapping.method = 'expression'; + mapping.expression = ['params_eff = gdat_data.gdat_params;params_eff.data_request=''nel'';' ... + 'gdat_tmp=gdat_aug(shot,params_eff);params_eff.data_request=''ip'';' ... + 'gdat_tmp2=gdat_aug(shot,params_eff);ij=find(gdat_tmp2.data==0);gdat_tmp2.data(ij)=NaN;' ... + 'tmp_data2=interp1(gdat_tmp2.t,gdat_tmp2.data,gdat_tmp.t,[],NaN);' ... + 'params_eff.data_request=''a_minor'';' ... + 'gdat_tmp3=gdat_aug(shot,params_eff);ij=find(gdat_tmp3.data==0);gdat_tmp3.data(ij)=NaN;' ... + 'tmp_data3=interp1(gdat_tmp3.t,gdat_tmp3.data,gdat_tmp.t,[],NaN);' ... + 'gdat_tmp.data = tmp_data2*1e-6./pi./(tmp_data3.^2+1e-5);' ... + 'ij=find(gdat_tmp.data<0 | gdat_tmp.data>4);gdat_tmp.data(ij)=NaN;gdat_tmp.data = gdat_tmp.data * 1e20;']; + case {'ngf','greenwald_fraction','f_greenwald','ng_fraction'} + mapping.timedim = 1; + mapping.label = 'Greenwald\_fraction=n\_el/n\_G'; + mapping.method = 'expression'; + mapping.expression = ['params_eff = gdat_data.gdat_params;params_eff.data_request=''nel'';' ... + 'gdat_tmp=gdat_aug(shot,params_eff);params_eff.data_request=''n_greenwald'';' ... + 'gdat_tmp2=gdat_aug(shot,params_eff);ij=find(gdat_tmp2.data==0);gdat_tmp2.data(ij)=NaN;' ... + 'tmp_data2=interp1(gdat_tmp2.t,gdat_tmp2.data,gdat_tmp.t,[],NaN);' ... + 'gdat_tmp.data = gdat_tmp.data./(tmp_data2+1e-5);']; case 'ni' mapping.method = 'switchcase'; % especially since might have option fit, etc case 'pgyro' diff --git a/crpptbx/D3D/d3d_requests_mapping.m b/crpptbx/D3D/d3d_requests_mapping.m index b339a152923ee2cde840c23f09ee3e2d555c1e3d..820199d1684bf18a02967736719a475fba7ea38a 100644 --- a/crpptbx/D3D/d3d_requests_mapping.m +++ b/crpptbx/D3D/d3d_requests_mapping.m @@ -201,6 +201,28 @@ switch lower(data_request) mapping.method = 'switchcase'; case 'ni' mapping.method = 'switchcase'; % especially since might have option fit, etc + case {'ng','ngreenwald','n_greenwald'} + mapping.timedim = 1; + mapping.label = 'nG=Ip[MA]/(\pi a^2)*1e20 on nel times'; + mapping.method = 'expression'; + mapping.expression = ['params_eff = gdat_data.gdat_params;params_eff.data_request=''nel'';' ... + 'gdat_tmp=gdat_aug(shot,params_eff);params_eff.data_request=''ip'';' ... + 'gdat_tmp2=gdat_aug(shot,params_eff);ij=find(gdat_tmp2.data==0);gdat_tmp2.data(ij)=NaN;' ... + 'tmp_data2=interp1(gdat_tmp2.t,gdat_tmp2.data,gdat_tmp.t,[],NaN);' ... + 'params_eff.data_request=''a_minor'';' ... + 'gdat_tmp3=gdat_aug(shot,params_eff);ij=find(gdat_tmp3.data==0);gdat_tmp3.data(ij)=NaN;' ... + 'tmp_data3=interp1(gdat_tmp3.t,gdat_tmp3.data,gdat_tmp.t,[],NaN);' ... + 'gdat_tmp.data = tmp_data2*1e-6./pi./(tmp_data3.^2+1e-5);' ... + 'ij=find(gdat_tmp.data<0 | gdat_tmp.data>4);gdat_tmp.data(ij)=NaN;gdat_tmp.data = gdat_tmp.data * 1e20;']; + case {'ngf','greenwald_fraction','f_greenwald','ng_fraction'} + mapping.timedim = 1; + mapping.label = 'Greenwald\_fraction=n\_el/n\_G'; + mapping.method = 'expression'; + mapping.expression = ['params_eff = gdat_data.gdat_params;params_eff.data_request=''nel'';' ... + 'gdat_tmp=gdat_aug(shot,params_eff);params_eff.data_request=''n_greenwald'';' ... + 'gdat_tmp2=gdat_aug(shot,params_eff);ij=find(gdat_tmp2.data==0);gdat_tmp2.data(ij)=NaN;' ... + 'tmp_data2=interp1(gdat_tmp2.t,gdat_tmp2.data,gdat_tmp.t,[],NaN);' ... + 'gdat_tmp.data = gdat_tmp.data./(tmp_data2+1e-5);']; case 'pgyro' mapping.timedim = 1; mapping.label = 'EC gyros'; diff --git a/crpptbx/JET/jet_requests_mapping.m b/crpptbx/JET/jet_requests_mapping.m index 3957e1442410df2a9aa2294eaba62bf835dac7ef..81fb6f3c139518b30ad1d3a5e4290ddc8e3acbee 100644 --- a/crpptbx/JET/jet_requests_mapping.m +++ b/crpptbx/JET/jet_requests_mapping.m @@ -168,6 +168,28 @@ switch lower(data_request) mapping.timedim = 2; mapping.label = 'ne and Te'; mapping.method = 'switchcase'; + case {'ng','ngreenwald','n_greenwald'} + mapping.timedim = 1; + mapping.label = 'nG=Ip[MA]/(\pi a^2)*1e20 on nel times'; + mapping.method = 'expression'; + mapping.expression = ['params_eff = gdat_data.gdat_params;params_eff.data_request=''nel'';' ... + 'gdat_tmp=gdat_aug(shot,params_eff);params_eff.data_request=''ip'';' ... + 'gdat_tmp2=gdat_aug(shot,params_eff);ij=find(gdat_tmp2.data==0);gdat_tmp2.data(ij)=NaN;' ... + 'tmp_data2=interp1(gdat_tmp2.t,gdat_tmp2.data,gdat_tmp.t,[],NaN);' ... + 'params_eff.data_request=''a_minor'';' ... + 'gdat_tmp3=gdat_aug(shot,params_eff);ij=find(gdat_tmp3.data==0);gdat_tmp3.data(ij)=NaN;' ... + 'tmp_data3=interp1(gdat_tmp3.t,gdat_tmp3.data,gdat_tmp.t,[],NaN);' ... + 'gdat_tmp.data = tmp_data2*1e-6./pi./(tmp_data3.^2+1e-5);' ... + 'ij=find(gdat_tmp.data<0 | gdat_tmp.data>4);gdat_tmp.data(ij)=NaN;gdat_tmp.data = gdat_tmp.data * 1e20;']; + case {'ngf','greenwald_fraction','f_greenwald','ng_fraction'} + mapping.timedim = 1; + mapping.label = 'Greenwald\_fraction=n\_el/n\_G'; + mapping.method = 'expression'; + mapping.expression = ['params_eff = gdat_data.gdat_params;params_eff.data_request=''nel'';' ... + 'gdat_tmp=gdat_aug(shot,params_eff);params_eff.data_request=''n_greenwald'';' ... + 'gdat_tmp2=gdat_aug(shot,params_eff);ij=find(gdat_tmp2.data==0);gdat_tmp2.data(ij)=NaN;' ... + 'tmp_data2=interp1(gdat_tmp2.t,gdat_tmp2.data,gdat_tmp.t,[],NaN);' ... + 'gdat_tmp.data = gdat_tmp.data./(tmp_data2+1e-5);']; case 'ni' mapping.method = 'switchcase'; % especially since might have option fit, etc case 'powers' diff --git a/crpptbx/TCV/tcv_requests_mapping.m b/crpptbx/TCV/tcv_requests_mapping.m index 71f355d7cd4ac558b970c39ebb9dec1a5582aa3f..f4f038b7bb172e973c37748bbfdaff83ca6d9171 100644 --- a/crpptbx/TCV/tcv_requests_mapping.m +++ b/crpptbx/TCV/tcv_requests_mapping.m @@ -153,6 +153,28 @@ switch lower(data_request) case 'ni' mapping.timedim = 2; mapping.method = 'switchcase'; % especially since might have option fit, etc + case {'ng','ngreenwald','n_greenwald'} + mapping.timedim = 1; + mapping.label = 'nG=Ip[MA]/(\pi a^2)*1e20 on nel times'; + mapping.method = 'expression'; + mapping.expression = ['params_eff = gdat_data.gdat_params;params_eff.data_request=''nel'';' ... + 'gdat_tmp=gdat_aug(shot,params_eff);params_eff.data_request=''ip'';' ... + 'gdat_tmp2=gdat_aug(shot,params_eff);ij=find(gdat_tmp2.data==0);gdat_tmp2.data(ij)=NaN;' ... + 'tmp_data2=interp1(gdat_tmp2.t,gdat_tmp2.data,gdat_tmp.t,[],NaN);' ... + 'params_eff.data_request=''a_minor'';' ... + 'gdat_tmp3=gdat_aug(shot,params_eff);ij=find(gdat_tmp3.data==0);gdat_tmp3.data(ij)=NaN;' ... + 'tmp_data3=interp1(gdat_tmp3.t,gdat_tmp3.data,gdat_tmp.t,[],NaN);' ... + 'gdat_tmp.data = tmp_data2*1e-6./pi./(tmp_data3.^2+1e-5);' ... + 'ij=find(gdat_tmp.data<0 | gdat_tmp.data>4);gdat_tmp.data(ij)=NaN;gdat_tmp.data = gdat_tmp.data * 1e20;']; + case {'ngf','greenwald_fraction','f_greenwald','ng_fraction'} + mapping.timedim = 1; + mapping.label = 'Greenwald\_fraction=n\_el/n\_G'; + mapping.method = 'expression'; + mapping.expression = ['params_eff = gdat_data.gdat_params;params_eff.data_request=''nel'';' ... + 'gdat_tmp=gdat_aug(shot,params_eff);params_eff.data_request=''n_greenwald'';' ... + 'gdat_tmp2=gdat_aug(shot,params_eff);ij=find(gdat_tmp2.data==0);gdat_tmp2.data(ij)=NaN;' ... + 'tmp_data2=interp1(gdat_tmp2.t,gdat_tmp2.data,gdat_tmp.t,[],NaN);' ... + 'gdat_tmp.data = gdat_tmp.data./(tmp_data2+1e-5);']; case 'powers' mapping.timedim = 1; mapping.label = 'various powers';