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

Add gridded collocation option #3065

Merged
merged 4 commits into from
Mar 19, 2024
Merged

Add gridded collocation option #3065

merged 4 commits into from
Mar 19, 2024

Conversation

geograham
Copy link
Contributor

Description

Add option to create a uniform grid of sampled points for use in spherical harmonic approximation.

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 March 1, 2024 15:24
@codecov Codecov
Copy link

codecov bot commented Mar 1, 2024 •
edited
Loading

Codecov Report

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

Project coverage is 79.44%. Comparing base (438f4d7) to head (25fa778).

Files Patch % Lines
bluemira/equilibria/find.py 66.66% 1 Missing ⚠️
...timisation/harmonics/harmonics_approx_functions.py 91.66% 1 Missing ⚠️
Additional details and impacted files 
@@             Coverage Diff             @@
##           develop    #3065      +/-   ##
===========================================
- Coverage    79.71%   79.44%   -0.27%     
===========================================
  Files          227      227              
  Lines        25513    25525      +12     
===========================================
- Hits         20337    20279      -58     
- Misses        5176     5246      +70

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

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Mar 1, 2024 •
edited
Loading

⚠️ Warning Report

Found 21 warnings.

All warnings (21)

On collect

  • /home/runner/miniconda3/envs/bluemira/lib/python3.8/site-packages/shiboken2/files.dir/shibokensupport/feature.py:139: DeprecationWarning: The module 'bluemira.geometry.optimisation._optimisation_old' is deprecated and will be removed in v2.0.0. See https://bluemira.readthedocs.io/en/latest/optimisation/optimisation.html for documentation of the new optimisation module.
  • /home/runner/miniconda3/envs/bluemira/lib/python3.8/site-packages/shiboken2/files.dir/shibokensupport/feature.py:139: DeprecationWarning: The module 'bluemira.equilibria.opt_constraint_funcs' is deprecated and will be removed in v2.0.0. See https://bluemira.readthedocs.io/en/latest/optimisation/optimisation.html for documentation of the new optimisation module.
  • /home/runner/miniconda3/envs/bluemira/lib/python3.8/site-packages/shiboken2/files.dir/shibokensupport/feature.py:139: DeprecationWarning: pkg_resources is deprecated as an API. See https://setuptools.pypa.io/en/latest/pkg_resources.html
  • /home/runner/miniconda3/envs/bluemira/lib/python3.8/site-packages/shiboken2/files.dir/shibokensupport/feature.py:139: DeprecationWarning: The module 'bluemira.equilibria.opt_problems' is deprecated and will be removed in v2.0.0. See https://bluemira.readthedocs.io/en/latest/optimisation/optimisation.html for documentation of the new optimisation module.
  • /home/runner/miniconda3/envs/bluemira/lib/python3.8/site-packages/shiboken2/files.dir/shibokensupport/feature.py:139: DeprecationWarning: The module 'bluemira.utilities.opt_tools' is deprecated and will be removed in v2.0.0. See https://bluemira.readthedocs.io/en/latest/optimisation/optimisation.html for documentation of the new optimisation module.
  • /home/runner/miniconda3/envs/bluemira/lib/python3.8/site-packages/shiboken2/files.dir/shibokensupport/feature.py:139: DeprecationWarning: The module 'bluemira.equilibria.opt_objectives' is deprecated and will be removed in v2.0.0. See https://bluemira.readthedocs.io/en/latest/optimisation/optimisation.html for documentation of the new optimisation module.
  • /home/runner/miniconda3/envs/bluemira/lib/python3.8/site-packages/shiboken2/files.dir/shibokensupport/feature.py:139: DeprecationWarning: The module 'bluemira.equilibria.opt_constraints' is deprecated and will be removed in v2.0.0. See https://bluemira.readthedocs.io/en/latest/optimisation/optimisation.html for documentation of the new optimisation module.
  • /home/runner/miniconda3/envs/bluemira/lib/python3.8/site-packages/shiboken2/files.dir/shibokensupport/feature.py:139: DeprecationWarning: The module 'bluemira.utilities.opt_problems' is deprecated and will be removed in v2.0.0. See https://bluemira.readthedocs.io/en/latest/optimisation/optimisation.html for documentation of the new optimisation module.
  • /home/runner/miniconda3/envs/bluemira/lib/python3.8/site-packages/pkg_resources/__init__.py:2832: DeprecationWarning: Deprecated call to pkg_resources.declare_namespace('mpl_toolkits'). Implementing implicit namespace packages (as specified in PEP 420) is preferred to pkg_resources.declare_namespace. See https://setuptools.pypa.io/en/latest/references/keywords.html#keyword-namespace-packages
  • /home/runner/miniconda3/envs/bluemira/lib/python3.8/site-packages/shiboken2/files.dir/shibokensupport/feature.py:139: DeprecationWarning: The module 'bluemira.utilities.optimiser' is deprecated and will be removed in version 2.0.0. See https://bluemira.readthedocs.io/en/latest/optimisation/optimisation.html for documentation of the new optimisation module.
  • /home/runner/miniconda3/envs/bluemira/lib/python3.8/site-packages/pkg_resources/__init__.py:2832: DeprecationWarning: Deprecated call to pkg_resources.declare_namespace('sphinxcontrib'). Implementing implicit namespace packages (as specified in PEP 420) is preferred to pkg_resources.declare_namespace. See https://setuptools.pypa.io/en/latest/references/keywords.html#keyword-namespace-packages

On runtest

  • /home/runner/work/bluemira/bluemira/tests/equilibria/test_file.py:181: TypeHintWarning: Skipping type check against 'Optional[npt.NDArray[np.float64]]'; this looks like a string-form forward reference imported from another module
  • /home/runner/work/bluemira/bluemira/tests/equilibria/test_file.py:181: TypeHintWarning: Skipping type check against 'npt.NDArray[np.float64]'; this looks like a string-form forward reference imported from another module
  • /home/runner/work/bluemira/bluemira/bluemira/base/reactor.py:677: DeprecationWarning: Using kwarg 'dim' is no longer supported. Simply pass in the dimensions you would like to show, e.g. show_cad('xz')
  • /home/runner/work/bluemira/bluemira/tests/equilibria/test_file.py:181: TypeHintWarning: Skipping type check against 'Optional[str]'; this looks like a string-form forward reference imported from another module
  • /home/runner/work/bluemira/bluemira/eudemo/eudemo/tf_coils/tf_coils.py:338: DeprecationWarning: Argument 'separatrix' is deprecated, argument 'ripple_wire' is used instead.
  • /home/runner/work/bluemira/bluemira/tests/builders/test_tf_coils.py:46: DeprecationWarning: RippleConstrainedLengthGOP API has changed, please specify how you want to constrain TF ripple by using one of the available RipplePointSelector classes. Defaulting to an EquispacedSelector with n_rip_points=3 for now.
  • /home/runner/miniconda3/envs/bluemira/lib/python3.8/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/work/bluemira/bluemira/tests/equilibria/test_file.py:181: TypeHintWarning: Skipping type check against 'float'; this looks like a string-form forward reference imported from another module
  • /home/runner/work/bluemira/bluemira/tests/equilibria/test_file.py:181: TypeHintWarning: Skipping type check against 'int'; this looks like a string-form forward reference imported from another module
  • /home/runner/work/bluemira/bluemira/tests/equilibria/test_file.py:181: TypeHintWarning: Skipping type check against 'str'; this looks like a string-form forward reference imported from another module

@je-cook je-cook added the equilibria Tasks relating to the equilibria module label Mar 4, 2024
CoronelBuendia
CoronelBuendia approved these changes Mar 4, 2024
View reviewed changes
Copy link
Contributor

@CoronelBuendia CoronelBuendia left a comment

Choose a reason for hiding this comment

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

LGTM - just a potential speed improvement if it is necessary.

@sonarcloud SonarCloud
Copy link

sonarcloud bot commented Mar 18, 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 b6be06d into Fusion-Power-Plant-Framework:develop Mar 19, 2024
4 checks passed
OceanNuclear pushed a commit that referenced this pull request Jun 17, 2024
@geograham @OceanNuclear
Add gridded collocation option (#3065)
c750cd0 
* add new collocation point option

* tidy up use of collocation points function

* use mask

* tidy up after refactor and give n_points default value
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@CoronelBuendia CoronelBuendia CoronelBuendia approved these changes

Assignees

@CoronelBuendia CoronelBuendia

Labels
equilibria Tasks relating to the equilibria module
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@geograham @CoronelBuendia @je-cook