Skip to content

Replaced stellarator only variable with tokamak used variable#3537

Closed
kj5248 wants to merge 21 commits intomainfrom
jmatthews/3109-coolant-channels-within-the-tokamak-and-stellarator-models
Closed

Replaced stellarator only variable with tokamak used variable#3537
kj5248 wants to merge 21 commits intomainfrom
jmatthews/3109-coolant-channels-within-the-tokamak-and-stellarator-models

Conversation

@kj5248
Copy link
Copy Markdown
Collaborator

@kj5248 kj5248 commented Feb 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.

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.

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.

Failure in unit tests
https://github.com/ukaea/PROCESS/actions/runs/13260295171/job/37015259404?pr=3537#step:6:815

Need to rebase onto main and update the helias_5b.IN.DAT and stellarator_helias_once_through.IN.DAT files similar to what you did with the old input file.

@chris-ashe chris-ashe force-pushed the update_blanket_variables_for_clarity branch from ca28692 to cfb9d8e Compare February 12, 2025 14:47
@kj5248 kj5248 force-pushed the jmatthews/3109-coolant-channels-within-the-tokamak-and-stellarator-models branch from d68c85e to 193441c Compare February 12, 2025 15:58
@chris-ashe chris-ashe force-pushed the update_blanket_variables_for_clarity branch 5 times, most recently from 9109f45 to 724c025 Compare February 18, 2025 14:34
Base automatically changed from update_blanket_variables_for_clarity to main February 18, 2025 15:26
@kj5248
Copy link
Copy Markdown
Collaborator Author

kj5248 commented Mar 11, 2025

Was easier to make the changes in a fresh branch than resolving the merge conflicts from the various rebasing, so this will be closed and is resolved in #3580

@kj5248 kj5248 closed this Mar 11, 2025
@kj5248 kj5248 linked an issue Mar 11, 2025 that may be closed by this pull request
@kj5248 kj5248 deleted the jmatthews/3109-coolant-channels-within-the-tokamak-and-stellarator-models branch March 11, 2025 14:40
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