diff --git a/crpptbx/TCV_IMAS/TCV2ids.m b/crpptbx/TCV_IMAS/TCV2ids.m new file mode 100644 index 0000000000000000000000000000000000000000..49df4a4cddaa2e102a48c81d75d6bcb42502e011 --- /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 3b4f0c019b93061ed34ee2c14949eb0f7b54e311..e7e1a55cfc92e2cb28165883beba4c36d55dbbc3 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);