From 2102115198d7bd3c5b0d336488394653b827f952 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Thu, 2 May 2024 15:32:29 +0100 Subject: [PATCH 1/2] Added casths_fraction and casths as iteration variables --- source/fortran/iteration_variables.f90 | 47 ++++++++++++++------------ source/fortran/numerics.f90 | 4 +-- 2 files changed, 27 insertions(+), 24 deletions(-) diff --git a/source/fortran/iteration_variables.f90 b/source/fortran/iteration_variables.f90 index 0fcc0fef48..5a39d38026 100755 --- a/source/fortran/iteration_variables.f90 +++ b/source/fortran/iteration_variables.f90 @@ -3804,52 +3804,55 @@ subroutine set_itv_170(ratio) beta_div = ratio end subroutine set_itv_170 - !--------------------------------- - ! DUMMY variables below here - !--------------------------------- - subroutine init_itv_171 - !!
  • (171) DUMMY : Description + !!
  • (171) casths: TF side case fraction of toroidal thickness use numerics, only: lablxc, boundl, boundu implicit none - lablxc(171) = 'DUMMY ' - boundl(171) = 1.0d-99 - boundu(171) = 1.0d99 + lablxc(171) = 'casths_fraction ' + boundl(171) = 0.01 + boundu(171) = 0.99 end subroutine init_itv_171 real(kind(1.d0)) function itv_171() + use tfcoil_variables, only: casths_fraction implicit none - itv_171 = DUMMY + itv_171 = casths_fraction end function itv_171 subroutine set_itv_171(ratio) + use tfcoil_variables, only: casths_fraction implicit none real(kind(1.d0)) :: ratio - DUMMY = ratio + casths_fraction = ratio end subroutine set_itv_171 !--------------------------------- subroutine init_itv_172 - !!
  • (172) DUMMY : Description + !!
  • (172) casths: TF side case thickness [m] use numerics, only: lablxc, boundl, boundu implicit none - lablxc(172) = 'DUMMY ' - boundl(172) = 1.0d-99 - boundu(172) = 1.0d99 + lablxc(172) = 'casths ' + boundl(172) = 0.001 + boundu(172) = 1.0 end subroutine init_itv_172 real(kind(1.d0)) function itv_172() + use tfcoil_variables, only: casths implicit none - itv_172 = DUMMY + itv_172 = casths end function itv_172 subroutine set_itv_172(ratio) + use tfcoil_variables, only: casths implicit none real(kind(1.d0)) :: ratio - DUMMY = ratio + casths = ratio end subroutine set_itv_172 - + + !--------------------------------- + ! DUMMY variables below here + !--------------------------------- !--------------------------------- subroutine init_itv_173 @@ -4112,10 +4115,10 @@ subroutine loadxc case (167); xcm(i) = itv_167() case (168); xcm(i) = itv_168() case (169); xcm(i) = itv_169() - ! DUMMY Cases case (170); xcm(i) = itv_170() - case (171); xcm(i) = itv_171() - case (172); xcm(i) = itv_172() + case (171); xcm(i) = itv_171() + case (172); xcm(i) = itv_172() + ! DUMMY Cases case (173); xcm(i) = itv_173() case (174); xcm(i) = itv_174() case (175); xcm(i) = itv_175() @@ -4379,10 +4382,10 @@ subroutine convxc(xc,nn) case (167); call set_itv_167(ratio) case (168); call set_itv_168(ratio) case (169); call set_itv_169(ratio) - ! DUMMY Cases case (170); call set_itv_170(ratio) case (171); call set_itv_171(ratio) - case (172); call set_itv_172(ratio) + case (172); call set_itv_172(ratio) + ! DUMMY Cases case (173); call set_itv_173(ratio) case (174); call set_itv_174(ratio) case (175); call set_itv_175(ratio) diff --git a/source/fortran/numerics.f90 b/source/fortran/numerics.f90 index 50d4ffca89..ca47382527 100755 --- a/source/fortran/numerics.f90 +++ b/source/fortran/numerics.f90 @@ -372,8 +372,8 @@ module numerics !!
  • (168) fecrh_ignition: f-value for equation 91 !!
  • (169) te0_ecrh_achievable: Max. achievable electron temperature at ignition point !!
  • (170) beta_div : field line angle wrt divertor target plate (degrees) - !!
  • (171) EMPTY : Description - !!
  • (172) EMPTY : Description + !!
  • (171) casths_fraction : TF side case thickness as fraction of toridal case thickness + !!
  • (172) casths : TF side case thickness [m] !!
  • (173) EMPTY : Description !!
  • (174) EMPTY : Description !!
  • (175) EMPTY : Description From 77ecc1df0a878ddac98de2dbc1f0196bc9b85bf1 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 8 May 2024 09:24:35 +0100 Subject: [PATCH 2/2] comment update --- source/fortran/iteration_variables.f90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/fortran/iteration_variables.f90 b/source/fortran/iteration_variables.f90 index 5a39d38026..9342641211 100755 --- a/source/fortran/iteration_variables.f90 +++ b/source/fortran/iteration_variables.f90 @@ -3805,7 +3805,7 @@ subroutine set_itv_170(ratio) end subroutine set_itv_170 subroutine init_itv_171 - !!
  • (171) casths: TF side case fraction of toroidal thickness + !!
  • (171) casths_fraction: TF side case fraction of toroidal thickness use numerics, only: lablxc, boundl, boundu implicit none lablxc(171) = 'casths_fraction '