Skip to content
Snippets Groups Projects
Commit a02d0d70 authored by Olivier Sauter's avatar Olivier Sauter
Browse files

fix tcv part, as well as test with new psi in profiles1d

git-svn-id: https://spcsvn.epfl.ch/repos/TCV/gdat/trunk@11646 d63d8f72-b253-0410-a779-e742ad2e26cf
parent 4f61df78
No related branches found
No related tags found
No related merge requests found
...@@ -90,7 +90,7 @@ try ...@@ -90,7 +90,7 @@ try
imas_close(idx) imas_close(idx)
catch ME catch ME
disp('problems in putting data in database:') disp('problems in putting data in database:')
throw(ME) rethrow(ME)
idx idx
keyboard keyboard
end end
...@@ -80,12 +80,6 @@ end ...@@ -80,12 +80,6 @@ end
for i=1:length(params_tcv2ids.ids_names) for i=1:length(params_tcv2ids.ids_names)
ids_to_get = params_tcv2ids.ids_names{i}; ids_to_get = params_tcv2ids.ids_names{i};
if exist('ids_gen')==2
ids_empty=ids_gen(ids_to_get);
else
gdat_ids_empty=gdat([],'ids','source',ids_to_get);
end
ids_empty = gdat_ids_empty.(ids_to_get);
tmp = gdat(shot,'ids','source',ids_to_get,'machine','tcv'); tmp = gdat(shot,'ids','source',ids_to_get,'machine','tcv');
ids_from_tcv.(ids_to_get) = tmp.(ids_to_get); ids_from_tcv.(ids_to_get) = tmp.(ids_to_get);
ids_from_tcv.([ids_to_get '_description']) = tmp.([ids_to_get '_description']); ids_from_tcv.([ids_to_get '_description']) = tmp.([ids_to_get '_description']);
......
...@@ -117,11 +117,11 @@ boundary.triangularity_lower = gdat(params_equilibrium.shot,'delta_bottom','mach ...@@ -117,11 +117,11 @@ boundary.triangularity_lower = gdat(params_equilibrium.shot,'delta_bottom','mach
boundary_desc.triangularity_lower = 'delta_bottom'; boundary_desc.triangularity_lower = 'delta_bottom';
boundary.triangularity_upper = gdat(params_equilibrium.shot,'delta_top','machine',machine); boundary.triangularity_upper = gdat(params_equilibrium.shot,'delta_top','machine',machine);
boundary_desc.triangularity_upper = 'delta_top'; boundary_desc.triangularity_upper = 'delta_top';
temp.n_x_point = gdat(params_equilibrium.shot,'tcv_eq(''''n_xpts'''',''''liuqe.m'''','machine',machine)'); temp.n_x_point = gdat(params_equilibrium.shot,'tcv_eq(''''n_xpts'''',''''liuqe.m'''')','machine',machine);
temp_desc.n_x_point = '''tcv_eq(''''n_xpts'''',''''liuqe.m'''')'''; temp_desc.n_x_point = '''tcv_eq(''''n_xpts'''',''''liuqe.m'''')''';
temp.r_x_point = gdat(params_equilibrium.shot,'tcv_eq(''''r_xpts'''',''''liuqe.m'''','machine',machine)'); temp.r_x_point = gdat(params_equilibrium.shot,'tcv_eq(''''r_xpts'''',''''liuqe.m'''')','machine',machine);
temp_desc.r_x_point = '''tcv_eq(''''r_xpts'''',''''liuqe.m'''')'''; temp_desc.r_x_point = '''tcv_eq(''''r_xpts'''',''''liuqe.m'''')''';
temp.z_x_point = gdat(params_equilibrium.shot,'tcv_eq(''''z_xpts'''',''''liuqe.m'''','machine',machine)'); temp.z_x_point = gdat(params_equilibrium.shot,'tcv_eq(''''z_xpts'''',''''liuqe.m'''')','machine',machine);
temp_desc.z_x_point = '''tcv_eq(''''z_xpts'''',''''liuqe.m'''')'''; temp_desc.z_x_point = '''tcv_eq(''''z_xpts'''',''''liuqe.m'''')''';
temp.rgeom = gdat(params_equilibrium.shot,'rgeom','machine',machine); temp.rgeom = gdat(params_equilibrium.shot,'rgeom','machine',machine);
temp_desc.rgeom = 'rgeom'; temp_desc.rgeom = 'rgeom';
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment