From bcebed89d7a0712f6b2c3777247886b2e9fd08d1 Mon Sep 17 00:00:00 2001
From: Francesco Carpanese <francesco.carpanese@epfl.ch>
Date: Thu, 31 Jan 2019 15:36:49 +0000
Subject: [PATCH] Added magnetic, wall, pf_active
git-svn-id: https://spcsvn.epfl.ch/repos/TCV/gdat/trunk@11382 d63d8f72-b253-0410-a779-e742ad2e26cf
---
crpptbx/TCV_IMAS/tcv2ids.m | 17 ++++++++++++++++-
crpptbx/TCV_IMAS/tcv_get_ids_pf_active.m | 18 +++++++++---------
crpptbx/TCV_IMAS/tcv_get_ids_wall.m | 10 ++++++++++
crpptbx/TCV_IMAS/tcv_ids_get_wall.m | 5 -----
4 files changed, 35 insertions(+), 15 deletions(-)
create mode 100644 crpptbx/TCV_IMAS/tcv_get_ids_wall.m
delete mode 100644 crpptbx/TCV_IMAS/tcv_ids_get_wall.m
diff --git a/crpptbx/TCV_IMAS/tcv2ids.m b/crpptbx/TCV_IMAS/tcv2ids.m
index c0521b7f..2dd33b3d 100644
--- a/crpptbx/TCV_IMAS/tcv2ids.m
+++ b/crpptbx/TCV_IMAS/tcv2ids.m
@@ -16,12 +16,25 @@ equil_empty=ids_gen('equilibrium');
ids_saved.equilibrium = ids_equilibrium;
ids_saved.equilibrium_description = ids_equilibrium_description;
-%% Magnetics
+%% magnetics
magnetics_empty=ids_gen('magnetics');
[ids_magnetics,ids_magnetics_description]=tcv_get_ids_magnetics(shot,magnetics_empty);
ids_saved.magnetics = ids_magnetics;
ids_saved.magnetics_description = ids_magnetics_description;
+%% pf_active
+pf_active_empty=ids_gen('pf_active');
+[ids_pf_active,ids_pf_active_description]=tcv_get_ids_pf_active(shot,pf_active_empty);
+ids_saved.pf_active = ids_pf_active;
+ids_saved.pf_active_description = ids_pf_active_description;
+
+%% wall
+pf_wall_empty=ids_gen('wall');
+[ids_wall,ids_wall_description]=tcv_get_ids_wall(shot,pf_wall_empty);
+ids_saved.pf_wall = ids_wall;
+ids_saved.pf_wall_descrption = ids_wall_description;
+
+
%% Initialize the three
shot_is_new = 1; % seems only create is ok even if does already exist
if shot_is_new
@@ -33,6 +46,8 @@ end
%% Put the field
ids_put(idx,'equilibrium',ids_equilibrium);
ids_put(idx, 'magnetics', ids_magnetics);
+ids_put(idx, 'pf_active', ids_pf_active);
+ids_put(idx, 'wall', ids_wall);
%% Close the file
imas_close(idx)
diff --git a/crpptbx/TCV_IMAS/tcv_get_ids_pf_active.m b/crpptbx/TCV_IMAS/tcv_get_ids_pf_active.m
index 7a5e92f1..a2e36745 100644
--- a/crpptbx/TCV_IMAS/tcv_get_ids_pf_active.m
+++ b/crpptbx/TCV_IMAS/tcv_get_ids_pf_active.m
@@ -1,12 +1,12 @@
-function [ids_pf_active,ids_pf_active_description,varargout] = tcv_get_ids_pf_active(shot,varargin)
-%
-% [ids_equilibrium,ids_equilibrium_description,varargout] = get_ids_equilibrium_fixed_boundary(shot,varargin);
-%
-%
-% ADD Here the imput pharser
+function [ids_pf_active,ids_description,varargout] = tcv_get_ids_pf_active(shot, ids_pf_active_empty, varargin)
-ids_pf_active=ids_gen('pf_active');
-[ids_pf_active.coil]= tcv_get_ids_coil(shot, ids_pf_active.coil(1));
+% Input pharser
+[ids_pf_active, params] = tcv_ids_headpart(shot, ids_pf_active_empty,'pf_active',varargin{:});
-[ids_pf_active.circuit]= tcv_get_ids_circuit(shot, ids_pf_active.circuit(1));
+% Get subfield
+[ids_pf_active.coil]= tcv_get_ids_coil(params.shot, ids_pf_active.coil(1));
+[ids_pf_active.circuit]= tcv_get_ids_circuit(params.shot, ids_pf_active.circuit(1));
+
+%% Temporarely
+ids_description = struct();
diff --git a/crpptbx/TCV_IMAS/tcv_get_ids_wall.m b/crpptbx/TCV_IMAS/tcv_get_ids_wall.m
new file mode 100644
index 00000000..dcefe347
--- /dev/null
+++ b/crpptbx/TCV_IMAS/tcv_get_ids_wall.m
@@ -0,0 +1,10 @@
+function [ids_wall,ids_description,varargout] = tcv_get_ids_wall(shot, ids_wall_empty, varargin)
+
+% Input pharser
+[ids_wall, params] = tcv_ids_headpart(shot, ids_wall_empty,'wall',varargin{:});
+
+% Get data of outline
+[ids_wall.description_2d]= tcv_get_ids_descprition_2d(params.shot, ids_wall.description_2d(1));
+
+%% TODO
+ids_description = [];
\ No newline at end of file
diff --git a/crpptbx/TCV_IMAS/tcv_ids_get_wall.m b/crpptbx/TCV_IMAS/tcv_ids_get_wall.m
deleted file mode 100644
index cbc1a0f8..00000000
--- a/crpptbx/TCV_IMAS/tcv_ids_get_wall.m
+++ /dev/null
@@ -1,5 +0,0 @@
-function [ids_wall,ids_wall_description,varargout] = tcv_ids_get_wall(shot,varargin)
-% TODO Add the input pharser
-
-ids_wall=ids_gen('wall');
-[ids_wall.description_2d]= tcv_get_ids_descprition_2d(shot, ids_wall.description_2d(1));
\ No newline at end of file
--
GitLab