Skip to content

Fwbs dataclass#4230

Open
clmould wants to merge 5 commits intomainfrom
FWBS-Dataclass
Open

Fwbs dataclass#4230
clmould wants to merge 5 commits intomainfrom
FWBS-Dataclass

Conversation

@clmould
Copy link
Copy Markdown
Collaborator

@clmould clmould commented May 7, 2026

Description

Checklist

I confirm that I have completed the following checks:

  • My changes follow the PROCESS style guide
  • I have justified any large differences in the regression tests caused by this pull request in the comments.
  • I have added new tests where appropriate for the changes I have made.
  • If I have had to change any existing unit or integration tests, I have justified this change in the pull request comments.
  • If I have made documentation changes, I have checked they render correctly.
  • I have added documentation for my change, if appropriate.

clmould added 2 commits May 7, 2026 10:39
also in hcpb use blanket_vars to point to vars instead of blanket_library module
@clmould clmould marked this pull request as ready for review May 7, 2026 10:03
@clmould clmould requested a review from a team as a code owner May 7, 2026 10:03
@codecov-commenter
Copy link
Copy Markdown

codecov-commenter commented May 7, 2026

Codecov Report

❌ Patch coverage is 69.34558% with 267 lines in your changes missing coverage. Please review.
✅ Project coverage is 51.49%. Comparing base (49eb4d1) to head (57d9588).
⚠️ Report is 1 commits behind head on main.

Files with missing lines Patch % Lines
process/models/stellarator/stellarator.py 0.00% 97 Missing ⚠️
process/models/blankets/blanket_library.py 33.06% 83 Missing ⚠️
process/models/blankets/hcpb.py 64.15% 19 Missing ⚠️
process/models/power.py 7.69% 12 Missing ⚠️
process/models/blankets/dcll.py 76.31% 9 Missing ⚠️
process/core/scan.py 0.00% 8 Missing ⚠️
process/models/availability.py 83.33% 5 Missing ⚠️
process/models/costs/costs.py 28.57% 5 Missing ⚠️
process/models/costs/costs_2015.py 54.54% 5 Missing ⚠️
process/core/solver/iteration_variables.py 55.55% 4 Missing ⚠️
... and 14 more
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #4230      +/-   ##
==========================================
- Coverage   51.81%   51.49%   -0.32%     
==========================================
  Files         150      150              
  Lines       30296    30103     -193     
==========================================
- Hits        15697    15501     -196     
- Misses      14599    14602       +3     

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

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@clmould clmould mentioned this pull request May 7, 2026
47 tasks
Copy link
Copy Markdown
Collaborator

@timothy-nunn timothy-nunn left a comment

Choose a reason for hiding this comment

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

I haven't quite checked everything but here are my comments on the main logic changes

Comment thread process/core/solver/iteration_variables.py Outdated
Comment thread process/core/solver/iteration_variables.py Outdated
Comment thread process/core/solver/iteration_variables.py Outdated
Comment thread process/core/solver/iteration_variables.py
Comment thread process/core/solver/iteration_variables.py
Comment thread process/core/solver/iteration_variables.py Outdated
Comment thread process/data_structure/blanket_library.py
Comment thread process/models/engineering/materials.py Outdated
Comment thread process/models/ivc_tools.py Outdated
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

I'm a little confused why this file has been created?

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

There was a circular import between the first wall and blanket, and this removed that. Also these functions aren't specific to the blanket and are used by other modules so made sense to remove them from blanket_library

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

I'll move this to another PR

@clmould
Copy link
Copy Markdown
Collaborator Author

clmould commented May 7, 2026

Since this is the first PR to required iteration_variables to be changes, I tested out using some fwbs iteration variables in large_tokamak_IN.DAT:
image

I then ran process on this file on this branch and also on main:
image

The only difference was in runtime.

Comment thread process/core/solver/iteration_variables.py
Comment on lines +183 to +184
icomponent: int = None
"""Switch used to specify selected component: blanket=0, shield=1, vacuum vessel=2"""
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Can be removed

Comment thread process/models/power.py Outdated
Comment thread process/data_structure/blanket_variables.py Outdated
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.

3 participants