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

Clip the grid in the z-direction for SH LCFS fit metric #3215

Merged
merged 6 commits into from
Jun 3, 2024

Conversation

geograham
Copy link
Contributor

@geograham geograham commented Apr 23, 2024

Description

Clip the equilibrium grid, so that the lower/upper-most coils are at the grid edges when inside the spherical harmonic approximation finding function. Prevents the use of an excessive number of required degrees in an approximation for cases where the LCFS appears to wrap around the divertor coils.

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

@geograham geograham requested a review from a team as a code owner April 23, 2024 10:48
@geograham geograham changed the title Clip the grid in the z-direction for SH LCFS fit metric WIP: Clip the grid in the z-direction for SH LCFS fit metric Apr 23, 2024
Copy link

codecov bot commented Apr 24, 2024

Codecov Report

Attention: Patch coverage is 33.33333% with 14 lines in your changes are missing coverage. Please review.

Project coverage is 80.32%. Comparing base (ca14b5e) to head (4f4d078).
Report is 17 commits behind head on develop.

Files Patch % Lines
...timisation/harmonics/harmonics_approx_functions.py 33.33% 14 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #3215      +/-   ##
===========================================
- Coverage    82.69%   80.32%   -2.38%     
===========================================
  Files          218      224       +6     
  Lines        23597    24741    +1144     
===========================================
+ Hits         19513    19872     +359     
- Misses        4084     4869     +785     

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

@geograham geograham changed the title WIP: Clip the grid in the z-direction for SH LCFS fit metric Clip the grid in the z-direction for SH LCFS fit metric Apr 24, 2024
Copy link

sonarcloud bot commented May 9, 2024

Quality Gate Passed Quality Gate passed

Issues
3 New issues
0 Accepted issues

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

See analysis details on SonarCloud

Copy link
Contributor

github-actions bot commented May 9, 2024

⚠️ Warning Report

Found 0 new warnings, 0 fixed warnings. 🎉

All warnings (6)

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/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
  • /home/runner/miniconda3/envs/bluemira/lib/python3.10/site-packages/h5py/__init__.py:36: UserWarning: h5py is running against HDF5 1.14.3 when it was built against 1.14.2, this may cause problems
  • /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.

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.

@je-cook je-cook force-pushed the develop branch 5 times, most recently from 5a50acb to 7574352 Compare May 15, 2024 08:13
@je-cook je-cook merged commit 0c03c7f into develop Jun 3, 2024
5 of 7 checks passed
@je-cook je-cook deleted the sh_modify_lcfs_fit_metric branch June 3, 2024 06:47
OceanNuclear pushed a commit that referenced this pull request Jun 17, 2024
* clip the grid in the z direction for SH LCFS fit metric

* correct line length

* update tests and notebooks

* fix quality errors

* ruff

* update color scale and add LCFS to plot

---------

Co-authored-by: Georgina Graham <georgina.graham@ukaea.uk>
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