ukaea / paramak

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

Version update merge from Develop to main #802

Closed shimwell closed 3 years ago

shimwell commented 3 years ago

Proposed changes

Lots of improvements from the development branch colors for components jupyter notebook .show() more control over the exporting of h5m files ability to export vtk files refactored neutronics capabilities and added varible mesh positions fixed bug with TF coil inboard legs and extra tests testing matrix that allows testing of different cq versions added cm units export to export_stp on paramak.Reactor

Let me know if I have missed any thing

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...

codecov[bot] commented 3 years ago

Codecov Report

Merging #802 (d9eae5c) into main (785c3ed) will decrease coverage by 1.39%. The diff coverage is 86.24%.

:exclamation: Current head d9eae5c differs from pull request most recent head d477a7a. Consider uploading reports for the commit d477a7a to get more accurate results Impacted file tree graph

@@            Coverage Diff             @@
##             main     #802      +/-   ##
==========================================
- Coverage   96.52%   95.12%   -1.40%     
==========================================
  Files          70       74       +4     
  Lines        4491     5256     +765     
==========================================
+ Hits         4335     5000     +665     
- Misses        156      256     +100     
Impacted Files Coverage Δ
paramak/parametric_components/blanket_fp.py 100.00% <ø> (ø)
.../parametric_components/poloidal_field_coil_case.py 100.00% <ø> (ø)
...etric_components/toroidal_field_coil_triple_arc.py 100.00% <ø> (ø)
...tric_neutronics/make_faceteted_neutronics_model.py 0.00% <0.00%> (ø)
paramak/parametric_shapes/sweep_circle_shape.py 100.00% <ø> (ø)
paramak/parametric_shapes/sweep_mixed_shape.py 100.00% <ø> (ø)
paramak/parametric_shapes/sweep_spline_shape.py 100.00% <ø> (ø)
paramak/parametric_shapes/sweep_straight_shape.py 100.00% <ø> (ø)
paramak/neutronics_utils.py 86.26% <79.47%> (-6.59%) :arrow_down:
paramak/reactor.py 91.84% <86.77%> (-7.32%) :arrow_down:
... and 41 more

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 785c3ed...d477a7a. Read the comment docs.

shimwell commented 3 years ago

I shall take a look at why the coverage has dropped, I think we might be missing some tests with code cov again

shimwell commented 3 years ago

CodeCov is reporting these lines are not covered

Screenshot from 2021-04-13 09-29-11

https://app.codecov.io/gh/ukaea/paramak/compare/802/diff#diff-cGFyYW1hay9yZWFjdG9yLnB5

However they are being covered in the Circle CI tests and locally

Screenshot from 2021-04-13 09-29-34

https://app.circleci.com/pipelines/github/ukaea/paramak/2897/workflows/5ade765f-8deb-4aea-8a08-c232877e5325/jobs/3126

So I'm not really sure what is happening here

shimwell commented 3 years ago

Screenshot from 2021-03-08 09-05-14