Skip to content

Correct constraint equation 30 to be upper bound #3041

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
timothy-nunn merged 1 commit into from
Feb 8, 2024
Merged

Correct constraint equation 30 to be upper bound #3041

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions source/fortran/constraint_equations.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1508,9 +1508,9 @@ subroutine constraint_eqn_030(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units)
character(len=1), intent(out) :: tmp_symbol
character(len=10), intent(out) :: tmp_units

tmp_cc = 1.0D0 - pinjmw / (fpinj * pinjalw)
tmp_cc = 1.0D0 - fpinj*pinjalw/pinjmw
tmp_con = pinjalw
tmp_err = pinjalw - pinjmw * fpinj
tmp_err = pinjalw - pinjmw / fpinj
tmp_symbol = '<'
tmp_units = 'MW'

Expand Down Expand Up @@ -2859,7 +2859,7 @@ subroutine constraint_eqn_075(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units)
!! #=#=# f_coppera_m2, copperA_m2_max
!! and hence also optional here.
!! Logic change during pre-factoring: err, symbol, units will be assigned only if present.
!! copperA_m2 : input real : TF coil current / copper area (A/m2)
!! copperA_m2 : input real : TF coil current / copper area (A/m2)
!! copperA_m2_max : input real : Maximum TF coil current / copper area (A/m2)
!! f_coppera_m2 : input real : f-value for TF coil current / copper area < copperA_m2_max
use rebco_variables, only: copperA_m2, copperA_m2_max, f_coppera_m2
Expand Down
Loading