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

fix is_in mdsvalue call for G_001

parent 2adea96b
Branches
Tags
1 merge request!177fix is_in mdsvalue call for G_001
Pipeline #224988 passed
...@@ -88,11 +88,10 @@ mds_paths = {... ...@@ -88,11 +88,10 @@ mds_paths = {...
'\magnetics::ipol[*,"F_006"]';...% Circuit 16 '\magnetics::ipol[*,"F_006"]';...% Circuit 16
'\magnetics::ipol[*,"F_007"]';...% Circuit 17 '\magnetics::ipol[*,"F_007"]';...% Circuit 17
'\magnetics::ipol[*,"F_008"]';... % Circuit 18 '\magnetics::ipol[*,"F_008"]';... % Circuit 18
'is_in("G_001",dim_of(\magnetics::ipol,1)) ? \magnetics::ipol[*,"G_001"] : make_signal(zero(shape(data(\magnetics::ipol))[0],1.0),*,dim_of(\magnetics::ipol,0))';... % G coils % Circuit 19 '"G_001" is_in \magnetics::ipol:dim ? \magnetics::ipol[*,"G_001"] : make_signal(zero(shape(data(\magnetics::ipol))[0],1.0),*,dim_of(\magnetics::ipol,0))';... % G coils % Circuit 19
'\magnetics::iphi';... % Connection between tf coils % Circuit 20 '\magnetics::iphi';... % Connection between tf coils % Circuit 20
}; };
% Combined structure % Combined structure
combined_structure = struct(); combined_structure = struct();
combined_structure.coil_names = coil_names; combined_structure.coil_names = coil_names;
...@@ -127,7 +126,7 @@ circuit_struct.connection_matrix = struct([]); ...@@ -127,7 +126,7 @@ circuit_struct.connection_matrix = struct([]);
coil_column_index = 2*circuit_struct.ntotpowersupplies ; coil_column_index = 2*circuit_struct.ntotpowersupplies ;
for ii=1:circuit_struct.ntotcircuits for ii=1:circuit_struct.ntotcircuits
circuit_connection_matrix = zeros(circuit_struct.nnodespercircuit(ii), 2*circuit_struct.ntotelements); circuit_connection_matrix = zeros(circuit_struct.nnodespercircuit(ii), 2*circuit_struct.ntotelements);
% Put power supply connection % Put power supply connection
power_supply_index = ii; power_supply_index = ii;
if circuit_struct.power_supply_current_signs{power_supply_index} == 1 if circuit_struct.power_supply_current_signs{power_supply_index} == 1
...@@ -137,27 +136,27 @@ for ii=1:circuit_struct.ntotcircuits ...@@ -137,27 +136,27 @@ for ii=1:circuit_struct.ntotcircuits
circuit_connection_matrix(1,2*(power_supply_index-1)+1) = 1; circuit_connection_matrix(1,2*(power_supply_index-1)+1) = 1;
circuit_connection_matrix(circuit_struct.nnodespercircuit(ii),2*(power_supply_index-1)+2) = 1; circuit_connection_matrix(circuit_struct.nnodespercircuit(ii),2*(power_supply_index-1)+2) = 1;
end end
% Put coil connection % Put coil connection
for jj=1:circuit_struct.ncoilpercircuit(ii) for jj=1:circuit_struct.ncoilpercircuit(ii)
if circuit_struct.coil_current_signs{ii}(jj) == 1 if circuit_struct.coil_current_signs{ii}(jj) == 1
circuit_connection_matrix(jj, coil_column_index + 2*(jj-1) + 1 ) = 1; circuit_connection_matrix(jj, coil_column_index + 2*(jj-1) + 1 ) = 1;
circuit_connection_matrix(jj + 1, coil_column_index + 2*(jj-1) + 2 ) = 1; circuit_connection_matrix(jj + 1, coil_column_index + 2*(jj-1) + 2 ) = 1;
elseif circuit_struct.coil_current_signs{ii}(jj) == -1 elseif circuit_struct.coil_current_signs{ii}(jj) == -1
circuit_connection_matrix(jj, coil_column_index + 2*(jj-1) + 2 ) = 1; circuit_connection_matrix(jj, coil_column_index + 2*(jj-1) + 2 ) = 1;
circuit_connection_matrix(jj + 1, coil_column_index + 2*(jj-1) + 1 ) = 1; circuit_connection_matrix(jj + 1, coil_column_index + 2*(jj-1) + 1 ) = 1;
end end
end end
coil_column_index = coil_column_index + 2*circuit_struct.ncoilpercircuit(ii); coil_column_index = coil_column_index + 2*circuit_struct.ncoilpercircuit(ii);
circuit_struct.connection_matrix{ii} = circuit_connection_matrix; circuit_struct.connection_matrix{ii} = circuit_connection_matrix;
% Plot all the connaction matrices as a check % Plot all the connaction matrices as a check
if doplot if doplot
plot_connection_matrix(circuit_connection_matrix, circuit_struct.power_supply_names, circuit_struct.coil_names); plot_connection_matrix(circuit_connection_matrix, circuit_struct.power_supply_names, circuit_struct.coil_names);
end end
end end
%% Plot connection matrix %% Plot connection matrix
...@@ -184,7 +183,7 @@ for ii=1:numel(psnames) ...@@ -184,7 +183,7 @@ for ii=1:numel(psnames)
end end
for ii=1:numel(cnames) for ii=1:numel(cnames)
for jj=1:numel(cnames{ii}) for jj=1:numel(cnames{ii})
index = index +1; index = index +1;
xlab{index} = [cnames{ii}{jj} 'in']; xlab{index} = [cnames{ii}{jj} 'in'];
index = index +1; index = index +1;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment