Skip to content

♻️ ⏲️ Rename times variables#3934

Merged
clmould merged 13 commits intomainfrom
rename_times_variables
Oct 23, 2025
Merged

♻️ ⏲️ Rename times variables#3934
clmould merged 13 commits intomainfrom
rename_times_variables

Conversation

@chris-ashe
Copy link
Copy Markdown
Collaborator

@chris-ashe chris-ashe commented Oct 16, 2025

Description

🔄 Renames

  • t_burn -> t_plant_pulse_burn
  • t_fusion_ramp -> t_plant_pulse_fusion_ramp
  • t_precharge -> t_plant_pulse_coil_precharge
  • t_current_ramp_up -> t_plant_pulse_plasma_current_ramp_up
  • t_ramp_down -> t_plant_pulse_plasma_current_ramp_down
  • t_cycle -> t_plant_pulse_total
  • tdown -> t_plant_pulse_no_burn
  • t_pulse_repetition -> t_plant_pulse_plasma_present
  • t_between_pulse -> t_plant_pulse_dwell

🐛

Added t_plant_pulse_fusion_ramp to the calculation of t_plant_pulse_no_burn

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 Oct 16, 2025

Codecov Report

❌ Patch coverage is 53.84615% with 36 lines in your changes missing coverage. Please review.
✅ Project coverage is 44.08%. Comparing base (62a64c4) to head (78a38b2).
⚠️ Report is 2 commits behind head on main.

Files with missing lines Patch % Lines
process/physics.py 0.00% 12 Missing ⚠️
process/io/plot_proc.py 0.00% 7 Missing ⚠️
process/stellarator.py 0.00% 7 Missing ⚠️
process/pfcoil.py 0.00% 5 Missing ⚠️
process/vacuum.py 50.00% 2 Missing ⚠️
process/evaluators.py 0.00% 1 Missing ⚠️
process/objectives.py 0.00% 1 Missing ⚠️
process/pulse.py 75.00% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #3934      +/-   ##
==========================================
- Coverage   46.19%   44.08%   -2.11%     
==========================================
  Files         123      123              
  Lines       28358    30696    +2338     
==========================================
+ Hits        13100    13533     +433     
- Misses      15258    17163    +1905     

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

@chris-ashe chris-ashe requested a review from clmould October 21, 2025 09:56
@chris-ashe chris-ashe marked this pull request as ready for review October 21, 2025 09:56
@chris-ashe chris-ashe force-pushed the rename_times_variables branch 3 times, most recently from 943bcc4 to ee15a38 Compare October 21, 2025 12:48
…ocumentation files to reflect the new terminology.
…tral solenoid (CS) from `t_precharge` to `t_plant_pulse_coil_precharge` across multiple data files and code modules.
…asma_current_ramp_up` across documentation, input files, and codebase.
…across codebase and documentation for consistency with updated terminology.
…cross multiple files for consistency with updated terminology.
…oss multiple files for consistency with updated terminology.
…well` across multiple files to enhance readability and consistency in the codebase.
- Changed instances of 't_plant_pulse_dwellwell' to 't_plant_pulse_dwell' in various data files to standardize naming conventions.
- Updated related comments and variable assignments to reflect the new naming.
- Ensured consistency in the use of 't_plant_pulse_coil_precharge' across relevant files.
@chris-ashe chris-ashe force-pushed the rename_times_variables branch from ee15a38 to e593b49 Compare October 21, 2025 12:49
Copy link
Copy Markdown
Collaborator

@clmould clmould left a comment

Choose a reason for hiding this comment

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

Some old vars remain in the code:
t_burn, t_current_ramp_up, t_ramp_down, t_cycle all are still in:

  • examples/data/scan_MFILE.DAT
  • tests/integration/data/large_tokamak_1_MFILE.DAT
  • tests/integration/data/large_tokamak_2_MFILE.DAT
  • tests/integration/data/large_tokamak_3_MFILE.DAT
  • tests/integration/data/large_tokamak_4_MFILE.DAT
  • tests/integration/data/scan_2D_MFILE.DAT
  • tests/integration/data/scan_MFILE.DAT (this also has a duplicate line for t_burn which should be removed)

tests/integration/data/ref_IN.DAT still has t_burn and needs the duplicate line removing

tests/unit/data/large_tokamak_MFILE.DAT contains t_burn, t_fusion_ramp, t_current_ramp_up, t_ramp_down, t_cycle, but could just re-run PROCESS on tests/unit/data/large_tokamak_IN.DAT to get these all updated anyway as it looks like this file has not been properly updated for a year so contains many outdated variables names

In examples/data/ there are some errors from find and replace:

  • t_plant_pulse_burnt_pulse_burn which should be t_plant_pulse_burn
  • t_plant_pulse_plasma_current_ramp_downse_plasma_current_ramp_down which should be t_plant_pulse_plasma_current_ramp_down
  • t_plant_pulse_total_pulse_total which should be t_plant_pulse_total

Comment thread tests/integration/data/scan_MFILE.DAT
Comment thread tests/integration/data/ref_IN.DAT
Comment thread examples/data/scan_MFILE.DAT
Comment thread examples/data/scan_MFILE.DAT Outdated
…urrent_ramp_up` to `t_plant_pulse_plasma_current_ramp` for consistency in `scan_MFILE.DAT` and `ref_IN.DAT`.
@clmould clmould merged commit 0519605 into main Oct 23, 2025
14 of 18 checks passed
@clmould clmould deleted the rename_times_variables branch October 23, 2025 12:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants