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

Cad Construction Types #3696

Merged
merged 37 commits into from
Jan 22, 2025
Merged

Cad Construction Types #3696

merged 37 commits into from
Jan 22, 2025

Conversation

oliverfunk
Copy link
Contributor

@oliverfunk oliverfunk commented Nov 15, 2024 •
edited
Loading

Linked Issues

Closes #2061
Closes #3584

Description

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

@oliverfunk oliverfunk force-pushed the oliverfunk/cad-construction-types branch 2 times, most recently from 072540a to 1fee99f Compare November 28, 2024 12:53
@oliverfunk oliverfunk force-pushed the oliverfunk/cad-construction-types branch from fe04cd7 to ddcc735 Compare December 4, 2024 15:09
je-cook
je-cook reviewed Dec 5, 2024
View reviewed changes
Copy link
Contributor

@je-cook je-cook left a comment

Choose a reason for hiding this comment

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

Minors

bluemira/base/reactor.py Outdated Show resolved Hide resolved
bluemira/codes/_freecadapi.py Outdated Show resolved Hide resolved
bluemira/codes/_freecadapi.py Outdated Show resolved Hide resolved
bluemira/geometry/tools.py Outdated Show resolved Hide resolved
je-cook
je-cook reviewed Dec 5, 2024
View reviewed changes
bluemira/base/reactor.py Outdated Show resolved Hide resolved
je-cook
je-cook reviewed Dec 6, 2024
View reviewed changes
Copy link
Contributor

@je-cook je-cook left a comment

Choose a reason for hiding this comment

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

Getting there these are a bit more to the root

bluemira/base/tools.py Outdated Show resolved Hide resolved
bluemira/base/tools.py Show resolved Hide resolved
@je-cook je-cook added the cad Tasks relating to the cad module label Dec 6, 2024
@codecov Codecov
Copy link

codecov bot commented Dec 9, 2024 •
edited
Loading

Codecov Report

Attention: Patch coverage is 87.64479% with 32 lines in your changes missing coverage. Please review.

Project coverage is 76.64%. Comparing base (65b0cef) to head (16fab3f).
Report is 2 commits behind head on develop.

Files with missing lines Patch % Lines
bluemira/geometry/tools.py 20.00% 12 Missing ⚠️
bluemira/builders/tools.py 27.27% 8 Missing ⚠️
bluemira/base/tools.py 95.31% 6 Missing ⚠️
bluemira/geometry/compound.py 84.21% 3 Missing ⚠️
bluemira/base/components.py 87.50% 1 Missing ⚠️
bluemira/base/reactor.py 98.41% 1 Missing ⚠️
bluemira/mesh/meshing.py 90.00% 1 Missing ⚠️
Additional details and impacted files 
@@             Coverage Diff             @@
##           develop    #3696      +/-   ##
===========================================
+ Coverage    76.61%   76.64%   +0.03%     
===========================================
  Files          230      230              
  Lines        27116    27229     +113     
===========================================
+ Hits         20775    20871      +96     
- Misses        6341     6358      +17

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

@oliverfunk oliverfunk force-pushed the oliverfunk/cad-construction-types branch from 70103be to a82b239 Compare December 17, 2024 13:49
je-cook
je-cook reviewed Dec 18, 2024
View reviewed changes
Copy link
Contributor

@je-cook je-cook left a comment

Choose a reason for hiding this comment

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

Overall looks good, still need to run it.

bluemira/base/reactor.py Outdated Show resolved Hide resolved
bluemira/builders/tools.py Outdated Show resolved Hide resolved
bluemira/builders/tools.py Outdated Show resolved Hide resolved
bluemira/geometry/compound.py Outdated Show resolved Hide resolved
bluemira/geometry/tools.py Show resolved Hide resolved
@oliverfunk oliverfunk force-pushed the oliverfunk/cad-construction-types branch 2 times, most recently from b293f25 to cd12407 Compare January 13, 2025 17:23
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jan 14, 2025 •
edited
Loading

⚠️ Warning Report

Found 0 new warnings, 0 fixed warnings. 🎉

All warnings (3)

On runtest

  • /home/runner/work/bluemira/bluemira/bluemira/equilibria/find.py:478: 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/radiation_transport/radiation_tools.py:886: DeprecationWarning: interp2dis deprecated!interp2d` is deprecated in SciPy 1.10 and will be removed in SciPy 1.12.0.

For legacy code, nearly bug-for-bug compatible replacements are
RectBivariateSpline on regular grids, and bisplrep/bisplev for
scattered 2D data.

In new code, for regular grids use RegularGridInterpolator instead.
For scattered data, prefer LinearNDInterpolator or
CloughTocher2DInterpolator.

For more details see
https://gist.github.com/ev-br/8544371b40f414b7eaf3fe6217209bff
`

On config

  • /home/runner/miniconda3/envs/bluemira/lib/python3.10/site-packages/pivy/quarter/QuarterWidget.py:17: DeprecationWarning: invalid escape sequence '\C'

je-cook
je-cook reviewed Jan 15, 2025
View reviewed changes
Copy link
Contributor

@je-cook je-cook left a comment

Choose a reason for hiding this comment

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

I'm happy, some comments more than anything to do (maybe one test). As we talked about the connecting stuff wil be move to a draft PR for now pending tests

bluemira/base/reactor.py Show resolved Hide resolved
bluemira/base/tools.py Show resolved Hide resolved
@oliverfunk oliverfunk force-pushed the oliverfunk/cad-construction-types branch from cf0314f to 09c19d6 Compare January 15, 2025 15:50
@oliverfunk oliverfunk mentioned this pull request Jan 16, 2025
Open
@oliverfunk oliverfunk force-pushed the oliverfunk/cad-construction-types branch from 09c19d6 to c12a7ed Compare January 21, 2025 15:36
@oliverfunk oliverfunk marked this pull request as ready for review January 21, 2025 16:39
@oliverfunk oliverfunk requested review from a team as code owners January 21, 2025 16:39
@sonarqubecloud SonarQubeCloud
Copy link

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

@je-cook je-cook self-assigned this Jan 22, 2025
@je-cook je-cook merged commit 31e42c9 into develop Jan 22, 2025
12 checks passed
@je-cook je-cook deleted the oliverfunk/cad-construction-types branch January 22, 2025 14:52
@je-cook je-cook added the enhancement New feature or request label Jan 22, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@je-cook je-cook je-cook approved these changes

Assignees

@je-cook je-cook

Labels
cad Tasks relating to the cad module enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Improve the output of GeoMeshable function XYZ CAD generating types
2 participants
@oliverfunk @je-cook