Skip to content

609-vdalw-and-fvdump #3066

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 3 commits into from
Feb 29, 2024
Merged

609-vdalw-and-fvdump #3066

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ea0abdc
🎨 remove vdalw as an iteration variable
Feb 20, 2024
97c9b45
✅ update large-tokamak input file
Feb 21, 2024
80b4546
✅ update reference outputs for large tokamak
Feb 29, 2024
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
4 changes: 2 additions & 2 deletions source/fortran/initial.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ subroutine initial
init_itv_30, init_itv_31, init_itv_32, init_itv_33, init_itv_34, init_itv_35, &
init_itv_36, init_itv_37, init_itv_38, init_itv_39, init_itv_40, init_itv_41, &
init_itv_42, init_itv_44, init_itv_45, init_itv_46, init_itv_47, init_itv_48, &
init_itv_49, init_itv_50, init_itv_51, init_itv_52, init_itv_53, init_itv_54, &
init_itv_49, init_itv_50, init_itv_51, init_itv_53, init_itv_54, &
init_itv_56, init_itv_57, init_itv_58, init_itv_59, init_itv_60, init_itv_61, &
init_itv_62, init_itv_63, init_itv_64, init_itv_65, init_itv_66, init_itv_67, &
init_itv_68, init_itv_69, init_itv_70, init_itv_71, init_itv_72, init_itv_73, &
Expand Down Expand Up @@ -106,7 +106,7 @@ subroutine initial
call init_itv_49
call init_itv_50
call init_itv_51
call init_itv_52

call init_itv_53
call init_itv_54

Expand Down
22 changes: 3 additions & 19 deletions source/fortran/iteration_variables.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1202,30 +1202,14 @@ subroutine set_itv_51(ratio)
fvdump = ratio
end subroutine set_itv_51

!! <LI> (52) NOT USED
!---------------------------------

subroutine init_itv_52
!! <LI> (52) vdalw
use numerics, only: lablxc, boundl, boundu
implicit none
lablxc(52) = 'vdalw '
boundl(52) = 0.001D0
boundu(52) = 1.000D6
end subroutine init_itv_52

real(kind(1.d0)) function itv_52()
use tfcoil_variables, only: vdalw
implicit none
itv_52 = vdalw
write(*,*) 'Iteration variable 52 is no longer in use.'
end function itv_52

subroutine set_itv_52(ratio)
use tfcoil_variables, only: vdalw
implicit none
real(kind(1.d0)) :: ratio
vdalw = ratio
end subroutine set_itv_52

!---------------------------------

subroutine init_itv_53
Expand Down Expand Up @@ -4277,7 +4261,7 @@ subroutine convxc(xc,nn)
case (49); call set_itv_49(ratio)
case (50); call set_itv_50(ratio)
case (51); call set_itv_51(ratio)
case (52); call set_itv_52(ratio)
case (52);
case (53); call set_itv_53(ratio)
case (54); call set_itv_54(ratio)
case (55);
Expand Down
2 changes: 1 addition & 1 deletion source/fortran/numerics.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ module numerics
!! <LI> (49) fstrcond (f-value for equation 32)
!! <LI> (50) fiooic (f-value for equation 33)
!! <LI> (51) fvdump (f-value for equation 34)
!! <LI> (52) vdalw
!! <LI> (52) NOT USED
!! <LI> (53) fjprot (f-value for equation 35)
!! <LI> (54) ftmargtf (f-value for equation 36)
!! <LI> (55) NOT USED
Expand Down
2 changes: 0 additions & 2 deletions tests/regression/scenarios/large-tokamak/IN.DAT
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,6 @@ fiooic = 0.65
*--------------------------*
icc = 34
ixc = 51 * fvdump
ixc = 52 * vdalw [kV]
boundu(52) = 10.0
fvdump = 1.0
vdalw = 10.0

Expand Down
Loading