Skip to content

dr_tf_inboard inconsistent#3662

Merged
timothy-nunn merged 5 commits intomainfrom
dr_tf_inboard-inconsistent
Jun 2, 2025
Merged

dr_tf_inboard inconsistent#3662
timothy-nunn merged 5 commits intomainfrom
dr_tf_inboard-inconsistent

Conversation

@clmould
Copy link
Copy Markdown
Collaborator

@clmould clmould commented May 16, 2025

Description

Closes #3574
ixc=13 and ixc=140 cannot be used simultaneously. Added a warning when both these iteration variables are being used in an input file. Removed ixc=13 from any input file that also has ixc=140 being used. Fixed a small error in the docs.

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.

@codecov-commenter
Copy link
Copy Markdown

codecov-commenter commented May 16, 2025

Codecov Report

Attention: Patch coverage is 50.00000% with 1 line in your changes missing coverage. Please review.

Project coverage is 36.99%. Comparing base (9064b51) to head (b0b100b).

Files with missing lines Patch % Lines
process/init.py 50.00% 1 Missing ⚠️
Additional details and impacted files
@@           Coverage Diff           @@
##             main    #3662   +/-   ##
=======================================
  Coverage   36.99%   36.99%           
=======================================
  Files          84       84           
  Lines       21688    21690    +2     
=======================================
+ Hits         8023     8024    +1     
- Misses      13665    13666    +1     

☔ 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 requested a review from timothy-nunn May 16, 2025 12:06
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.

Happy with code changes. Going to ask @chris-ashe to check he's happy with the diffs and that removing ixc 140 is the best one to remove and not 13.

@chris-ashe
Copy link
Copy Markdown
Collaborator

Happy with code changes. Going to ask @chris-ashe to check he's happy with the diffs and that removing ixc 140 is the best one to remove and not 13.

Having dr_tf_inboard as an iteration variable should generally not be a thing as it is the summation of 3 other variables that can be iterations. For the sake of convergence dr_tf_wp should be set as an iteration to allow for sizing of the winding pack based on the superconducting constraints.

@clmould clmould force-pushed the dr_tf_inboard-inconsistent branch from 52bcf54 to 189fdf5 Compare May 16, 2025 14:06
Comment thread examples/data/scan_example_file_IN.DAT Outdated
Comment thread tests/integration/data/large_tokamak_IN.DAT Outdated
Comment thread tests/regression/input_files/large_tokamak.IN.DAT Outdated
Comment thread tests/regression/input_files/large_tokamak_nof.IN.DAT Outdated
Comment thread tests/unit/data/large_tokamak_IN.DAT Outdated
@clmould clmould requested a review from chris-ashe May 21, 2025 15:38
@clmould clmould force-pushed the dr_tf_inboard-inconsistent branch from 2bc73e2 to 0384432 Compare May 29, 2025 10:02
@clmould clmould requested review from chris-ashe and timothy-nunn and removed request for chris-ashe May 29, 2025 10:08
@timothy-nunn timothy-nunn merged commit 52e7288 into main Jun 2, 2025
14 of 18 checks passed
@timothy-nunn timothy-nunn deleted the dr_tf_inboard-inconsistent branch June 2, 2025 13:41
grmtrkngtn pushed a commit that referenced this pull request Jul 30, 2025
* correct mistake in docs

* Add warning message if ixc=13 and ixc=140 are used simultaneously

* remove ixc = 13 from any input file that also has ixc = 140

* remove dr_tf_inboard from in.dats as it is calculated in-situ

* spelling error
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.

Value of dr_tf_inboard inconsistent in MFILE

4 participants