diff --git a/matlab/IMAS/G_ITER_generator.m b/matlab/IMAS/G_ITER_generator.m index bc4a0f91c09d84527ff42fcb0430ec4e8f9f0cc3..9cc4a407c781463f40f363788f81004b3d67e111 100644 --- a/matlab/IMAS/G_ITER_generator.m +++ b/matlab/IMAS/G_ITER_generator.m @@ -47,7 +47,7 @@ sort_list = [3,4,2,5,1,6,7,8,9,10,11,12, 13, 14]; for ii=1:numel(sort_list) vv(:,ii) = vvtmp(:,sort_list(ii)); end -N = N(sort_list); +N = abs(N(sort_list)); % Compute the windings and connection matrix [rw,zw,Twa] = gen_filament(vv,N,2); G.dima = dima(sort_list); diff --git a/matlab/IMAS/complete_IDS_CORSICA.m b/matlab/IMAS/complete_IDS_CORSICA.m index de1cb3c518148d0b051a669c1032070c5fa34d6a..34b38b69d1e323939b0531153c9a7710fcc2b1f7 100644 --- a/matlab/IMAS/complete_IDS_CORSICA.m +++ b/matlab/IMAS/complete_IDS_CORSICA.m @@ -1,10 +1,10 @@ -%function IDS_out = complete_IDS_CORSICA(IDS_in,varargin) +function IDS_out = complete_IDS_CORSICA(IDS_in,varargin) % % % -doread = 1; -dosave = 1; +doread = 0; +dosave = 0; if doread @@ -117,7 +117,7 @@ fields_to_add = setdiff(mag_fluxloop_def_fields,mag_fluxloop_fields); %% Ff tmp = data_Ff(); -for ii=1:numel(tmp.r) +for ii=1:numel(tmp.r) if ~isempty(fields_to_add) for idef=1:length(fields_to_add) % add first defaults and fill in after diff --git a/matlab/IMAS/data_coils.m b/matlab/IMAS/data_coils.m index e29c3e116a5ff6291824d5e3c6b97e81b0354635..e5f69a573a130ec9e271635c6bc6e722fed5568f 100644 --- a/matlab/IMAS/data_coils.m +++ b/matlab/IMAS/data_coils.m @@ -1,6 +1,6 @@ function [data_struct] = data_coils() % Data BASED on ITER_D_24JQWZ V1.0 -% VSU and VSL are not correctly described at the moment +% VSU and VSL are not correctly described at the moment since they are taken as rectangular but they are rounded names = {'CS3U';'CS2U';'CS1U';'CS1L';'CS2L';'CS3L';'PF1';... 'PF2';'PF3';'PF4';'PF5';'PF6'; 'VSU'; 'VSL'};