From 7d62db4b8df7806509da6512d851500fe4e88773 Mon Sep 17 00:00:00 2001 From: Jonathan Matthews Date: Tue, 26 Mar 2024 13:55:13 +0000 Subject: [PATCH 1/3] removed unused commented out sections for tfc_model --- source/fortran/input.f90 | 3 --- source/fortran/tfcoil_variables.f90 | 6 ------ 2 files changed, 9 deletions(-) diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index a2409addce..1c247b721b 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -1731,9 +1731,6 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('tdmptf') call parse_real_variable('tdmptf', tdmptf, 0.1D0, 100.0D0, & 'Dump time for TF coil (s)') - ! case ('tfc_model') - ! call parse_int_variable('tfc_model', tfc_model, 0, 1, & - ! 'Switch for TF coil model') case ('tfinsgap') call parse_real_variable('tfinsgap', tfinsgap, 1.0D-10, 1.0D-1, & 'TF coil WP insertion gap (m)') diff --git a/source/fortran/tfcoil_variables.f90 b/source/fortran/tfcoil_variables.f90 index f227d0fcf5..c0b07933a9 100644 --- a/source/fortran/tfcoil_variables.f90 +++ b/source/fortran/tfcoil_variables.f90 @@ -504,12 +504,6 @@ module tfcoil_variables real(dp) :: tfckw !! available DC power for charging the TF coils (kW) - !#TODO: issue #781 - ! integer :: tfc_model - ! !! tfc_model /1/ : switch for TF coil magnet stress model: - real(dp) :: tfcmw !! Peak power per TF power supply (MW) From 0b60cc757f3079a8bc598caeef68c4f294635a89 Mon Sep 17 00:00:00 2001 From: Jonathan Matthews Date: Tue, 26 Mar 2024 14:02:51 +0000 Subject: [PATCH 2/3] remove mention of tfc_model in error message if using thkcas with istell=1 --- process/utilities/errorlist.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/process/utilities/errorlist.json b/process/utilities/errorlist.json index d39f74ed14..d0b23c3fa1 100644 --- a/process/utilities/errorlist.json +++ b/process/utilities/errorlist.json @@ -248,7 +248,7 @@ { "no": 48, "level": 3, - "message": "LOADXC: Do not use thkcas as an iteration variable if tfc_model=0 or istell=1" + "message": "LOADXC: Do not use thkcas as an iteration variable if istell=1" }, { "no": 49, From d914a268aa6ff924e813996e411dbee1fb5f9bf6 Mon Sep 17 00:00:00 2001 From: Jonathan Matthews Date: Tue, 26 Mar 2024 14:05:28 +0000 Subject: [PATCH 3/3] set unused tfc_model error as obsolete --- process/utilities/errorlist.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/process/utilities/errorlist.json b/process/utilities/errorlist.json index d0b23c3fa1..fb94ef05a7 100644 --- a/process/utilities/errorlist.json +++ b/process/utilities/errorlist.json @@ -527,8 +527,8 @@ }, { "no": 104, - "level": 3, - "message": "STRESSCL: Illegal value for tfc_model" + "level": 0, + "message": "OBSOLETE" }, { "no": 105,