From 21509f0470a8112bf48a36c45141fe164761981a Mon Sep 17 00:00:00 2001
From: Olivier Sauter <olivier.sauter@epfl.ch>
Date: Wed, 26 Aug 2015 16:28:40 +0000
Subject: [PATCH] add ne_rho, te_rho, nete_rho(pe) with edge option

git-svn-id: https://spcsvn.epfl.ch/repos/TCV/gdat/trunk@4924 d63d8f72-b253-0410-a779-e742ad2e26cf
---
 crpptbx_new/TCV/gdat_tcv.m                   | 105 ++++++++++++++++++-
 crpptbx_new/TCV/tcv_requests_mapping.m       |  34 ++++--
 crpptbx_new/gdat_data_request_names_rho.xlsx | Bin 0 -> 12069 bytes
 crpptbx_new/get_data_request_names.m         |   2 +-
 4 files changed, 126 insertions(+), 15 deletions(-)
 create mode 100644 crpptbx_new/gdat_data_request_names_rho.xlsx

diff --git a/crpptbx_new/TCV/gdat_tcv.m b/crpptbx_new/TCV/gdat_tcv.m
index b4cfa20a..56916d66 100644
--- a/crpptbx_new/TCV/gdat_tcv.m
+++ b/crpptbx_new/TCV/gdat_tcv.m
@@ -555,6 +555,25 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
     gdat_data.request_description = ['data=psi, x=(R,Z), eqdsk contains eqdsk structure with which ' ...
                     'plot_eqdsk, write_eqdsk, read_eqdsk can be used'];
     
+   case {'mhd'}
+    % load n=1, 2 and 3 Bdot from magnetic measurements
+    n1=tdi('abs(mhdmode("LFS",1,1))');
+    n2=tdi('abs(mhdmode("LFS",2,1))');
+    n3=tdi('abs(mhdmode("LFS",3,1))');
+    if ~isempty(n1.data)
+      gdat_data.data(:,1) = reshape(n1.data,length(n1.data),1);
+      if length(n2.data)==length(n1.data); gdat_data.data(:,2) = reshape(n2.data,length(n2.data),1); end
+      if length(n3.data)==length(n1.data); gdat_data.data(:,3) = reshape(n3.data,length(n3.data),1); end
+      gdat_data.dim{1} = n1.dim{1};
+      gdat_data.t = gdat_data.dim{1};
+      gdat_data.dim{2} = [1; 2; 3]; 
+      gdat_data.dimunits{1} = n1.dimunits{1};
+      gdat_data.dimunits{2} = 'n number';
+      gdat_data.units = 'T/s';
+      gdat_data.data_fullpath='abs(mhdmode("LFS",n,1))';
+      gdat_data.request_description = 'delta_Bdot from magnetic probes to get n=1, 2 and 3';
+    end
+    
    case {'ne','te'}
     % ne or Te from Thomson data on raw z mesh vs (z,t)
     nodenameeff=['\results::thomson:' data_request_eff];
@@ -595,9 +614,89 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
       gdat_data.units=tracetdi.units;
     end
     
-   case 'nerho'
-    
-    
+   case {'ne_rho', 'te_rho', 'nete_rho'}
+    try
+      time=mdsdata('\results::thomson:times');
+    catch
+      warning('Problems with \results::thomson:times')
+      warning(['!!!!!!!!!!!!!!!!!!!!!!!!! cannot continue with ' data_request_eff])
+      return
+    end
+    if isempty(time) || ischar(time)
+      thomsontimes=time
+      warning('!!!!!!!!!!!!!!!!!!!!!!!!!\results::thomson:times  is empty? Check')
+      disp(['!!!!!!!!!!!!!!!!!!!!!!!!! cannot continue with ' data_request_eff])
+      return
+    end
+    edge_str_col = '';
+    edge_str_dot = '';
+    if isfield(gdat_data.gdat_params,'edge') && ~isempty(gdat_data.gdat_params.edge) && ...
+          gdat_data.gdat_params.edge>0
+      edge_str_col = ':edge';
+      edge_str_dot = ':edge';
+    end
+    % if nete_rho, do first ne, then Te later (so fir stuff already done)
+    if strcmp(data_request_eff,'ne_rho')  || strcmp(data_request_eff,'nete_rho')
+      nodenameeff=['\results::thomson' edge_str_col ':ne'];
+      tracetdi=tdi(nodenameeff);
+      nodenameeff=['\results::thomson' edge_str_col ':ne; error_bar ; fir_thom_rat; (ne,std)*fir_thom_rat'];
+      tracestd=tdi(['\results::thomson'  edge_str_col ':ne:error_bar']);
+      tracefirrat_data = get_fir_thom_rat_data(shot,'thomson',time);
+    else
+      nodenameeff=['\results::thomson' edge_str_col ':te'];
+      tracetdi=tdi(nodenameeff);
+      nodenameeff=['\results::thomson' edge_str_col ':te; error_bar'];
+      tracestd=tdi(['\results::thomson' edge_str_col ':te:error_bar']);
+    end
+    gdat_data.data=tracetdi.data'; % Thomson data as (t,z)
+    gdat_data.error_bar=tracestd.data';
+    gdat_data.data_fullpath=nodenameeff;
+    if strcmp(data_request_eff,'ne_rho')  || strcmp(data_request_eff,'nete_rho')
+      gdat_data.firrat=tracefirrat_data;
+      gdat_data.data_abs=gdat_data.data*diag(tracefirrat_data);
+      gdat_data.error_bar_abs=gdat_data.error_bar*diag(tracefirrat_data);
+      gdat_data.data_fullpath=[gdat_data.data_fullpath ' ; _abs includes *firrat'];
+    end
+    % add correct dimensions
+    % construct rho mesh
+    psi_max=tdi(['\results::thomson' edge_str_dot ':psi_max' substr_liuqe]);
+    psiscatvol=tdi(['\results::thomson' edge_str_dot ':psiscatvol' substr_liuqe]);
+    if ~isempty(psiscatvol.data) && ~ischar(psiscatvol.data) && ~isempty(psi_max.data) && ~ischar(psi_max.data)
+      for ir=1:length(psiscatvol.dim{2})
+        rho(ir,:)= sqrt(1.-psiscatvol.data(:,ir)./psi_max.data(:))';
+      end
+    else
+      rho=NaN;
+    end
+    gdat_data.dim=[{rho};{time}];
+    gdat_data.dimunits=[{'sqrt(psi)'} ; {'time [s]'}];
+    gdat_data.x=rho;
+    gdat_data.t=time;
+    if any(strcmp(fieldnames(tracetdi),'units'))
+      gdat_data.units=tracetdi.units;
+    end
+    % if nete_rho, copy data as .ne, get .te and put pe=e ne Te in data:
+    if strcmp(data_request_eff,'nete_rho')
+      gdat_data.ne.data = gdat_data.data_abs;
+      gdat_data.ne.error_bar = gdat_data.error_bar_abs;
+      gdat_data.ne.firrat=gdat_data.firrat;
+      gdat_data.ne.units = 'm^{-3}';
+      gdat_data = rmfield(gdat_data,{'firrat','data_abs','error_bar_abs'});
+      %
+      nodenameeff=['\results::thomson' edge_str_col ':te'];
+      tracetdi=tdi(nodenameeff);
+      nodenameeff=['\results::thomson' edge_str_col ':te; error_bar'];
+      tracestd=tdi(['\results::thomson' edge_str_col ':te:error_bar']);
+      gdat_data.te.data=tracetdi.data';
+      gdat_data.te.error_bar=tracestd.data';
+      gdat_data.te.units = tracetdi.units;
+      gdat_data.data_fullpath=['pe=1.6e-19*ne*Te in data, .ne, .te from \results::thomson' ...
+                    edge_str_col ':ne and te and projected on rhopol\_norm'];
+      gdat_data.units='N/m^2';
+      gdat_data.data = 1.6022e-19 .* gdat_data.ne.data .* gdat_data.te.data;
+      gdat_data.error_bar = 1.6022e-19 .* (gdat_data.ne.data .* gdat_data.te.error_bar ...
+          + gdat_data.te.data .* gdat_data.ne.error_bar);
+    end
    otherwise
     warning(['switchcase= ' data_request_eff ' not known in gdat_tcv'])
     error_status=901;
diff --git a/crpptbx_new/TCV/tcv_requests_mapping.m b/crpptbx_new/TCV/tcv_requests_mapping.m
index 465d3ab1..2478786a 100644
--- a/crpptbx_new/TCV/tcv_requests_mapping.m
+++ b/crpptbx_new/TCV/tcv_requests_mapping.m
@@ -64,16 +64,16 @@ switch lower(data_request)
   mapping.expression = '\results::delta_edge';
   % mapping.method = 'function';
   % mapping.expression = ['tdi(''\results::q_psi'');']; % for tests
- case 'delta_top'
-  mapping.timedim = 1;
-  mapping.label = 'delta\_top';
-  mapping.method = 'tdiliuqe';
-  mapping.expression = '\results::delta_ed_top';
  case 'delta_bottom'
   mapping.timedim = 1;
   mapping.label = 'delta\_bottom';
   mapping.method = 'tdiliuqe';
   mapping.expression = '\results::delta_ed_bot';
+ case 'delta_top'
+  mapping.timedim = 1;
+  mapping.label = 'delta\_top';
+  mapping.method = 'tdiliuqe';
+  mapping.expression = '\results::delta_ed_top';
  case 'ece'
   mapping.timedim = 2;
   mapping.method = 'switchcase';
@@ -119,11 +119,11 @@ switch lower(data_request)
   mapping.label = 'line-averaged el. density';
   mapping.method = 'tdi';
   mapping.expression = '\results::fir:n_average';
- case 'nerho'
+ case 'ne_rho'
   mapping.timedim = 2;
   mapping.label = 'ne';
   mapping.method = 'switchcase';
- case 'neterho'
+ case 'nete_rho'
   mapping.timedim = 2;
   mapping.label = 'ne and Te';
   mapping.method = 'switchcase';
@@ -145,7 +145,7 @@ switch lower(data_request)
   mapping.timedim = 1;
   mapping.method = 'tdiliuqe';
   mapping.expression = '\results::q_edge';
- case 'qrho'
+ case 'q_rho'
   mapping.timedim = 2;
   mapping.label = 'q';
   mapping.method = 'switchcase';
@@ -153,6 +153,14 @@ switch lower(data_request)
   mapping.timedim = 1;
   mapping.label = 'Rgeom';
   mapping.method = 'switchcase';
+ case 'rhotor_edge'
+  mapping.timedim = 1;
+  mapping.label = 'rhotor\_edge=sqrt(Phi/pi/B0)';
+  mapping.method = 'switchcase'; % from conf if exist otherwise computes it
+ case 'rhotor'
+  mapping.timedim = 2;
+  mapping.label = 'rhotor\_norm';
+  mapping.method = 'switchcase'; % from conf if exist otherwise computes it
  case 'rhovol'
   mapping.timedim = 2;
   mapping.label = 'rhovol\_norm';
@@ -169,7 +177,7 @@ switch lower(data_request)
   mapping.timedim = 2;
   mapping.label = 'Te';
   mapping.method = 'switchcase';
- case 'terho'
+ case 'te_rho'
   mapping.timedim = 2;
   mapping.label = 'Te';
   mapping.method = 'switchcase';
@@ -185,9 +193,13 @@ switch lower(data_request)
   mapping.label = '';
   mapping.method = 'tdi';
   mapping.expression = [{'\magnetics::vloop[*,$1]'} {'001'}];
- case 'vol'
+ case 'volume'
+  mapping.timedim = 1;
+  mapping.label = 'Volume\_LCFS';
+  mapping.method = 'switchcase';
+ case 'volume_rho'
   mapping.timedim = 2;
-  mapping.label = 'Volume';
+  mapping.label = 'Volume(\rho)';
   mapping.method = 'switchcase';
   % mapping.expression = '\results::psitbx:vol'; (if exists for liuqe2 and 3 as well)
  case 'zeff'
diff --git a/crpptbx_new/gdat_data_request_names_rho.xlsx b/crpptbx_new/gdat_data_request_names_rho.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..a291e3bd6b325ee1e93a860aaa627486929ad29e
GIT binary patch
literal 12069
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
AumAu6

literal 0
HcmV?d00001

diff --git a/crpptbx_new/get_data_request_names.m b/crpptbx_new/get_data_request_names.m
index 5aaf8099..7ff6504e 100644
--- a/crpptbx_new/get_data_request_names.m
+++ b/crpptbx_new/get_data_request_names.m
@@ -10,7 +10,7 @@ for j=1:length(expected_machines)
   data_request_names.(expected_machines{j}) = [];
 end
 
-filename='gdat_data_request_names.xlsx';
+filename='gdat_data_request_names_rho.xlsx';
 
 [numeric_struct,text_struct,raw_struct]=xlsread(filename);
 
-- 
GitLab