Merge branch 'master' into test_deploy

matlab/D3D/d3d_requests_mapping.m

@@ -109,6 +109,11 @@ switch lower(data_request)
     mapping.gdat_timedim = 2;
     mapping.method = 'switchcase';
     mapping.expression = '';
+  case {'gas','gasa'}
+    mapping.timedim = 1;
+    mapping.label = 'gasa';
+    mapping.method = 'signal';
+    mapping.expression = [{'D3D'},{'\gasa'}];
   case 'halpha'
     mapping.timedim = 1;
     mapping.label = 'Halpha';
@@ -194,19 +199,26 @@ switch lower(data_request)
     mapping.timedim = 1;
     mapping.label = 'line integrated el. density';
     mapping.method = 'signal';
-    mapping.expression = {'d3d','\d3d::top.electrons.bci:denv1'};
+    mapping.expression = {'d3d','\d3d::top.electrons.bci:denr0'};
   case {'neints'}
     mapping.timedim = 1;
-    mapping.label = {'denv1','denv2','denv3'};
+    mapping.label = {'denr0','denv1','denv2','denv3'};
     mapping.method = 'expression';
-    mapping.expression = ['params_eff = gdat_data.gdat_params;params_eff.data_request=''\d3d::top.electrons.bci:denv1'';' ...
+    mapping.expression = ['params_eff = gdat_data.gdat_params;params_eff.data_request=''\d3d::top.electrons.bci:denr0'';' ...
                     'gdat_tmp=gdat_d3d(shot,params_eff);gdat_tmp.denv1=gdat_tmp;' ...
+                    'params_eff.data_request=''\d3d::top.electrons.bci:denv1'';gdat_denv1=gdat_d3d(shot,params_eff);' ...
+                    'gdat_tmp.denv1=gdat_denv1;gdat_tmp.data(:,2)=gdat_denv1.data;' ...
                     'params_eff.data_request=''\d3d::top.electrons.bci:denv2'';gdat_denv2=gdat_d3d(shot,params_eff);' ...
-                    'gdat_tmp.denv2=gdat_denv2;gdat_tmp.data(:,2)=gdat_denv2.data;' ...
+                    'gdat_tmp.denv2=gdat_denv2;gdat_tmp.data(:,3)=gdat_denv2.data;' ...
                     'params_eff.data_request=''\d3d::top.electrons.bci:denv3'';gdat_denv3=gdat_d3d(shot,params_eff);' ...
-                    'gdat_tmp.denv3=gdat_denv3;gdat_tmp.data(:,3)=gdat_denv3.data;' ...
-                    'gdat_tmp.dim{2} = [1:3];gdat_tmp.dimunits{2} = {''denv1'',''denv2'',''denv3''};' ...
+                    'gdat_tmp.denv3=gdat_denv3;gdat_tmp.data(:,4)=gdat_denv3.data;' ...
+                    'gdat_tmp.dim{2} = [1:4];gdat_tmp.dimunits{2} = {''denr0'',''denv1'',''denv2'',''denv3''};' ...
                     ';gdat_tmp.dimunits{1}=''s'';'];
+  case {'neint_ts'}
+    % assumes ne_rho in source input
+    mapping.timedim = 1;
+    mapping.label = 'neint from TS';
+    mapping.method = 'switchcase';
   case 'nel'
     mapping.timedim = 1;
     mapping.label = 'NEBAR\_R0';