From 23d7fe887cf433b2c28bf23cf3fd9fcba4521b48 Mon Sep 17 00:00:00 2001
From: Olivier Sauter <olivier.sauter@epfl.ch>
Date: Fri, 8 Feb 2019 18:58:55 +0000
Subject: [PATCH] start adapting extract_info_connection_matrix.m, ci to be
able to test on gateway
git-svn-id: https://spcsvn.epfl.ch/repos/TCV/gdat/trunk@11418 d63d8f72-b253-0410-a779-e742ad2e26cf
---
.../TCV_IMAS/extract_info_connection_matrix.m | 49 ++++++++++---------
1 file changed, 26 insertions(+), 23 deletions(-)
diff --git a/crpptbx/TCV_IMAS/extract_info_connection_matrix.m b/crpptbx/TCV_IMAS/extract_info_connection_matrix.m
index 07fa101c..2251d518 100644
--- a/crpptbx/TCV_IMAS/extract_info_connection_matrix.m
+++ b/crpptbx/TCV_IMAS/extract_info_connection_matrix.m
@@ -1,6 +1,9 @@
-function info = extract_info_connection_matrix(IDS)
+function info_pf_active = extract_info_connection_matrix(ids_pf_active)
+%
+% info_pf_active = extract_info_connection_matrix(ids_pf_active);
+%
% Extract the following information from pf_active and connection
-% matrix and add them to the IDS structure
+% matrix and add them to the ids_pf_active structure
% -------------------------------------------
% Which coils belong to a specific circuit added to
@@ -15,34 +18,34 @@ function info = extract_info_connection_matrix(IDS)
% Which circuit does a given power supply belong to
% pf_active.supply{i}.belonged_circuit
-info = IDS;
+info_pf_active = ids_pf_active;
-info.ntotcoils = numel(IDS.pf_active.coil);
-info.ntotcircuits = numel(IDS.pf_active.circuit);
-info.ntotsupplies = numel(IDS.pf_active.supply);
-info.ntotelements = info.ntotcoils + info.ntotsupplies;
+info_pf_active.ntotcoils = numel(ids_pf_active.coil);
+info_pf_active.ntotcircuits = numel(ids_pf_active.circuit);
+info_pf_active.ntotsupplies = numel(ids_pf_active.supply);
+info_pf_active.ntotelements = info_pf_active.ntotcoils + info_pf_active.ntotsupplies;
-for ii = 1:info.ntotcircuits
+for ii = 1:info_pf_active.ntotcircuits
% Supplies belonging to the circuit
supplies_of_circuit = {};
supplies_of_circuit_ind = [];
counter = 0;
- for jj=1:info.ntotsupplies
+ for jj=1:info_pf_active.ntotsupplies
index = (2*(jj-1) + 1);
- if sum(IDS.pf_active.circuit{ii}.connections(:,index)) == 1
+ if sum(ids_pf_active.circuit{ii}.connections(:,index)) == 1
counter = counter +1;
- supplies_of_circuit{counter} = IDS.pf_active.supply{jj}.name;
+ supplies_of_circuit{counter} = ids_pf_active.supply{jj}.name;
supplies_of_circuit_ind(counter) = jj;
end
end
- info.pf_active.circuit{ii}.supplies_belonging_to_circuit = supplies_of_circuit;
- info.pf_active.circuit{ii}.supplies_ind_belonging_to_circuit = supplies_of_circuit_ind;
+ info_pf_active.circuit{ii}.supplies_belonging_to_circuit = supplies_of_circuit;
+ info_pf_active.circuit{ii}.supplies_ind_belonging_to_circuit = supplies_of_circuit_ind;
% Find to which circuit each supply belongs to
for jj=supplies_of_circuit_ind
- info.pf_active.supply{jj}.belonged_circuit = IDS.pf_active.circuit{ii}.name;
- info.pf_active.supply{jj}.belonged_circuit_ind = ii;
+ info_pf_active.supply{jj}.belonged_circuit = ids_pf_active.circuit{ii}.name;
+ info_pf_active.supply{jj}.belonged_circuit_ind = ii;
end
@@ -50,21 +53,21 @@ for ii = 1:info.ntotcircuits
coils_of_circuit = {};
coils_of_circuit_ind = [];
counter = 0;
- for jj=1:info.ntotcoils
- index = (2*(jj-1) + 1 + 2*info.ntotsupplies);
- if sum(IDS.pf_active.circuit{ii}.connections(:,index)) == 1
+ for jj=1:info_pf_active.ntotcoils
+ index = (2*(jj-1) + 1 + 2*info_pf_active.ntotsupplies);
+ if sum(ids_pf_active.circuit{ii}.connections(:,index)) == 1
counter = counter +1;
- coils_of_circuit{counter} = IDS.pf_active.coil{jj}.name;
+ coils_of_circuit{counter} = ids_pf_active.coil{jj}.name;
coils_of_circuit_ind(counter) = jj;
end
end
- info.pf_active.circuit{ii}.coils_belonging_to_circuit = coils_of_circuit;
- info.pf_active.circuit{ii}.coils_ind_belonging_to_circuit = coils_of_circuit_ind;
+ info_pf_active.circuit{ii}.coils_belonging_to_circuit = coils_of_circuit;
+ info_pf_active.circuit{ii}.coils_ind_belonging_to_circuit = coils_of_circuit_ind;
% Find to which circuit each coil belongs to
for jj=coils_of_circuit_ind
- info.pf_active.coil{jj}.belonged_circuit = IDS.pf_active.circuit{ii}.name;
- info.pf_active.coil{jj}.belonged_circuit_ind = ii;
+ info_pf_active.coil{jj}.belonged_circuit = ids_pf_active.circuit{ii}.name;
+ info_pf_active.coil{jj}.belonged_circuit_ind = ii;
end
--
GitLab