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

Sweep shape API additions #3130

Merged
merged 2 commits into from
Apr 9, 2024
Merged

Sweep shape API additions #3130

merged 2 commits into from
Apr 9, 2024

Conversation

je-cook
Copy link
Contributor

@je-cook je-cook commented Mar 27, 2024

Description

Adds an optional transition type to the sweep shape API

stacked on top of a few PRs that need to go in first:

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 geometry Tasks relating to the geometry module cad Tasks relating to the cad module labels Mar 27, 2024
@je-cook je-cook changed the base branch from develop to je-cook/v2_deprecation_removals March 27, 2024 08:21
Copy link

codecov bot commented Mar 27, 2024

Codecov Report

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

Project coverage is 80.88%. Comparing base (6f8300b) to head (ab38d9c).
Report is 1 commits behind head on develop.

❗ Current head ab38d9c differs from pull request most recent head 8446b9e. Consider uploading reports for the commit 8446b9e to get more accurate results

Files Patch % Lines
bluemira/base/tools.py 40.00% 3 Missing ⚠️
bluemira/geometry/tools.py 89.65% 3 Missing ⚠️
bluemira/codes/_freecadapi.py 86.66% 2 Missing ⚠️
bluemira/equilibria/run.py 77.77% 2 Missing ⚠️
bluemira/geometry/face.py 50.00% 2 Missing ⚠️
bluemira/codes/process/_plotting.py 0.00% 1 Missing ⚠️
bluemira/codes/wrapper.py 0.00% 1 Missing ⚠️
bluemira/equilibria/solve.py 80.00% 1 Missing ⚠️
bluemira/utilities/tools.py 0.00% 1 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #3130      +/-   ##
===========================================
- Coverage    81.45%   80.88%   -0.58%     
===========================================
  Files          228      218      -10     
  Lines        25231    24306     -925     
===========================================
- Hits         20553    19659     -894     
+ Misses        4678     4647      -31     

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

Copy link
Contributor

github-actions bot commented Mar 27, 2024

⚠️ Warning Report

Found 10 warnings.

All warnings (10)

On runtest

  • /home/runner/work/bluemira/bluemira/bluemira/equilibria/find.py:459: DeprecationWarning: Conversion of an array with ndim > 0 to a scalar is deprecated, and will error in future. Ensure you extract a single element from your array before performing this operation. (Deprecated NumPy 1.25.)
  • /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/work/bluemira/bluemira/bluemira/equilibria/coils/_coil.py:382: DeprecationWarning: Conversion of an array with ndim > 0 to a scalar is deprecated, and will error in future. Ensure you extract a single element from your array before performing this operation. (Deprecated NumPy 1.25.)
  • /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/scipy/integrate/_quadpack_py.py:575: DeprecationWarning: Conversion of an array with ndim > 0 to a scalar is deprecated, and will error in future. Ensure you extract a single element from your array before performing this operation. (Deprecated NumPy 1.25.)
  • /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/work/bluemira/bluemira/bluemira/magnetostatics/semianalytic_2d.py:165: DeprecationWarning: Conversion of an array with ndim > 0 to a scalar is deprecated, and will error in future. Ensure you extract a single element from your array before performing this operation. (Deprecated NumPy 1.25.)
  • /home/runner/work/bluemira/bluemira/bluemira/equilibria/plasma.py:47: DeprecationWarning: Conversion of an array with ndim > 0 to a scalar is deprecated, and will error in future. Ensure you extract a single element from your array before performing this operation. (Deprecated NumPy 1.25.)
  • /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

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 je-cook/sweep_api_improvemnts branch from defd468 to ca0e78a Compare March 27, 2024 08:25
@je-cook je-cook force-pushed the je-cook/v2_deprecation_removals branch from 777c80f to ee16440 Compare March 27, 2024 10:53
@je-cook je-cook force-pushed the je-cook/sweep_api_improvemnts branch from ca0e78a to 043cc8a Compare March 27, 2024 10:54
@je-cook je-cook force-pushed the je-cook/v2_deprecation_removals branch from b9a55c1 to 1693ec4 Compare March 27, 2024 14:38
@je-cook je-cook force-pushed the je-cook/sweep_api_improvemnts branch from 043cc8a to 659deec Compare March 27, 2024 14:39
@je-cook je-cook force-pushed the je-cook/v2_deprecation_removals branch from 1693ec4 to aae522a Compare March 27, 2024 15:08
@je-cook je-cook force-pushed the je-cook/sweep_api_improvemnts branch from 659deec to 1308d2a Compare March 27, 2024 15:08
@je-cook je-cook force-pushed the je-cook/v2_deprecation_removals branch from aae522a to 4ad0863 Compare April 8, 2024 10:51
Base automatically changed from je-cook/v2_deprecation_removals to develop April 9, 2024 13:17
@je-cook je-cook force-pushed the je-cook/sweep_api_improvemnts branch from ab38d9c to 8446b9e Compare April 9, 2024 13:22
@je-cook je-cook marked this pull request as ready for review April 9, 2024 13:22
@je-cook je-cook requested review from a team as code owners April 9, 2024 13:22
@je-cook je-cook enabled auto-merge (squash) April 9, 2024 13:23
Copy link

sonarcloud bot commented Apr 9, 2024

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

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

See analysis details on SonarCloud

@je-cook je-cook merged commit 817bddf into develop Apr 9, 2024
4 of 5 checks passed
@je-cook je-cook deleted the je-cook/sweep_api_improvemnts branch April 9, 2024 13:33
OceanNuclear pushed a commit that referenced this pull request Jun 17, 2024
* 👽️ Improve sweep shape API

* 🎨 Move enum API to tools
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cad Tasks relating to the cad module geometry Tasks relating to the geometry module
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants