From 316776705c94b5789dc169d115418d65aa7f3ba1 Mon Sep 17 00:00:00 2001
From: Olivier Sauter <Olivier.Sauter@epfl.ch>
Date: Fri, 31 Jan 2020 11:37:21 +0100
Subject: [PATCH] replace ids_gen with gdat([],'ids','source','xx')
---
matlab/IMAS/complete_IDS_CORSICA.m | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/matlab/IMAS/complete_IDS_CORSICA.m b/matlab/IMAS/complete_IDS_CORSICA.m
index c62e7625..5e5fa2e9 100644
--- a/matlab/IMAS/complete_IDS_CORSICA.m
+++ b/matlab/IMAS/complete_IDS_CORSICA.m
@@ -1,7 +1,7 @@
function IDS_out = complete_IDS_CORSICA(IDS_in,varargin)
%
%
-%
+%
doread = 0;
dosave = 0;
@@ -14,9 +14,9 @@ if doread
data_path_in = '/NoTivoli/carpanes/LIU_RAP_ITER/CORSICA_ids/CORSICA_130510.mat';
%path_IDS = '/NoTivoli/carpanes/LIU_RAP_ITER/CORSICA_ids/CORSICA_130506.mat';
-
+
data_path_out = '/NoTivoli/carpanes/LIU_RAP_ITER/CORSICA_ids/CORSICA_130510_extended_COCOS17.mat';
-
+
% Load the IDS_in file
IDS_out = load(data_path_in);
else
@@ -26,9 +26,9 @@ end
%% Correct COCOS convention on original data
% Put homogenous = 0 on magnetic but 1 on the coils.
-% Sign of the angle of the magnetic probes.
+% Sign of the angle of the magnetic probes.
-%%
+%%
G = G_ITER_generator;
% Get the structure from generating files
@@ -51,8 +51,8 @@ for ii = 1:numel(tmp.names)
IDS_out.pf_active.coil{jj}.name = regexprep(IDS_out.pf_active.coil{jj}.name,'[\n\r]+','');
if strcmp(tmp.names{ii},IDS_out.pf_active.coil{jj}.name)
IDS_out.pf_active.coil{jj}.element{1}.geometry.geometry_type = 2; % Rectangle description
- IDS_out.pf_active.coil{jj}.element{1}.geometry.rectangle.r = tmp.R(ii);
- IDS_out.pf_active.coil{jj}.element{1}.geometry.rectangle.z = tmp.Z(ii);
+ IDS_out.pf_active.coil{jj}.element{1}.geometry.rectangle.r = tmp.R(ii);
+ IDS_out.pf_active.coil{jj}.element{1}.geometry.rectangle.z = tmp.Z(ii);
IDS_out.pf_active.coil{jj}.element{1}.geometry.rectangle.width = tmp.dR(ii);
IDS_out.pf_active.coil{jj}.element{1}.geometry.rectangle.height = tmp.dZ(ii);
IDS_out.pf_active.coil{jj}.element{1}.turns_with_sign = tmp.N(ii);
@@ -98,11 +98,12 @@ IDS_out.wall.description_2d{1}.limiter.unit{1}.outline.z = tmp.z;
%% -------------- Synthetic diagnostics------------ Need to be recomputed from CORSICA flux map
-IDS_out.magnetics.method{1}.ip.time = LXC.t;
+IDS_out.magnetics.method{1}.ip.time = LXC.t;
IDS_out.magnetics.method{1}.ip.data = LXC.Ip;
% Correct IDS magnetics
-magnetics_default = ids_gen('magnetics');
+aa = gdat([],'ids','source','magnetics');
+magnetics_default = aa.magnetics;
mag_fluxloop_def_fields = fieldnames(magnetics_default.flux_loop{1});
if isfield(IDS_out.magnetics,'flux_loop') && length(IDS_out.magnetics.flux_loop) > 0
mag_fluxloop_fields = fieldnames(IDS_out.magnetics.flux_loop{1});
@@ -176,7 +177,7 @@ for ii=1:numel(tmp.name)
IDS_out.magnetics.bpol_probe{ii}.field.time = LXC.t;
end
-%% Ft
+%% Ft
mag_method_def_fields = fieldnames(magnetics_default.method{1});
if isfield(IDS_out.magnetics,'method') && length(IDS_out.magnetics.method) > 0
mag_method_fields = fieldnames(IDS_out.magnetics.method{1});
--
GitLab