From 4de900a3939c4285b345a07f2bbb3a185a083216 Mon Sep 17 00:00:00 2001 From: Olivier Sauter <olivier.sauter@epfl.ch> Date: Thu, 31 Jan 2019 10:13:11 +0000 Subject: [PATCH] add wrapper routine to save TCV data to ids directly from gateway git-svn-id: https://spcsvn.epfl.ch/repos/TCV/gdat/trunk@11364 d63d8f72-b253-0410-a779-e742ad2e26cf --- crpptbx/TCV_IMAS/TCV2ids.m | 27 +++++++++++++++++++ .../get_ids_equilibrium_fixed_boundary.m | 4 +-- 2 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 crpptbx/TCV_IMAS/TCV2ids.m diff --git a/crpptbx/TCV_IMAS/TCV2ids.m b/crpptbx/TCV_IMAS/TCV2ids.m new file mode 100644 index 00000000..49df4a4c --- /dev/null +++ b/crpptbx/TCV_IMAS/TCV2ids.m @@ -0,0 +1,27 @@ +function [ids_saved,varargout] = TCV2ids(shot,run,varargin); +% +% [ids_saved,varargout] = TCV2ids(shot,run,varargin); +% +% Assumes you have done: +% >> addpath ~g2osaute/public/matlab9_11_2016 (on the gateway) +% >> mdsconnect('localhost:5555') % using the tunnel made in another session like: ssh -L 5555:tcvdata:8000 username@lac911.epfl.ch + +% in another window do the tunnel: ssh -L 5555:tcvdata:8000 username@lac911.epfl.ch +% addpath ~g2osaute/public/matlab9_11_2016 +% mdsconnect('localhost:5555') + +equil_empty=ids_gen('equilibrium'); +[ids_equilibrium,ids_equilibrium_description]=get_ids_equilibrium_fixed_boundary(40000,equil_empty); +ids_saved.equilibrium = ids_equilibrium; +ids_saved.equilibrium_description = ids_equilibrium_description; + +% now write to ids tree +shot_is_new = 1; +if shot_is_new + idx = imas_create('ids',shot,run,run,run); % +else + idx = imas_open('ids',shot,run); % +end + +ids_put(idx,'equilibrium',ids_equilibrium); +imas_close(idx) diff --git a/crpptbx/TCV_IMAS/get_ids_equilibrium_fixed_boundary.m b/crpptbx/TCV_IMAS/get_ids_equilibrium_fixed_boundary.m index 3b4f0c01..e7e1a55c 100644 --- a/crpptbx/TCV_IMAS/get_ids_equilibrium_fixed_boundary.m +++ b/crpptbx/TCV_IMAS/get_ids_equilibrium_fixed_boundary.m @@ -198,8 +198,8 @@ end % special cases for it=1:length(ids_equilibrium.time) - ids_equilibrium.time_slice{it}.boundary.outline.r = temp.r_lcfs.data(it); - ids_equilibrium.time_slice{it}.boundary.outline.z = temp.z_lcfs.data(it); + ids_equilibrium.time_slice{it}.boundary.outline.r = temp.r_lcfs.data(:,it); + ids_equilibrium.time_slice{it}.boundary.outline.z = temp.z_lcfs.data(:,it); ids_equilibrium.time_slice{it}.boundary.lcfs.r = ids_equilibrium.time_slice{it}.boundary.outline.r; ids_equilibrium.time_slice{it}.boundary.lcfs.z = ids_equilibrium.time_slice{it}.boundary.outline.z; ids_equilibrium.time_slice{it}.boundary.geometric_axis.r = temp.rgeom.data(it); -- GitLab