🔄 Update constraint variable names 1 #3706
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #3706 +/- ##
=======================================
Coverage 37.63% 37.63%
=======================================
Files 88 88
Lines 22830 22830
=======================================
Hits 8592 8592
Misses 14238 14238 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
clmould
requested changes
Jul 11, 2025
There was a problem hiding this comment.
Some old var names still need updating:
ft_burn: examples/data in 3 files - large_tokamak_IN.DAT, scan_example_file_IN.DAT and scan_MFILE.DAT
fpinj: examples/data/large_tokamak_IN.DAT
cpttf_max: tests/integration/data/scan_MFILE.DAT
fcpttf: tests/integration/data/scan_MFILE.DAT
fwalld is still in plot_solutions, so this needs re-running to update this to fpflux_fw_neutron_max_mw
Also some conflicts need resolving too
clmould
requested changes
Jul 11, 2025
…across physics and Fortran modules
…e data files and test cases to improve clarity and maintain consistency in the codebase.
…a files and codebase
… files to improve clarity and consistency.
…ve clarity regarding its purpose as the f-value for flux-swing (V-s) requirement in steady state.
…mproved clarity and consistency regarding the minimum burn time.
…ed_mw across multiple data files and test scripts to enhance clarity and maintainability.
…d_mw across multiple files for clarity and consistency.
…ss multiple files for improved clarity and consistency regarding the permitted neutral beam e-decay lengths to plasma centre.
…ited across multiple files to enhance clarity regarding the fraction of alpha power deposited in plasma.
…o enhance clarity regarding the maximum allowable value for the toroidal magnetic field.
…iple files for clarity and consistency
…tiple data files and scripts to standardize the naming convention for injected power.
…ple files for improved clarity regarding the maximum current drive gamma.
…iple files for improved clarity regarding the maximum current drive gamma.
…mproved clarity regarding the first wall peak temperature.
…in multiple files and updated related comments.
…proved clarity regarding the minimum cycle time.
…r improved clarity regarding the maximum TF coil current per turn.
…improved clarity regarding the maximum TF coil current per turn.
8000
… for improved clarity regarding the upper limit on radiation wall load.
…tf to c_tf_turn_max across multiple files.
2166a27 to
cac323e
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR is just done by quickly skimming some of the variables in
constraints.pyand making them be in line with the new style guide🔄 Renames
piepv->pden_ion_electron_equilibriation_mwdnla->nd_electron_linebeam_density_out->nd_beam_ions_outwalalw->pflux_fw_neutron_max_mwfwalld->fpflux_fw_neutron_max_mwfvs->fvs_plasma_total_requiredftburn->fr_burn_minpnetelin->p_plant_electric_net_required_mwfpnetel->fp_plant_electric_net_required_mwtbeamin->n_beam_decay_length_core_requiredf_alpha_plasma->f_p_alpha_plasma_depositedbmxlim->b_tf_inboard_maxfpeakb->fb_tf_inboard_maxfpinj->fp_hcd_injected_total_mwgammax->eta_cd_norm_hcd_primary_maxfgamcd->feta_cd_norm_hcd_primary_maxfrpeak->ftemp_fw_maxtcycmn->t_cycle_minftcycl->ft_cycle_mincpttf_max->c_tf_turn_maxfcpttf->fc_tf_turn_maxfradwall->fplfux_fw_rad_maxChecklist
I confirm that I have completed the following checks: