From a02d0d70fb2e16c190b348ea358bd58d5f7d6c54 Mon Sep 17 00:00:00 2001
From: Olivier Sauter <olivier.sauter@epfl.ch>
Date: Tue, 26 Mar 2019 14:42:51 +0000
Subject: [PATCH] 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
---
crpptbx/TCV_IMAS/ids2database.m | 2 +-
crpptbx/TCV_IMAS/tcv2ids.m | 6 ------
crpptbx/TCV_IMAS/tcv_get_ids_equilibrium.m | 6 +++---
3 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/crpptbx/TCV_IMAS/ids2database.m b/crpptbx/TCV_IMAS/ids2database.m
index 9dc8c303..1aec6e42 100644
--- a/crpptbx/TCV_IMAS/ids2database.m
+++ b/crpptbx/TCV_IMAS/ids2database.m
@@ -90,7 +90,7 @@ try
imas_close(idx)
catch ME
disp('problems in putting data in database:')
- throw(ME)
+ rethrow(ME)
idx
keyboard
end
diff --git a/crpptbx/TCV_IMAS/tcv2ids.m b/crpptbx/TCV_IMAS/tcv2ids.m
index ee492985..bd3289a7 100644
--- a/crpptbx/TCV_IMAS/tcv2ids.m
+++ b/crpptbx/TCV_IMAS/tcv2ids.m
@@ -80,12 +80,6 @@ end
for i=1:length(params_tcv2ids.ids_names)
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');
ids_from_tcv.(ids_to_get) = tmp.(ids_to_get);
ids_from_tcv.([ids_to_get '_description']) = tmp.([ids_to_get '_description']);
diff --git a/crpptbx/TCV_IMAS/tcv_get_ids_equilibrium.m b/crpptbx/TCV_IMAS/tcv_get_ids_equilibrium.m
index cff57510..6d7cd2d0 100644
--- a/crpptbx/TCV_IMAS/tcv_get_ids_equilibrium.m
+++ b/crpptbx/TCV_IMAS/tcv_get_ids_equilibrium.m
@@ -117,11 +117,11 @@ boundary.triangularity_lower = gdat(params_equilibrium.shot,'delta_bottom','mach
boundary_desc.triangularity_lower = 'delta_bottom';
boundary.triangularity_upper = gdat(params_equilibrium.shot,'delta_top','machine',machine);
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.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.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.rgeom = gdat(params_equilibrium.shot,'rgeom','machine',machine);
temp_desc.rgeom = 'rgeom';
--
GitLab