Skip to content

Replace stellarator only variable for first wall coolant channel with general use variable #3580

Merged
timothy-nunn merged 2 commits intomainfrom
jmatthews/3109-replacement-branch
Mar 24, 2025
Merged

Replace stellarator only variable for first wall coolant channel with general use variable #3580
timothy-nunn merged 2 commits intomainfrom
jmatthews/3109-replacement-branch

Conversation

@kj5248
Copy link
Copy Markdown
Collaborator

@kj5248 kj5248 commented Mar 11, 2025

Closes #3109

Description

In stellarator there were variables afwi and afwo for the coolant inner channel radius for the FW inboard and outboard respectively. These variables seemed to have the same value in all the stellarator files and is comparable to the tokamak variable radius_fw_channel which is the inner channel radius for the FW (inboard and outboard).

For this reason, and to also allow for the potential of using the dcll blanket model with the stellarator, these variables were replaced with the tokamak variable radius_fw_channel.

Also had to make a change to the stellarator regression file as the default value for afwi and afwo was 0.008 rather than the default of radius_fw_channel which is 0.006.

Closes #3109

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.

@kj5248 kj5248 requested a review from timothy-nunn March 11, 2025 14:36
@codecov-commenter
Copy link
Copy Markdown

codecov-commenter commented Mar 11, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 31.74%. Comparing base (204b622) to head (31a5277).

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #3580   +/-   ##
=======================================
  Coverage   31.74%   31.74%           
=======================================
  Files          85       85           
  Lines       20161    20161           
=======================================
  Hits         6400     6400           
  Misses      13761    13761           

☔ 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.

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.

Rebase onto main. Are we expecting the value changes in the regression test if this a variable rename (could be fixed by rebasing onto main).

@kj5248 kj5248 force-pushed the jmatthews/3109-replacement-branch branch from 6394900 to 271ad7a Compare March 24, 2025 09:16
@timothy-nunn
Copy link
Copy Markdown
Collaborator

timothy-nunn commented Mar 24, 2025

Regression failures (except Stellarator files) are caused by #3602

Stellarator regression test differences are being caused by what I suspect to be a bug in the stellarator. radius_fw_channel was being used in some places in the Stellarator before this change:

build_variables.dr_fw_inboard = (
2.0e0 * fwbs_variables.radius_fw_channel + 2.0e0 * fwbs_variables.dr_fw_wall
)

However, radius_fw_channel was at its default value of 0.006. Following this change, radius_fw_channel is 0.008 at this point in the code. Testing by replacing this use of radius_fw_channel with 0.006 causes the regression tests to pass.

I believe that this changes the code to be correct and the use of 0.006 before was an error.

@timothy-nunn timothy-nunn merged commit 2083732 into main Mar 24, 2025
14 of 18 checks passed
@timothy-nunn timothy-nunn deleted the jmatthews/3109-replacement-branch branch March 24, 2025 16:56
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.

coolant channels within the tokamak and stellarator models

3 participants