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

New plasma shapes from RemiTheWarrior/plasma-boundaries #156

Merged
merged 19 commits into from
Aug 5, 2020

Conversation

RemDelaporteMathurin
Copy link

@RemDelaporteMathurin RemDelaporteMathurin commented Aug 4, 2020

This PR includes new plasma shapes calculated from the plasmaboundaries package.

Usage:

from paramak import PlasmaBoundaries

myShape = PlasmaBoundaries(configuration="double-null")
myShape.export_2d_image("export.png")

image
image
image

Coverage:

94%

Fixes:

@RemDelaporteMathurin RemDelaporteMathurin marked this pull request as ready for review August 4, 2020 16:30
@shimwell
Copy link
Collaborator

shimwell commented Aug 4, 2020

Looks great, I have a few changes for the doc string. Nothing major



class PlasmaBoundaries(Plasma):
"""Creates a double null tokamak plasma shape that is controlled
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we add something like

Uses the plasma boundaries package to calculate the points

@shimwell
Copy link
Collaborator

shimwell commented Aug 5, 2020

Do you think it is worth putting examples for ITER, DEMO etc in this file https://github.com/ukaea/paramak/blob/main/examples/example_parametric_components/make_plasmas.py

Co-authored-by: Jonathan Shimwell <jonathan.shimwell@ukaea.uk>
@shimwell
Copy link
Collaborator

shimwell commented Aug 5, 2020

This looks fine to me @RemiTheWarrior happy to merge if you are.

The other changes are optional ideas, nothing essential there

@RemDelaporteMathurin
Copy link
Author

@shimwell i'll add a better summary in the docs a bit later 😄

@RemDelaporteMathurin
Copy link
Author

RemDelaporteMathurin commented Aug 5, 2020

Do you think it is worth putting examples for ITER, DEMO etc in this file https://github.com/ukaea/paramak/blob/main/examples/example_parametric_components/make_plasmas.py

@shimwell it can but I don't really see where to put things

@shimwell
Copy link
Collaborator

shimwell commented Aug 5, 2020

Do you think it is worth putting examples for ITER, DEMO etc in this file https://github.com/ukaea/paramak/blob/main/examples/example_parametric_components/make_plasmas.py

@shimwell it can but I don't really see where to put things

Ok I shall add to the example once it is merged. It will give me a good reason to get better at using this new plasma boundary parametric componet

@shimwell
Copy link
Collaborator

shimwell commented Aug 5, 2020

Do you think it is worth putting examples for ITER, DEMO etc in this file https://github.com/ukaea/paramak/blob/main/examples/example_parametric_components/make_plasmas.py

@shimwell it can but I don't really see where to put things

Ok I shall add to the example once it is merged. It will give me a good reason to get better at using this new plasma boundary parametric componet

I think you just added an example while I was typing the last reply :-)

@RemDelaporteMathurin
Copy link
Author

I think you just added an example while I was typing the last reply :-)

I did, though something is messed up with my Docker installation as it seems it's using an old version of the branch somehow... Can you please test that the secondary bits of plasma don't appear on the png export ?
image

@RemDelaporteMathurin
Copy link
Author

image
@shimwell this seems ok afterall (green curve is ITER single-null).

I think this is ready to be merged in if you're ok with it

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants