From aeadcdffd39e8162f30a9f398998348bf4bb77ef Mon Sep 17 00:00:00 2001
From: Antoine Merle <antoine.merle@epfl.ch>
Date: Mon, 20 Jan 2020 16:41:48 +0100
Subject: [PATCH] Fix wall: description_2d.vessel.unit.element is empty.
---
matlab/TCV_IMAS/tcv_get_ids_wall.m | 9 +++++----
matlab/TCV_IMAS/tcv_ids_wall_description_2d.m | 14 +++++++-------
2 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/matlab/TCV_IMAS/tcv_get_ids_wall.m b/matlab/TCV_IMAS/tcv_get_ids_wall.m
index 19404fea..537e2325 100644
--- a/matlab/TCV_IMAS/tcv_get_ids_wall.m
+++ b/matlab/TCV_IMAS/tcv_get_ids_wall.m
@@ -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
%
-% Input pharser
-if exist('gdat_params')
+% Input parser
+if exist('gdat_params','var')
[ids_wall, params] = tcv_ids_headpart(shot, ids_wall_empty,'wall','homogeneous_time',0,'gdat_params',gdat_params,varargin{:});
else
[ids_wall, params] = tcv_ids_headpart(shot, ids_wall_empty,'wall','homogeneous_time',0,varargin{:});
@@ -14,19 +14,20 @@ else
end
% 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
ids_wall.global_quantities.neutral = {}; % wall does not work with Antoine's addpath
ids_wall.description_ggd = {};
ids_wall.description_2d{1}.mobile.unit = {};
+ids_wall.description_2d{1}.vessel.unit{1}.element = {};
%% TODO
ids_description = [];
% 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, ...
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);
diff --git a/matlab/TCV_IMAS/tcv_ids_wall_description_2d.m b/matlab/TCV_IMAS/tcv_ids_wall_description_2d.m
index 8a8ed6aa..e47b89d7 100644
--- a/matlab/TCV_IMAS/tcv_ids_wall_description_2d.m
+++ b/matlab/TCV_IMAS/tcv_ids_wall_description_2d.m
@@ -1,4 +1,4 @@
-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;
@@ -10,9 +10,9 @@ ids_struct_out{1}.type.index = 0;
r_l = mdsdata('STATIC("R_T")');
z_l = mdsdata('STATIC("Z_T")');
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_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
r_v_in = mdsdata('STATIC("R_V:IN")');
@@ -20,13 +20,13 @@ z_v_in = mdsdata('STATIC("Z_V:IN")');
r_v_out = mdsdata('STATIC("R_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_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_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_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_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
% of Jean-Marc LIUQE paper.
--
GitLab