Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
gdat
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
SPC
gdat
Commits
aeadcdff
Commit
aeadcdff
authored
5 years ago
by
Antoine Merle
Browse files
Options
Downloads
Patches
Plain Diff
Fix wall: description_2d.vessel.unit.element is empty.
parent
a3bf8baf
No related branches found
No related tags found
1 merge request
!39
Set same error_bars as LIUQE weights for eqreconstruct IDSs
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
matlab/TCV_IMAS/tcv_get_ids_wall.m
+5
-4
5 additions, 4 deletions
matlab/TCV_IMAS/tcv_get_ids_wall.m
matlab/TCV_IMAS/tcv_ids_wall_description_2d.m
+7
-7
7 additions, 7 deletions
matlab/TCV_IMAS/tcv_ids_wall_description_2d.m
with
12 additions
and
11 deletions
matlab/TCV_IMAS/tcv_get_ids_wall.m
+
5
−
4
View file @
aeadcdff
...
@@ -4,8 +4,8 @@ function [ids_wall,ids_wall_description,varargout] = tcv_get_ids_wall(shot, ids_
...
@@ -4,8 +4,8 @@ function [ids_wall,ids_wall_description,varargout] = tcv_get_ids_wall(shot, ids_
% gdat_params: gdat_data.gdat_params to get all params passed from original call, in particular error_bar options
% gdat_params: gdat_data.gdat_params to get all params passed from original call, in particular error_bar options
%
%
% Input p
h
arser
% Input parser
if
exist
(
'gdat_params'
)
if
exist
(
'gdat_params'
,
'var'
)
[
ids_wall
,
params
]
=
tcv_ids_headpart
(
shot
,
ids_wall_empty
,
'wall'
,
'homogeneous_time'
,
0
,
'gdat_params'
,
gdat_params
,
varargin
{:});
[
ids_wall
,
params
]
=
tcv_ids_headpart
(
shot
,
ids_wall_empty
,
'wall'
,
'homogeneous_time'
,
0
,
'gdat_params'
,
gdat_params
,
varargin
{:});
else
else
[
ids_wall
,
params
]
=
tcv_ids_headpart
(
shot
,
ids_wall_empty
,
'wall'
,
'homogeneous_time'
,
0
,
varargin
{:});
[
ids_wall
,
params
]
=
tcv_ids_headpart
(
shot
,
ids_wall_empty
,
'wall'
,
'homogeneous_time'
,
0
,
varargin
{:});
...
@@ -14,19 +14,20 @@ else
...
@@ -14,19 +14,20 @@ else
end
end
% Get data of outline, only static, no need for gdat_params and time_out parameter for example
% Get data of outline, only static, no need for gdat_params and time_out parameter for example
[
ids_wall
.
description_2d
,
ids_wall_description
.
description_2d
]
=
tcv_ids_wall_description_2d
(
params
.
shot
,
ids_wall
.
description_2d
(
1
));
[
ids_wall
.
description_2d
,
ids_wall_description
.
description_2d
]
=
tcv_ids_wall_description_2d
(
ids_wall
.
description_2d
(
1
));
% make arrays not filled in empty: not the case for magnetics
% make arrays not filled in empty: not the case for magnetics
ids_wall
.
global_quantities
.
neutral
=
{};
% wall does not work with Antoine's addpath
ids_wall
.
global_quantities
.
neutral
=
{};
% wall does not work with Antoine's addpath
ids_wall
.
description_ggd
=
{};
ids_wall
.
description_ggd
=
{};
ids_wall
.
description_2d
{
1
}
.
mobile
.
unit
=
{};
ids_wall
.
description_2d
{
1
}
.
mobile
.
unit
=
{};
ids_wall
.
description_2d
{
1
}
.
vessel
.
unit
{
1
}
.
element
=
{};
%% TODO
%% TODO
ids_description
=
[];
ids_description
=
[];
% cocos automatic transform (should have nothing to do for wall)
% cocos automatic transform (should have nothing to do for wall)
if
exist
(
'ids_generic_cocos_nodes_transformation_symbolic'
)
==
2
if
exist
(
'ids_generic_cocos_nodes_transformation_symbolic'
,
'file'
)
[
ids_wall
,
cocoscoeff
]
=
ids_generic_cocos_nodes_transformation_symbolic
(
ids_wall
,
'wall'
,
gdat_params
.
cocos_in
,
...
[
ids_wall
,
cocoscoeff
]
=
ids_generic_cocos_nodes_transformation_symbolic
(
ids_wall
,
'wall'
,
gdat_params
.
cocos_in
,
...
gdat_params
.
cocos_out
,
gdat_params
.
ipsign_out
,
gdat_params
.
b0sign_out
,
gdat_params
.
ipsign_in
,
gdat_params
.
b0sign_in
,
...
gdat_params
.
cocos_out
,
gdat_params
.
ipsign_out
,
gdat_params
.
b0sign_out
,
gdat_params
.
ipsign_in
,
gdat_params
.
b0sign_in
,
...
gdat_params
.
error_bar
,
gdat_params
.
nverbose
);
gdat_params
.
error_bar
,
gdat_params
.
nverbose
);
...
...
This diff is collapsed.
Click to expand it.
matlab/TCV_IMAS/tcv_ids_wall_description_2d.m
+
7
−
7
View file @
aeadcdff
function
[
ids_struct_out
,
ids_struct_out_description
]
=
tcv_ids_wall_description_2d
(
shot
,
ids_structures
)
function
[
ids_struct_out
,
ids_struct_out_description
]
=
tcv_ids_wall_description_2d
(
ids_structures
)
ids_struct_out
=
ids_structures
;
ids_struct_out
=
ids_structures
;
...
@@ -10,9 +10,9 @@ ids_struct_out{1}.type.index = 0;
...
@@ -10,9 +10,9 @@ ids_struct_out{1}.type.index = 0;
r_l
=
mdsdata
(
'STATIC("R_T")'
);
r_l
=
mdsdata
(
'STATIC("R_T")'
);
z_l
=
mdsdata
(
'STATIC("Z_T")'
);
z_l
=
mdsdata
(
'STATIC("Z_T")'
);
ids_struct_out
{
1
}
.
limiter
.
unit
{
1
}
.
outline
.
r
=
r_l
;
ids_struct_out
{
1
}
.
limiter
.
unit
{
1
}
.
outline
.
r
=
r_l
;
ids_struct_out_description
{
1
}
.
limiter
.
unit
{
1
}
.
outline_r
=
[
'from
''
STATIC("R_T")'
]
;
ids_struct_out_description
{
1
}
.
limiter
.
unit
{
1
}
.
outline_r
=
'from
''
STATIC("R_T")
'
'
'
;
ids_struct_out
{
1
}
.
limiter
.
unit
{
1
}
.
outline
.
z
=
z_l
;
ids_struct_out
{
1
}
.
limiter
.
unit
{
1
}
.
outline
.
z
=
z_l
;
ids_struct_out_description
{
1
}
.
limiter
.
unit
{
1
}
.
outline_z
=
[
'from
''
STATIC("Z_T")'
]
;
ids_struct_out_description
{
1
}
.
limiter
.
unit
{
1
}
.
outline_z
=
'from
''
STATIC("Z_T")
'
'
'
;
% vessel
% vessel
r_v_in
=
mdsdata
(
'STATIC("R_V:IN")'
);
r_v_in
=
mdsdata
(
'STATIC("R_V:IN")'
);
...
@@ -20,13 +20,13 @@ z_v_in = mdsdata('STATIC("Z_V:IN")');
...
@@ -20,13 +20,13 @@ z_v_in = mdsdata('STATIC("Z_V:IN")');
r_v_out
=
mdsdata
(
'STATIC("R_V:OUT")'
);
r_v_out
=
mdsdata
(
'STATIC("R_V:OUT")'
);
z_v_out
=
mdsdata
(
'STATIC("Z_V:OUT")'
);
z_v_out
=
mdsdata
(
'STATIC("Z_V:OUT")'
);
ids_struct_out
{
1
}
.
vessel
.
unit
{
1
}
.
annular
.
outline_inner
.
r
=
r_v_in
;
ids_struct_out
{
1
}
.
vessel
.
unit
{
1
}
.
annular
.
outline_inner
.
r
=
r_v_in
;
ids_struct_out_description
{
1
}
.
vessel
.
unit
{
1
}
.
annular
.
outline_inner
.
r
=
[
'from
''
STATIC("R_V:IN")'
]
;
ids_struct_out_description
{
1
}
.
vessel
.
unit
{
1
}
.
annular
.
outline_inner
.
r
=
'from
''
STATIC("R_V:IN")
'
'
'
;
ids_struct_out
{
1
}
.
vessel
.
unit
{
1
}
.
annular
.
outline_inner
.
z
=
z_v_in
;
ids_struct_out
{
1
}
.
vessel
.
unit
{
1
}
.
annular
.
outline_inner
.
z
=
z_v_in
;
ids_struct_out_description
{
1
}
.
vessel
.
unit
{
1
}
.
annular
.
outline_inner
.
z
=
[
'from
''
STATIC("Z_V:IN")'
]
;
ids_struct_out_description
{
1
}
.
vessel
.
unit
{
1
}
.
annular
.
outline_inner
.
z
=
'from
''
STATIC("Z_V:IN")
'
'
'
;
ids_struct_out
{
1
}
.
vessel
.
unit
{
1
}
.
annular
.
outline_outer
.
r
=
r_v_out
;
ids_struct_out
{
1
}
.
vessel
.
unit
{
1
}
.
annular
.
outline_outer
.
r
=
r_v_out
;
ids_struct_out_description
{
1
}
.
vessel
.
unit
{
1
}
.
annular
.
outline_outer
.
r
=
[
'from
''
STATIC("R_V:OUT")'
]
;
ids_struct_out_description
{
1
}
.
vessel
.
unit
{
1
}
.
annular
.
outline_outer
.
r
=
'from
''
STATIC("R_V:OUT")
'
'
'
;
ids_struct_out
{
1
}
.
vessel
.
unit
{
1
}
.
annular
.
outline_outer
.
z
=
z_v_out
;
ids_struct_out
{
1
}
.
vessel
.
unit
{
1
}
.
annular
.
outline_outer
.
z
=
z_v_out
;
ids_struct_out_description
{
1
}
.
vessel
.
unit
{
1
}
.
annular
.
outline_outer
.
z
=
[
'from
''
STATIC("Z_V:OUT")'
]
;
ids_struct_out_description
{
1
}
.
vessel
.
unit
{
1
}
.
annular
.
outline_outer
.
z
=
'from
''
STATIC("Z_V:OUT")
'
'
'
;
% The value of the resistivity is taken as an average of the value in Fig.3
% The value of the resistivity is taken as an average of the value in Fig.3
% of Jean-Marc LIUQE paper.
% of Jean-Marc LIUQE paper.
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment