-
Notifications
You must be signed in to change notification settings - Fork 12
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
DEMO reactor #733
Conversation
Codecov Report
@@ Coverage Diff @@
## develop #733 +/- ##
===========================================
+ Coverage 95.38% 95.42% +0.03%
===========================================
Files 72 73 +1
Lines 4724 4762 +38
===========================================
+ Hits 4506 4544 +38
Misses 218 218
Continue to review full report at Codecov.
|
Thanks for making this Remi. I think it is just what we needed. Lets move it to a class, add some tests and some docs in a similar way to PR #734 |
I've moved the example in to a class object, added tests and added some documentation. I think the general shapes need a bit more work (especially that overlap) and the documentation picture needs updating |
Perhaps the TF coils need an additionnal bit of work cause only the cases are described in this paper. Plus there's an overlap with the divertor |
I guess we can even not have coils in the model to begin with |
Would you like me to split this reactor up into sections like I've done for the Sparc one? |
I can try and have a go at it today. What about the coils though, should we remove them for now ? |
Yep lets remove the TF coils and just leave the TF cases. Thanks for this Remi, much appreachiated |
But even the casing is overlapping I'm afraid. How about removing both the coils and casing until a better diagram is found ? |
Perhaps we can make the casing using an extrudeMixedShape and some coordinates |
@Derek-yfqiu this reactor model is based on a drawing in a published paper and has the curved magnet cases that you were looking for. |
@shimwell I've pushed some aditionnal shapes, but something doesn't work with the vacuum vessel... can't figure out what. |
@shimwell perhaps removing the cuts in the vacuum vessel (blanket + divertor) would speed up the computation time ? but there will be some small overlaps |
lets avoid the overlaps for now. I have a half implemented method of speeding up the graveyard construction. So I hope that will help. Happy to leave this PR for a few days while I tidy things up elsewhere and fix that graveyard problem. Then I shall be back. |
@shimwell I'm afraid there's something else going on here. When I run the tests locally, test_vessel_construction takes forever. Removing the line This is rather weird... |
I've noticed that some points in the vacuum vessel weren't ordered correctly. I've fixed it. However, it seems that when trying to do a 360 rotation angle, the following error occurs:
I fear this is somehow related to issue #445 because replacing the RotateSplineShape by RotateStraightShape solves the issue. |
Nice detective work there Remi. I am not sure what to do about the 360 rotation error, perhaps this is a question for CQ |
…g of points for VV
@shimwell this is ready to be merged I think. However, the diff coverage is low. This is due to neutronics_utils.py, which is weird cause it's unchanged in this PR. Don't know what to do about it |
@shimwell @billingsley-john this is now ready for review! :-D |
Co-authored-by: Jonathan Shimwell <jonathan.shimwell@ukaea.uk>
Co-authored-by: Jonathan Shimwell <jonathan.shimwell@ukaea.uk>
Co-authored-by: Jonathan Shimwell <jonathan.shimwell@ukaea.uk>
I think we just need a FreeCAD picture with a similar color scheme to the others, but I can do that when I build it over here |
Co-authored-by: Jonathan Shimwell <jonathan.shimwell@ukaea.uk>
Real nice! Are you talking about the Figure 4 of the paper ? If so are you thinking about adding SPARC, DEMO and another one ? We could try ITER... |
Proposed changes
A tiny PR adding an example script. What do you think @shimwell ?
Types of changes
What types of changes does your code introduce to the Paramak?
Put an
x
in the boxes that applyChecklist
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...