ukaea / paramak

Create parametric 3D fusion reactor CAD models
https://paramak.readthedocs.io/en/main/
36 stars 12 forks source link

ITER reactor #767

Closed RemDelaporteMathurin closed 3 years ago

RemDelaporteMathurin commented 3 years ago

Proposed changes

This PR adds a parametric reactor nearly entirely based on paramak built in parametric components (PF coils, PrincetonD TF coils, blanket, plasma, single null divertor).

The data for the model is taken from this paper.

The outer points of the vacuum vessel are taken fom the paper whereas the inner points are computed from the outer points of the blanket and the divertor, making it a bit more generic.

Usage

import paramak

my_reactor = paramak.ITERTokamak(rotation_angle=180)
my_reactor.export_stp()

image

Types of changes

What types of changes does your code introduce to the Paramak? Put an x in the boxes that apply

Checklist

Put an x in the boxes that apply. You can also fill these out after creating the PR. If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code.

Further comments

If this is a relatively large or complex change, kick off the discussion by explaining why you chose the solution you did and what alternatives you considered, etc...

shimwell commented 3 years ago

Just wondering which figure did you get the coordinates from, I see 26.24 has some PF coil positions but not sure about the rest

RemDelaporteMathurin commented 3 years ago

Just wondering which figure did you get the coordinates from, I see 26.24 has some PF coil positions but not sure about the rest

Yes it's Figure 26.24. It has PF coils, TF coils, divertor (had to tweak the parameters to make it match), blanket and VV

codecov[bot] commented 3 years ago

Codecov Report

Merging #767 (5d30cdf) into develop (cf727de) will increase coverage by 0.04%. The diff coverage is 100.00%.

Impacted file tree graph

@@             Coverage Diff             @@
##           develop     #767      +/-   ##
===========================================
+ Coverage    95.42%   95.46%   +0.04%     
===========================================
  Files           73       74       +1     
  Lines         4762     4806      +44     
===========================================
+ Hits          4544     4588      +44     
  Misses         218      218              
Impacted Files Coverage Δ
paramak/__init__.py 100.00% <100.00%> (ø)
paramak/parametric_components/divertor_ITER.py 100.00% <100.00%> (ø)
paramak/parametric_reactors/iter_reactor.py 100.00% <100.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more Δ = absolute <relative> (impact), ø = not affected, ? = missing data Powered by Codecov. Last update cf727de...5d30cdf. Read the comment docs.

shimwell commented 3 years ago

Screenshot from 2021-03-07 17-37-02

shimwell commented 3 years ago

Screenshot from 2021-03-07 17-23-32

RemDelaporteMathurin commented 3 years ago

This looks ready to merge, happy to merge on Tuesday if there are no objections

Some additionnal features could be added like a no dome version. But this can be kept for another PR

shimwell commented 3 years ago

Just checked with John and he is happy.

LGTM