Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
gdat
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
SPC
gdat
Commits
8e286908
Commit
8e286908
authored
5 years ago
by
Francesco Carpanese
Committed by
Olivier Sauter
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Corrected the sign in turn with sign for vertical stability current
parent
f97e953f
No related branches found
No related tags found
1 merge request
!47
Fix circuit corsica
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
matlab/IMAS/data_coils.m
+1
-1
1 addition, 1 deletion
matlab/IMAS/data_coils.m
matlab/IMAS/gen_filament.m
+2
-2
2 additions, 2 deletions
matlab/IMAS/gen_filament.m
with
3 additions
and
3 deletions
matlab/IMAS/data_coils.m
+
1
−
1
View file @
8e286908
...
...
@@ -12,7 +12,7 @@ Z = [ 5.4640; 3.2780; 1.0920; -1.0720; -3.2580; -5.4440;...
dR
=
[
0.7400
;
0.7400
;
0.7400
;
0.7400
;
0.7400
;
0.7400
;
0.9590
;
0.5801
;
0.6963
;
0.6382
;
0.8125
;
1.5590
;
0.132
;
0.132
];
dZ
=
[
2.0930
;
2.093
;
2.093
;
2.093
;
2.093
;
2.093
;
0.9841
;
0.7146
;
0.9538
;
0.9538
;
0.9538
;
1.1075
;
0.132
;
0.132
];
N
=
[
554
;
554
;
554
;
554
;
554
;
554
;
248.6
;
115.2
;
185.9
;
169.9
;
216.8
;
459.4
;
4
;
4
];
N
=
[
554
;
554
;
554
;
554
;
554
;
554
;
248.6
;
115.2
;
185.9
;
169.9
;
216.8
;
459.4
;
4
;
-
4
];
N
=
round
(
N
);
...
...
This diff is collapsed.
Click to expand it.
matlab/IMAS/gen_filament.m
+
2
−
2
View file @
8e286908
...
...
@@ -82,7 +82,7 @@ for ii = 1:numel(AC) % loop all the coils given vvstructure
% Try to use a number of filaments that respect the shape of the parallelogram
ratio
=
sqrt
((
AD
*
AD
'))/sqrt((AB*AB'
));
num1
=
ceil
(
sqrt
(
num
(
ii
)
*
ratio
));
num1
=
ceil
(
sqrt
(
abs
(
num
(
ii
)
)
*
ratio
));
num2
=
ceil
(
num1
/
ratio
);
pointx
=
zeros
(
num1
*
num2
,
1
);
...
...
@@ -102,7 +102,7 @@ for ii = 1:numel(AC) % loop all the coils given vvstructure
% but will not necessarily generate a number of windings = number of
% turns. The following normalization garanties that the total current
% flowing in the cross section of coil Iw*nw = Ia*nturns respects the input data.
Twc
(
end
+
1
:
end
+
num1
*
num2
,
end
+
1
)
=
1
*
sign
(
num
(
ii
)
)
/(
num1
*
num2
)
*
num
(
ii
);
Twc
(
end
+
1
:
end
+
num1
*
num2
,
end
+
1
)
=
1
*
abs
(
num
(
ii
)/(
num1
*
num2
)
)
*
sign
(
num
(
ii
)
)
;
end
% Reshape filaments(windings) into unique vector
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment