Skip to content
Snippets Groups Projects
Commit 0320a204 authored by Olivier Sauter's avatar Olivier Sauter
Browse files

add some extra ids elements 

git-svn-id: https://spcsvn.epfl.ch/repos/TCV/gdat/trunk@12059 d63d8f72-b253-0410-a779-e742ad2e26cf
parent 2e712e04
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
crpptbx/TCV_IMAS/tcv_get_ids_equilibrium.m
+ 158
− 108
View file @ 0320a204
This diff is collapsed.
crpptbx/TCV_IMAS/tcv_ids_bpol_probe.m
+ 28
− 9
View file @ 0320a204
......@@ -15,40 +15,59 @@ if exist('gdat_params') && isfield(gdat_params,'error_bar') && ~isempty(gdat_par
error_bar = gdat_params.error_bar;
end
% Get data
% Get data
tmp = gdat_tcv( shot, '\MAGNETICS::BPOL_003');
names = tmp.dim{2};
time = tmp.dim{1};
data = tmp.data;
ang_m = gdat_tcv( shot, 'static("ANG_M")');
% from mapping file from Holger:
probes_name={ '001' '002' '003' '004' '005' '006' '007' '008' '009' '010' '011' '012' '013' '014' '015' '016' '017' '018' '019' ...
'020' '021' '022' '023' '024' '025' '026' '027' '028' '029' '030' '031' '032' '033' '034' '035' '036' '037' '038'};
probes_area = [9.200040D-03, 9.126160D-03, 9.163320D-03, 9.158160D-03, 9.147700D-03, 9.141400D-03, 9.155220D-03, 9.160560D-03, 9.058100D-03, ...
9.228630D-03, 9.251260D-03, 9.149670D-03, 9.271000D-03, 9.112610D-03, 9.114790D-03, 9.180870D-03, 9.131410D-03, 9.120490D-03, ...
9.154670D-03, 9.115670D-03, 9.190590D-03, 9.176150D-03, 9.186540D-03, 9.207520D-03, 9.176340D-03, 9.085060D-03, 9.155950D-03, ...
9.135940D-03, 9.112780D-03, 9.059920D-03, 9.316970D-03, 9.114470D-03, 9.132330D-03, 9.086280D-03, 9.122720D-03, 9.045430D-03, ...
9.106670D-03, 9.124440D-03];
probes_length = [2.400000D-02, 2.400000D-02, 2.400000D-02, 2.400000D-02, 2.400000D-02, 2.400000D-02, 2.400000D-02, 2.400000D-02, 2.400000D-02, ...
  • Antoine Merle @amerle ·
    Owner

    @osauter @carpanes @reimerde Can you check where this value of 24mm comes from?

    In tcvdmag, it says that the probes have a "tangential extension" of 12mm. This file is the source for the static tree data, where the probes are modelled by 5 elements to get a more accurate green function, the separation of the extreme elements is 12mm.

  • Please register or sign in to reply
2.400000D-02, 2.400000D-02, 2.400000D-02, 2.400000D-02, 2.400000D-02, 2.400000D-02, 2.400000D-02, 2.400000D-02, 2.400000D-02, ...
2.400000D-02, 2.400000D-02, 2.400000D-02, 2.400000D-02, 2.400000D-02, 2.400000D-02, 2.400000D-02, 2.400000D-02, 2.400000D-02, ...
2.400000D-02, 2.400000D-02, 2.400000D-02, 2.400000D-02, 2.400000D-02, 2.400000D-02, 2.400000D-02, 2.400000D-02, 2.400000D-02, ...
2.400000D-02, 2.400000D-02];
% Preallocate output structure
Nprobes = size(tmp.data,2);
sub_ids_struct_out(1:Nprobes) = ids_structures;
for ii=1:Nprobes
sub_ids_struct_out{ii}.name = [names{ii}];
sub_ids_struct_out{ii}.name = [names{ii}];
sub_ids_struct_out_description{ii}.name = [names{ii}];
sub_ids_struct_out{ii}.position.r = mdsvalue('STATIC("R_M" )[$1]',sub_ids_struct_out{ii}.name);
sub_ids_struct_out_description{ii}.position_r = ['from ''STATIC("R_M" )[' sub_ids_struct_out{ii}.name ']'''];
sub_ids_struct_out{ii}.position.z = mdsvalue('STATIC("Z_M" )[$1]',sub_ids_struct_out{ii}.name);
sub_ids_struct_out{ii}.position.z = mdsvalue('STATIC("Z_M" )[$1]',sub_ids_struct_out{ii}.name);
sub_ids_struct_out_description{ii}.position_z = ['from ''STATIC("Z_M" )[' sub_ids_struct_out{ii}.name ']'''];
sub_ids_struct_out{ii}.field.data = data(:,ii);
sub_ids_struct_out_description{ii}.field_data = 'from ''\MAGNETICS::BPOL_003''';
sub_ids_struct_out{ii}.field.time = time;
sub_ids_struct_out{ii}.field.time = time;
sub_ids_struct_out{ii}.toroidal_angle = 0.; % to see if should match sector 3 (bpol003)
aa = gdat_tcv( shot, ['static("ANG_M")[$1]'',''' sub_ids_struct_out{ii}.name '']);
aa = gdat_tcv( shot, ['static("ANG_M")[$1]'',''' sub_ids_struct_out{ii}.name '']);
sub_ids_struct_out{ii}.poloidal_angle = aa.data;
ij=strmatch(names{ii},probes_name);
sub_ids_struct_out{ii}.area = probes_area(ij);
sub_ids_struct_out{ii}.length = probes_length(ij);
sub_ids_struct_out_description{ii}.poloidal_angle = ['from ' aa.data_fullpath];
sub_ids_struct_out_description{ii}.toroidal_angle = 'set to 0 although BPOL_003 means sector 3';
sub_ids_struct_out_description{ii}.toroidal_angle = 'set to 0';
sub_ids_struct_out_description{ii}.area = 'from array in machine description file';
sub_ids_struct_out_description{ii}.length = 'from array in machine description file';
end
fixed_error = 0.009999999776483;
switch error_bar
case 'delta'
for ii=1:Nprobes
sub_ids_struct_out{ii}.field.data_error_upper = fixed_error.*ones(size(sub_ids_struct_out{ii}.field.data));% TO BE FOUND;
sub_ids_struct_out{ii}.field.data_error_upper = fixed_error.*ones(size(sub_ids_struct_out{ii}.field.data));% TO BE FOUND;
sub_ids_struct_out_description{ii}.field_data_error_upper = ['from fixed error value in case ' error_bar];
sub_ids_struct_out_description{ii}.field_data_error_lower = ['not provided since symmetric'];
end
......@@ -60,7 +79,7 @@ switch error_bar
sub_ids_struct_out_description{ii}.field_data_error_lower = ['from fixed error value in case ' error_bar];
end
case 'added'
for ii=1:Nprobes
for ii=1:Nprobes
sub_ids_struct_out{ii}.field.data_error_upper = sub_ids_struct_out{ii}.field.data + fixed_error.*ones(size(sub_ids_struct_out{ii}.field.data));
sub_ids_struct_out{ii}.field.data_error_lower = sub_ids_struct_out{ii}.field.data - fixed_error.*ones(size(sub_ids_struct_out{ii}.field.data));
sub_ids_struct_out_description{ii}.field_data_error_upper = ['from data + fixed error value in case ' error_bar];
......
crpptbx/TCV_IMAS/tcv_ids_flux_loop.m
+ 8
− 7
View file @ 0320a204
function [sub_ids_struct_out,sub_ids_struct_out_description] = tcv_ids_flux_loop(shot, ids_structures, gdat_params, varargin)
%
% [sub_ids_struct_out,sub_ids_struct_out_description] = tcv_ids_flux_loop(shot, ids_structures, gdat_params, varargin)
%
% Get ids field magnetics.flux_loop
%
% Get ids field magnetics.flux_loop
%
% error_bar: from gdat_params.error_bar
% 'delta' (default): error_bar to be added inserted in "upper" only as mentioned in description
......@@ -15,7 +15,7 @@ if exist('gdat_params') && isfield(gdat_params,'error_bar') && ~isempty(gdat_par
error_bar = gdat_params.error_bar;
end
% Get data
% Get data
tmp = gdat_tcv(shot, 'tcv_idealloop("FLUX")');
names = tmp.dim{2};
time = tmp.dim{1};
......@@ -33,6 +33,8 @@ for ii=1:Nprobes
sub_ids_struct_out_description{ii}.position_r = ['from ''STATIC("R_F" )[' sub_ids_struct_out{ii}.name ']'''];
sub_ids_struct_out{ii}.position{1}.z = mdsvalue('STATIC("Z_F" )[$1]',sub_ids_struct_out{ii}.name);
sub_ids_struct_out_description{ii}.position_z = ['from ''STATIC("Z_F" )[' sub_ids_struct_out{ii}.name ']'''];
sub_ids_struct_out{ii}.position{1}.phi = 0.;
sub_ids_struct_out_description{ii}.position_phi = ['assumed 0'];
sub_ids_struct_out{ii}.flux.data = data(:,ii);
sub_ids_struct_out_description{ii}.flux_data = 'from ''tcv_idealloop("FLUX")''';
sub_ids_struct_out{ii}.flux.time = time;
......@@ -42,14 +44,14 @@ end
fixed_error = 0.001200000056997;
switch error_bar
case 'delta'
for ii=1:Nprobes
for ii=1:Nprobes
sub_ids_struct_out{ii}.flux.data_error_upper = fixed_error.*ones(size(sub_ids_struct_out{ii}.flux.data));
sub_ids_struct_out_description{ii}.flux_data_error_upper = ['from fixed error value in case ' error_bar];
sub_ids_struct_out_description{ii}.flux_data_error_lower = ['not provided since symmetric'];
%(not filled if symmetric) sub_ids_struct_out{ii}.flux.data_error_lower = 0.0012;%.*ones(size(sub_ids_struct_out{ii}.flux.data));
end
case 'delta_with_lower'
for ii=1:Nprobes
for ii=1:Nprobes
sub_ids_struct_out{ii}.flux.data_error_upper = fixed_error.*ones(size(sub_ids_struct_out{ii}.flux.data));
sub_ids_struct_out{ii}.flux.data_error_lower = sub_ids_struct_out{ii}.flux.data_error_upper;
sub_ids_struct_out_description{ii}.flux_data_error_upper = ['from fixed error value in case ' error_bar];
......@@ -57,7 +59,7 @@ switch error_bar
%(not filled if symmetric) sub_ids_struct_out{ii}.flux.data_error_lower = 0.0012;%.*ones(size(sub_ids_struct_out{ii}.flux.data));
end
case 'added'
for ii=1:Nprobes
for ii=1:Nprobes
sub_ids_struct_out{ii}.flux.data_error_upper = sub_ids_struct_out{ii}.flux.data + fixed_error.*ones(size(sub_ids_struct_out{ii}.flux.data));
sub_ids_struct_out{ii}.flux.data_error_lower = sub_ids_struct_out{ii}.flux.data - fixed_error.*ones(size(sub_ids_struct_out{ii}.flux.data));
sub_ids_struct_out_description{ii}.flux.data_error_upper = ['from data + fixed error value in case ' error_bar];
......@@ -66,4 +68,3 @@ switch error_bar
otherwise
error(['tcv_ids_flux_loop: error_bar option not known: ' error_bar])
end
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment