Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DEMO reactor #733

Merged
merged 32 commits into from
Mar 7, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
83b0473
new script
RemDelaporteMathurin Feb 17, 2021
7882bef
Automated autopep8 fixes
Feb 17, 2021
52eee75
added docs for eu demo
shimwell Feb 17, 2021
680647c
moved example to class
shimwell Feb 17, 2021
4a490ea
corrected title underlining
shimwell Feb 17, 2021
d260a10
added simple creation tests
shimwell Feb 17, 2021
1d818d0
Automated autopep8 fixes
Feb 17, 2021
50e7537
removed TF coils and casing for now
Feb 25, 2021
182d197
Merge branch 'develop' into demo_reactor
shimwell Feb 27, 2021
d37e8bf
new shapes but infinite loop somewhere...
Feb 27, 2021
6c6254a
Merge branch 'demo_reactor' of https://github.com/ukaea/paramak into …
Feb 27, 2021
9084543
Automated autopep8 fixes
Feb 27, 2021
54ef86c
fixed vacuum vessel
Feb 27, 2021
0b33bad
Merge branch 'demo_reactor' of https://github.com/ukaea/paramak into …
Feb 27, 2021
99efe9e
changed class names
Feb 27, 2021
101fbf3
changed number of tf coils in test until #747 is solved
Feb 27, 2021
8dc10b8
Automated autopep8 fixes
Feb 27, 2021
02cc79e
removed points + no overlap between blanket div and vacuum vessel
Feb 27, 2021
fbe0002
Merge branch 'demo_reactor' of https://github.com/ukaea/paramak into …
Feb 27, 2021
97da5da
seperated create solid into seperate components
shimwell Mar 1, 2021
bc53086
Automated autopep8 fixes
Mar 1, 2021
f5e41f7
corrected plasma test
shimwell Mar 1, 2021
470ccfb
Merge branch 'demo_reactor' of github.com:ukaea/paramak into demo_rea…
shimwell Mar 1, 2021
fd82d25
fixed order of points in vacuum vessel
Mar 3, 2021
313fcfd
reordered points for TF casing
Mar 4, 2021
a10eade
modified azimuth_placement_angle until #757 is solved + fixed orderin…
Mar 4, 2021
bb4050a
Merge branch 'develop' into demo_reactor
Mar 5, 2021
277bca4
remove the rotation_angle type in the docstrings
RemDelaporteMathurin Mar 6, 2021
07d1ff3
added space
RemDelaporteMathurin Mar 6, 2021
c5a71ad
Added type hinting + changed default value of number_of_tf_coils
RemDelaporteMathurin Mar 6, 2021
0caad9a
Added docstrings for number_of_tf_coils
RemDelaporteMathurin Mar 6, 2021
c5b3336
updated eu demo from paper diagram picture
shimwell Mar 6, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions docs/source/paramak.parametric_reactors.rst
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,19 @@ studies can be performed quickly.
:members:
:show-inheritance:

EuDemoFrom2015PaperDiagram()
^^^^^^^^^^^^^^^^^^^^^^^^^^^^

.. image:: https://user-images.githubusercontent.com/8583900/110224418-4f62b400-7ed3-11eb-85f1-e40dc74f5671.png
:width: 400
:align: center

The above image is colored by component.

.. automodule:: paramak.parametric_reactors.eu_demo_2015_reactor
:members:
:show-inheritance:

SparcFrom2020PaperDiagram()
^^^^^^^^^^^^^^^^^^^^^^^^^^^

Expand Down
1 change: 1 addition & 0 deletions paramak/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@
from .parametric_components.hollow_cube import HollowCube
from .parametric_components.shell_fs import ShellFS

from .parametric_reactors.eu_demo_2015_reactor import EuDemoFrom2015PaperDiagram
from .parametric_reactors.ball_reactor import BallReactor
from .parametric_reactors.submersion_reactor import SubmersionTokamak
from .parametric_reactors.single_null_submersion_reactor import SingleNullSubmersionTokamak
Expand Down
Loading