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.

Sign up for GitHub

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

Jump to bottom

Import coilset details from eqdsk if available #3356

Merged
merged 4 commits into from
Jun 10, 2024
Merged

Import coilset details from eqdsk if available #3356

merged 4 commits into from
Jun 10, 2024

Conversation

je-cook
Copy link
Contributor

@je-cook je-cook commented Jun 10, 2024 •
edited
Loading

Linked Issues

Closes #3294 Closes #645

#645 is probably an unfixable problem for raw eqdsk but this sidesteps that problem for json

Description

Imports coil names into equilibrium objects

Interface Changes

Checklist

I confirm that I have completed the following checks:

  • Tests run locally and pass pytest tests --reactor
  • Code quality checks run locally and pass pre-commit run --from-ref develop --to-ref HEAD
  • Documentation built locally and checked sphinx-build -W documentation/source documentation/build

@je-cook je-cook added enhancement New feature or request equilibria Tasks relating to the equilibria module labels Jun 10, 2024
@je-cook je-cook requested review from a team as code owners June 10, 2024 12:38
@codecov Codecov
Copy link

codecov bot commented Jun 10, 2024 •
edited
Loading

Codecov Report

Attention: Patch coverage is 89.47368% with 2 lines in your changes missing coverage. Please review.

Project coverage is 74.32%. Comparing base (b68ba37) to head (8de8eb9).

❗ Current head 8de8eb9 differs from pull request most recent head e31be0f

Please upload reports for the commit e31be0f to get more accurate results.

Files Patch % Lines
bluemira/equilibria/coils/_grouping.py 81.81% 2 Missing ⚠️
Additional details and impacted files 
@@           Coverage Diff            @@
##           develop    #3356   +/-   ##
========================================
  Coverage    74.32%   74.32%           
========================================
  Files          242      242           
  Lines        26902    26916   +14     
========================================
+ Hits         19994    20006   +12     
- Misses        6908     6910    +2

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@github-actions GitHub Actions
Copy link
Contributor

⚠️ Warning Report

Found 0 new warnings, 0 fixed warnings. 🎉

All warnings (5)

On collect

  • /home/runner/miniconda3/envs/bluemira/lib/python3.10/site-packages/ufl/core/ufl_type.py:56: DeprecationWarning: attach_operators_from_hash_data deprecated, please use UFLObject instead.

On runtest

  • /home/runner/miniconda3/envs/bluemira/lib/python3.10/site-packages/ffcx/element_interface.py:26: DeprecationWarning: Converting elements created in UFL to Basix elements is deprecated. You should create the elements directly using basix.ufl.element instead
  • /home/runner/miniconda3/envs/bluemira/lib/python3.10/site-packages/ufl/core/expr.py:275: DeprecationWarning: Expr.ufl_domain() is deprecated, please use extract_unique_domain(expr) instead.
  • /home/runner/miniconda3/envs/bluemira/lib/python3.10/site-packages/ffcx/element_interface.py:23: DeprecationWarning: Use of elements created by UFL is deprecated. You should create elements directly using Basix.
  • /home/runner/miniconda3/envs/bluemira/lib/python3.10/site-packages/basix/ufl.py:1909: DeprecationWarning: Converting elements created in UFL to Basix elements is deprecated. You should create the elements directly using basix.ufl.element instead

@je-cook je-cook added this to the Version 2.1.0 milestone Jun 10, 2024
@je-cook @oliverfunk
Update bluemira/equilibria/coils/_grouping.py
8de8eb9 
Co-authored-by: Oliver Funk <oliverfunk@users.noreply.github.com>
@je-cook @oliverfunk
Update bluemira/equilibria/coils/_grouping.py
e31be0f 
Co-authored-by: Oliver Funk <oliverfunk@users.noreply.github.com>
@sonarcloud SonarCloud
Copy link

sonarcloud bot commented Jun 10, 2024

Quality Gate Passed Quality Gate passed

Issues
1 New issue
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
0.0% Duplication on New Code

See analysis details on SonarCloud

oliverfunk
oliverfunk approved these changes Jun 10, 2024
View reviewed changes
Copy link
Contributor

@oliverfunk oliverfunk left a comment

Choose a reason for hiding this comment

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

Super great!

@je-cook je-cook enabled auto-merge (squash) June 10, 2024 14:12
@je-cook je-cook merged commit c9f9315 into develop Jun 10, 2024
5 checks passed
@je-cook je-cook deleted the je-cook/integrate_coil_names_from_eqdsk branch June 10, 2024 14:16
je-cook added a commit that referenced this pull request Jun 24, 2024
@je-cook @oliverfunk
Import coilset details from eqdsk if available (#3356)
1d0d2c0 
* ✨ Add coilset additions to equilibrium

* ✅ Tests

* Update bluemira/equilibria/coils/_grouping.py

Co-authored-by: Oliver Funk <oliverfunk@users.noreply.github.com>

* Update bluemira/equilibria/coils/_grouping.py

Co-authored-by: Oliver Funk <oliverfunk@users.noreply.github.com>

---------

Co-authored-by: Oliver Funk <oliverfunk@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@oliverfunk oliverfunk oliverfunk approved these changes

Assignees

@oliverfunk oliverfunk

Labels
enhancement New feature or request equilibria Tasks relating to the equilibria module
Projects
None yet
Milestone
Version 2.1.0
Development

Successfully merging this pull request may close these issues.

Integrate coil names and types from eqdsk into CoilSet Using CoilSet.from_eqdsk mis-classifies coils
2 participants
@je-cook @oliverfunk